Merge branch 'main' into CURA-11438_raft_monotonic_top_surface

.github/ISSUE_TEMPLATE/SlicingCrash.yaml

@@ -5,6 +5,13 @@ body:
 - type: markdown
   attributes:
     value: |
+       ### 💥 Slicing Crash Analysis Tool 💥
+       We are taking steps to analyze an increase in reported crashes more systematically. We'll need some help with that. 😇
+       Before filling out the report below, we want you to try a special Cura 5.7 Alpha.
+       This version of Cura has an updated slicing engine that will automatically send a report to the Cura Team for analysis. 
+       #### [You can find the downloads here](https://github.com/Ultimaker/Cura/discussions/18080) #### 
+       If you still encounter a crash you are still welcome to report the issue so we can use your model as a test case, you can find instructions on how to do that below.      
+       
        ### Project File
        **⚠️ Before you continue, we need your project file to troubleshoot a slicing crash.**
        It contains the printer and settings we need for troubleshooting. 
@@ -68,4 +75,3 @@ body:
     description: You can add the zip file and additional information that is relevant to the issue in the comments below.
   validations:
     required: true
-

conandata.yml

@@ -1,10 +1,10 @@
-version: "5.7.0-alpha.0"
+version: "5.7.0-alpha.1"
 requirements:
   - "uranium/(latest)@ultimaker/testing"
   - "curaengine/(latest)@ultimaker/testing"
   - "cura_binary_data/(latest)@ultimaker/testing"
   - "fdm_materials/(latest)@ultimaker/testing"
-  - "curaengine_plugin_gradual_flow/(latest)@ultimaker/stable"
+  - "curaengine_plugin_gradual_flow/0.1.0-beta.2"
   - "dulcificum/latest@ultimaker/testing"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"

conanfile.py

@@ -420,7 +420,6 @@ class CuraConan(ConanFile):
             )
 
         if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]:
-            # Update the po and pot files
             vb = VirtualBuildEnv(self)
             vb.generate()
 

cura/Settings/ExtruderManager.py

@@ -316,7 +316,13 @@ class ExtruderManager(QObject):
         # Starts with the adhesion extruder.
         adhesion_type = global_stack.getProperty("adhesion_type", "value")
         if adhesion_type in {"skirt", "brim"}:
-            return max(0, int(global_stack.getProperty("skirt_brim_extruder_nr", "value")))  # optional skirt/brim extruder defaults to zero
+            skirt_brim_extruder_nr = global_stack.getProperty("skirt_brim_extruder_nr", "value")
+            # if the skirt_brim_extruder_nr is -1, then we use the first used extruder
+            if skirt_brim_extruder_nr == -1:
+                used_extruders = self.getUsedExtruderStacks()
+                return used_extruders[0].position
+            else:
+                return skirt_brim_extruder_nr
         if adhesion_type == "raft":
             return global_stack.getProperty("raft_base_extruder_nr", "value")
 

resources/definitions/elegoo_neptune_4.def.json

@@ -9,16 +9,20 @@
     },
     "overrides":
     {
-        "acceleration_layer_0": { "value": 3000 },
+        "acceleration_print":
-        "acceleration_print": { "value": 3000 },
+        {
-        "acceleration_travel": { "value": 5000 },
+            "maximum_value_warning": "20000",
+            "value": 10000
+        },
+        "acceleration_wall": { "value": "acceleration_print/2" },
         "cool_fan_full_layer": { "value": 2 },
         "infill_line_width": { "value": "line_width + 0.05" },
         "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 35 else 'grid'" },
         "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 125 if line_width < 0.5 else 110" },
-        "machine_acceleration": { "value": 3000 },
+        "machine_acceleration": { "value": 5000 },
         "machine_depth": { "default_value": 230 },
-        "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth - 5} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_head_with_fans_polygon":
         {
@@ -32,12 +36,12 @@
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 270 },
         "machine_max_acceleration_e": { "value": 5000 },
-        "machine_max_acceleration_x": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 20000 },
-        "machine_max_acceleration_y": { "value": 5000 },
+        "machine_max_acceleration_y": { "value": 20000 },
         "machine_name": { "default_value": "ELEGOO NEPTUNE 4" },
         "machine_nozzle_cool_down_speed": { "value": 0.75 },
         "machine_nozzle_heat_up_speed": { "value": 1.6 },
-        "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" },
+        "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 4 / 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140 ;Start heating extruder\nM190 S{material_bed_temperature_layer_0} ;Wait for the bed to reach print temp\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S{material_print_temperature_layer_0} ;Wait for extruder to reach print temp\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder" },
         "machine_width": { "default_value": 235 },
         "retraction_amount": { "default_value": 0.5 },
         "retraction_count_max": { "value": 80 },

resources/definitions/elegoo_neptune_4max.def.json

@@ -0,0 +1,62 @@
+{
+    "version": 2,
+    "name": "ELEGOO NEPTUNE 4 Max",
+    "inherits": "elegoo_neptune_4",
+    "metadata":
+    {
+        "visible": true,
+        "author": "mastercaution",
+        "platform": "elegoo_platform_max.3mf",
+        "platform_offset": [
+            -2.1,
+            -0.2,
+            0
+        ],
+        "quality_definition": "elegoo_neptune_4"
+    },
+    "overrides":
+    {
+        "acceleration_print":
+        {
+            "maximum_value_warning": "15000",
+            "value": 2500
+        },
+        "machine_depth": { "default_value": 430 },
+        "machine_height": { "default_value": 482 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 15000 },
+        "machine_max_acceleration_y": { "value": 15000 },
+        "machine_name": { "default_value": "ELEGOO NEPTUNE 4 Max" },
+        "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140 ;Start heating extruder\nM190 S{material_bed_temperature_layer_0} ;Wait for the bed to reach print temp\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0 F6000\nG1 Z0 F300\nM109 S{material_print_temperature_layer_0} ;Wait for extruder to reach print temp\nG92 E0 ;Reset Extruder\nG1 X165 Y0 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder" },
+        "machine_width": { "default_value": 430 },
+        "nozzle_disallowed_areas":
+        {
+            "default_value": [
+                [
+                    [-215, -215],
+                    [-215, 215],
+                    [-211, 215],
+                    [-211, -215]
+                ],
+                [
+                    [215, 215],
+                    [215, -215],
+                    [211, -215],
+                    [211, 215]
+                ],
+                [
+                    [-215, -215],
+                    [215, -215],
+                    [-215, -211],
+                    [215, -211]
+                ],
+                [
+                    [-215, 215],
+                    [215, 215],
+                    [-215, 211],
+                    [215, 211]
+                ]
+            ]
+        }
+    }
+}

resources/definitions/elegoo_neptune_4plus.def.json

@@ -0,0 +1,59 @@
+{
+    "version": 2,
+    "name": "ELEGOO NEPTUNE 4 Plus",
+    "inherits": "elegoo_neptune_4",
+    "metadata":
+    {
+        "visible": true,
+        "author": "mastercaution",
+        "platform": "elegoo_platform_max.3mf",
+        "platform_offset": [
+            -2.1,
+            -0.2,
+            0
+        ],
+        "quality_definition": "elegoo_neptune_4"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 4000 },
+        "machine_acceleration": { "value": 4000 },
+        "machine_depth": { "default_value": 330 },
+        "machine_height": { "default_value": 387 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 20000 },
+        "machine_max_acceleration_y": { "value": 20000 },
+        "machine_name": { "default_value": "ELEGOO NEPTUNE 4 Plus" },
+        "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140 ;Start heating extruder\nM190 S{material_bed_temperature_layer_0} ;Wait for the bed to reach print temp\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0 F6000\nG1 Z0 F300\nM109 S{material_print_temperature_layer_0} ;Wait for extruder to reach print temp\nG92 E0 ;Reset Extruder\nG1 X115 Y0 Z0.4 F300 ;Move to start position\nG1 X215 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder" },
+        "machine_width": { "default_value": 330 },
+        "nozzle_disallowed_areas":
+        {
+            "default_value": [
+                [
+                    [-165, -165],
+                    [-165, 165],
+                    [-161, 165],
+                    [-161, -165]
+                ],
+                [
+                    [165, 165],
+                    [165, -165],
+                    [161, -165],
+                    [161, 165]
+                ],
+                [
+                    [-165, -165],
+                    [165, -165],
+                    [-165, -161],
+                    [165, -161]
+                ],
+                [
+                    [-165, 165],
+                    [165, 165],
+                    [-165, 161],
+                    [165, 161]
+                ]
+            ]
+        }
+    }
+}

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_engineering.inst.cfg

@@ -0,0 +1,25 @@
+[general]
+definition = elegoo_neptune_4
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+is_experimental = True
+material = generic_pla
+quality_type = Elegoo_layer_020
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+speed_infill = =speed_print
+speed_print = 150
+speed_topbottom = =speed_print * 2 / 3
+speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print
+speed_wall = =speed_print * 2 / 3
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 3
+

resources/qml/Actions.qml

@@ -109,7 +109,6 @@ Item
     Action
     {
         id: exitFullScreenAction
-        shortcut: StandardKey.Cancel
         text: catalog.i18nc("@action:inmenu", "Exit Full Screen")
         icon.name: "view-fullscreen"
     }

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -160,7 +160,6 @@ Item
         ProfileWarningReset
         {
             id: profileWarningReset
-            width: parent.width
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             fullWarning: false

resources/variants/elegoo/elegoo_neptune_4max/elegoo_neptune_4max_0.20.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4max
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+

resources/variants/elegoo/elegoo_neptune_4max/elegoo_neptune_4max_0.40.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4max
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+

resources/variants/elegoo/elegoo_neptune_4max/elegoo_neptune_4max_0.60.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4max
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+

resources/variants/elegoo/elegoo_neptune_4max/elegoo_neptune_4max_0.80.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4max
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+

resources/variants/elegoo/elegoo_neptune_4plus/elegoo_neptune_4plus_0.20.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4plus
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+

resources/variants/elegoo/elegoo_neptune_4plus/elegoo_neptune_4plus_0.40.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4plus
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+

resources/variants/elegoo/elegoo_neptune_4plus/elegoo_neptune_4plus_0.60.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4plus
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+

resources/variants/elegoo/elegoo_neptune_4plus/elegoo_neptune_4plus_0.80.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_4plus
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+