Merge branch 'main' into NP-732

conandata.yml

@@ -5,9 +5,9 @@ requirements:
   - "curaengine/5.10.0-alpha.0@ultimaker/testing"
   - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing"
   - "fdm_materials/5.10.0-alpha.0@ultimaker/testing"
-  - "dulcificum/0.3.0@ultimaker/stable"
-  - "pysavitar/5.4.0-alpha.0@ultimaker/stable"
-  - "pynest2d/5.4.0-alpha.0@ultimaker/stable"
+  - "dulcificum/5.10.0@ultimaker/stable"
+  - "pysavitar/5.10.0@ultimaker/stable"
+  - "pynest2d/5.10.0@ultimaker/stable"
 requirements_internal:
   - "fdm_materials/5.10.0-alpha.0@internal/testing"
   - "cura_private_data/5.10.0-alpha.0@internal/testing"

plugins/PostProcessingPlugin/Script.py

@@ -122,7 +122,7 @@ class Script:
         if not key in line or (';' in line and line.find(key) > line.find(';')):
             return default
         sub_part = line[line.find(key) + 1:]
-        m = re.search('^-?[0-9]+\.?[0-9]*', sub_part)
+        m = re.search(r'^-?[0-9]+\.?[0-9]*', sub_part)
         if m is None:
             return default
         try:

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -338,7 +338,7 @@ class PauseAtHeight(Script):
                     nbr_negative_layers += 1
 
                 #Track the latest printing temperature in order to resume at the correct temperature.
-                if re.match("T(\d*)", line):
+                if re.match(r"T(\d*)", line):
                     current_t = self.getValue(line, "T")
                 m = self.getValue(line, "M")
                 if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None:

plugins/UM3NetworkPrinting/src/ExportFileJob.py

@@ -28,7 +28,7 @@ class ExportFileJob(WriteFileJob):
 
         # Determine the filename.
         job_name = CuraApplication.getInstance().getPrintInformation().jobName
-        job_name = re.sub("[^\w\-. ()]", "-", job_name)
+        job_name = re.sub(r"[^\w\-. ()]", "-", job_name)
         extension = self._mesh_format_handler.preferred_format.get("extension", "")
         self.setFileName("{}.{}".format(job_name, extension))
 

resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm_draft.inst.cfg

@@ -50,5 +50,5 @@ speed_wall_x_roofing = 270
 support_line_width = 0.35
 wall_line_width_x = 0.4
 wall_overhang_angle = 25
-wall_overhang_speed_factor = 15
+wall_overhang_speed_factors = [15]
 

resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm_draft.inst.cfg

@@ -50,5 +50,5 @@ speed_wall_x_roofing = 270
 support_line_width = 0.35
 wall_line_width_x = 0.4
 wall_overhang_angle = 25
-wall_overhang_speed_factor = 15
+wall_overhang_speed_factors = [15]
 

resources/qml/ActionPanel/OutputProcessWidget.qml

@@ -10,7 +10,7 @@ import Cura 1.0 as Cura
 
 
 // This element contains all the elements the user needs to visualize the data
-// that is gather after the slicing process, such as printint time, material usage, ...
+// that is gather after the slicing process, such as printing time, material usage, ...
 // There are also two buttons: one to previsualize the output layers, and the other to
 // select what to do with it (such as print over network, save to file, ...)
 Column

resources/qml/Menus/RecentFilesMenu.qml

@@ -2,7 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.15
 
 import UM 1.3 as UM
 import Cura 1.0 as Cura
@@ -30,6 +30,6 @@ Cura.Menu
             onTriggered: CuraApplication.readLocalFile(modelData)
         }
         onObjectAdded: (index, object) => menu.insertItem(index, object)
-        onObjectRemoved: (object) => menu.removeItem(object)
+        onObjectRemoved: (index, object) => menu.removeItem(object)
     }
 }

resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml

@@ -57,7 +57,9 @@ RecommendedSettingSection
                 settingName: "support_structure"
                 propertyRemoveUnusedValue: false
                 updateAllExtruders: false
-                defaultExtruderIndex: supportExtruderProvider.properties.value
+                defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ?
+                    supportExtruderProvider.properties.value :
+                    Cura.ExtruderManager.activeExtruderIndex
             }
         },
         RecommendedSettingItem
@@ -92,7 +94,9 @@ RecommendedSettingSection
                 width: parent.width
                 settingName: "support_type"
                 updateAllExtruders: true
-                defaultExtruderIndex: supportExtruderProvider.properties.value
+                defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ?
+                    supportExtruderProvider.properties.value :
+                    Cura.ExtruderManager.activeExtruderIndex
             }
         }
     ]

resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg

@@ -24,5 +24,5 @@ speed_topbottom = 100
 speed_wall = 75
 speed_wall_x = 100
 support_material_flow = 92
-wall_overhang_speed_factor = 23
+wall_overhang_speed_factors = [23]
 

scripts/extract_changelog.py

@@ -13,7 +13,7 @@ if __name__ == "__main__":
         args.version = args.version[:-2]
 
     start_token = f"[{args.version}]"
-    pattern_stop_log = "\[\d+(\.\d+){1,2}\]"
+    pattern_stop_log = r"\[\d+(\.\d+){1,2}\]"
     log_line = False
     first_chapter = True