Merge branch 'main' into CURA-12236_expose-preferred-travel-area-in-combing

.github/workflows/nightly-stable.yml

@@ -11,6 +11,6 @@ jobs:
     uses: ./.github/workflows/nightly.yml
     with:
       cura_conan_version: "cura/[*]@ultimaker/stable"
-      release_tag: "nightly"
+      release_tag: "nightly-stable"
       caller_workflow: "nightly-stable.yml"
     secrets: inherit

.github/workflows/nightly-testing.yml

@@ -11,6 +11,6 @@ jobs:
     uses: ./.github/workflows/nightly.yml
     with:
       cura_conan_version: "cura/[*]@ultimaker/testing"
-      release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever
+      release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever
       caller_workflow: "nightly-testing.yml"
     secrets: inherit

.github/workflows/nightly.yml

@@ -66,11 +66,10 @@ jobs:
               ))
 
       - name: Update nightly release description and binaries
-        working-directory: installers
         run: |
           gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md
 
-          for file in "*"; do
+          for file in "installers/*"; do
             gh release upload ${{ inputs.release_tag }} $file --clobber
           done
         env:

.github/workflows/printer-linter-format.yml

@@ -1,34 +1,21 @@
 name: printer-linter-format
 
 on:
-    push:
+  push:
-        paths:
+    paths:
-            - 'resources/definitions/**'
+      - 'resources/definitions/**'
-            - 'resources/extruders/**'
+      - 'resources/extruders/**'
-            - 'resources/intent/**'
+      - 'resources/intent/**'
-            - 'resources/quality/**'
+      - 'resources/quality/**'
-            - 'resources/variants/**'
+      - 'resources/variants/**'
 
 jobs:
-    printer-linter-format:
+  printer-linter-format:
-        name: Printer linter auto format
+    name: Printer linter auto format
-
+    uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main
-        runs-on: ubuntu-latest
+    with:
-        steps:
+      file_patterns: |
-            -   name: Setup the build environment
+        resources/+(definitions|extruders)/*.def.json
-                uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
+        resources/+(intent|quality|variants)/**/*.inst.cfg
-
+      command: python printer-linter/src/terminal.py --format
-            -   uses: greguintow/get-diff-action@v7
+      commit_message: "Apply printer-linter format"
-                with:
-                    PATTERNS: |
-                        resources/+(definitions|extruders)/*.def.json
-                        resources/+(intent|quality|variants)/**/*.inst.cfg
-
-            -   name: Format file
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }}
-
-            -   uses: stefanzweifel/git-auto-commit-action@v4
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                with:
-                    commit_message: "Applied printer-linter format"

plugins/GCodeReader/FlavorParser.py

@@ -298,8 +298,14 @@ class FlavorParser:
             position.e.extend([0] * (self._extruder_number - len(position.e) + 1))
         return position
 
-    def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> Position:
+    def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> None:
-        pass
+        # Set extrusion mode
+        if M == 82:
+            # Set absolute extrusion mode
+            self._is_absolute_extrusion = True
+        elif M == 83:
+            # Set relative extrusion mode
+            self._is_absolute_extrusion = False
 
     _type_keyword = ";TYPE:"
     _layer_keyword = ";LAYER:"

plugins/GCodeReader/RepRapFlavorParser.py

@@ -11,14 +11,6 @@ class RepRapFlavorParser(FlavorParser.FlavorParser):
     def __init__(self):
         super().__init__()
 
-    def processMCode(self, M, line, position, path):
-        if M == 82:
-            # Set absolute extrusion mode
-            self._is_absolute_extrusion = True
-        elif M == 83:
-            # Set relative extrusion mode
-            self._is_absolute_extrusion = False
-
     def _gCode90(self, position, params, path):
         """Set the absolute positioning