Merge branch 'main' into CURA-12096_move_gradual_flow_plugin_back_int…

…o_the_engine_core

.github/workflows/release-process_release-candidate.yml

@@ -65,6 +65,8 @@ jobs:
     name: Create tags
     runs-on: ubuntu-latest
     needs: [parse-version, find-rc-tag]
+    outputs:
+      main_commit: ${{ steps.export-main-commit.outputs.main_commit }}
     strategy:
       matrix:
         repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials]
@@ -76,11 +78,23 @@ jobs:
           ref: ${{ needs.parse-version.outputs.branch_name }}
           token: ${{ secrets.CURA_AUTORELEASE_PAT }}
 
-      - name: Create tag
+      - name: Create RC tag
         run: |
           git tag ${{ needs.find-rc-tag.outputs.tag_name }}
           git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }}
 
+      - name: Create or update release tag
+        run: |
+          git tag -f ${{ inputs.cura_version }}
+          git push -f origin tag ${{ inputs.cura_version }}
+
+      - name: Export Cura tagged commit
+        id: export-main-commit
+        if: ${{ matrix.repository == 'Cura' }}
+        run: |
+          echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT"
+
+
   create-dependencies-packages:
     name: Create conan packages for dependencies
     uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main
@@ -131,7 +145,7 @@ jobs:
   create-release-draft:
     name: Create the release draft
     runs-on: ubuntu-latest
-    needs: [create-installers, parse-version]
+    needs: [create-installers, parse-version, create-tags]
     steps:
       - name: Checkout Cura repo
         uses: actions/checkout@v4
@@ -141,16 +155,10 @@ jobs:
       - name: Extract changelog
         run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt
 
-      - name: Get commit id for release
-        id: get-commit-id
-        uses: iawia002/[email protected]
-        with:
-          length: 40
-
       - name: Create release
         uses: notpeelz/[email protected]
         with:
-          target: ${{ steps.get-commit-id.outputs.id }}
+          target: ${{ needs.create-tags.outputs.main_commit }}
           tag: ${{ inputs.cura_version }}
           strategy: replace
           title: UltiMaker Cura ${{ inputs.cura_version }}

resources/definitions/eazao_m500.def.json

@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M500",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m500_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 320 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 520 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M500" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 320 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}

resources/definitions/eazao_m600.def.json

@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M600",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m600_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 420 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y400 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 620 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M600" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 420 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}

resources/definitions/eazao_m700.def.json

@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M700",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m700_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "none" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 520 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y500 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 720 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M700" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 520 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}

resources/definitions/eazao_potter.def.json

@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao Potter",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_potter_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 3 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 3 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 167 },
+        "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 Z10 E-2\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 280 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao Potter" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 25mm\nG92 E0 ;extruder reset\nG1 F1500 E2\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 167 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 25.0 },
+        "speed_travel": { "value": 25.0 },
+        "speed_wall": { "value": 25.0 },
+        "speed_wall_0": { "value": 25.0 },
+        "speed_wall_x": { "value": 25.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 3.0 }
+    }
+}