Merge branch '5.8' of github.com:Ultimaker/Cura

conandata.yml

@@ -1,17 +1,17 @@
-version: "5.8.0-alpha.0"
+version: "5.8.0-beta.1"
 requirements:
-  - "cura_resources/(latest)@ultimaker/testing"
-  - "uranium/(latest)@ultimaker/testing"
-  - "curaengine/(latest)@ultimaker/testing"
-  - "cura_binary_data/(latest)@ultimaker/testing"
-  - "fdm_materials/(latest)@ultimaker/testing"
-  - "curaengine_plugin_gradual_flow/0.1.1-beta.3"
-  - "dulcificum/latest@ultimaker/testing"
+  - "cura_resources/5.8.0-beta.1"
+  - "uranium/5.8.0-beta.1"
+  - "curaengine/5.8.0-beta.1"
+  - "cura_binary_data/5.8.0-beta.1"
+  - "fdm_materials/5.8.0-beta.1"
+  - "curaengine_plugin_gradual_flow/0.1.0-beta.4"
+  - "dulcificum/0.2.1"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"
   - "native_cad_plugin/2.0.0"
 requirements_internal:
-  - "fdm_materials/(latest)@internal/testing"
+  - "fdm_materials/5.8.0-beta.1"
   - "cura_private_data/(latest)@internal/testing"
 urls:
     default:

cura/ApplicationMetadata.py

@@ -14,7 +14,7 @@ DEFAULT_CURA_LATEST_URL = "https://software.ultimaker.com/latest.json"
 # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for
 # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the
 # CuraVersion.py.in template.
-CuraSDKVersion = "8.7.0"
+CuraSDKVersion = "8.8.0"
 
 try:
     from cura.CuraVersion import CuraLatestURL

cura/OAuth2/AuthorizationHelpers.py

@@ -96,7 +96,7 @@ class AuthorizationHelpers:
             return
 
         if token_response.error() != QNetworkReply.NetworkError.NoError:
-            callback(AuthenticationResponse(success = False, err_message = token_data["error_description"]))
+            callback(AuthenticationResponse(success = False, err_message = token_data.get("error_description", "an unknown server error occurred")))
             return
 
         callback(AuthenticationResponse(success = True,

cura/PrinterOutput/Models/ExtruderConfigurationModel.py

@@ -50,7 +50,8 @@ class ExtruderConfigurationModel(QObject):
             "mk14_hot_s":"2XA",
             "mk14_c":"1C",
             "mk14":"1A",
-            "mk14_s":"2A"
+            "mk14_s":"2A",
+            "mk14_e": "LABS"
         }
         if hotendId in _EXTRUDER_NAME_MAP:
             return _EXTRUDER_NAME_MAP[hotendId]

cura/PrinterOutput/Models/MaterialOutputModel.py

@@ -32,8 +32,8 @@ class MaterialOutputModel(QObject):
                             "nylon"     :{"name" :"Nylon"         ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"},
                             "pc"        :{"name" :"PC"            ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"},
                             "petg"      :{"name" :"PETG"          ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"},
-                            "pla"       :{"name" :"PLA"           ,"guid": "0ff92885-617b-4144-a03c-9989872454bc"},
-                            "pva"       :{"name" :"PVA"           ,"guid": "a4255da2-cb2a-4042-be49-4a83957a2f9a"},
+                            "pla"       :{"name" :"PLA"           ,"guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"},
+                            "pva"       :{"name" :"PVA"           ,"guid": "add51ef2-86eb-4c39-afd5-5586564f0715"},
                             "wss1"      :{"name" :"RapidRinse"    ,"guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"},
                             "sr30"      :{"name" :"SR-30"         ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"},
                             "bvoh"      :{"name" :"BVOH"          ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"},

plugins/3MFReader/ThreeMFReader.py

@@ -17,6 +17,7 @@ from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
 from UM.Scene.GroupDecorator import GroupDecorator
 from UM.Scene.SceneNode import SceneNode  # For typing.
 from UM.Scene.SceneNodeSettings import SceneNodeSettings
+from UM.Util import parseBool
 from cura.CuraApplication import CuraApplication
 from cura.Machines.ContainerTree import ContainerTree
 from cura.Scene.BuildPlateDecorator import BuildPlateDecorator
@@ -182,7 +183,7 @@ class ThreeMFReader(MeshReader):
                     um_node.printOrder = int(setting_value)
                     continue
                 if key =="drop_to_buildplate":
-                    um_node.setSetting(SceneNodeSettings.AutoDropDown, eval(setting_value))
+                    um_node.setSetting(SceneNodeSettings.AutoDropDown, parseBool(setting_value))
                     continue
                 if key in known_setting_keys:
                     setting_container.setProperty(key, "value", setting_value)

plugins/CuraEngineBackend/StartSliceJob.py

@@ -559,12 +559,16 @@ class StartSliceJob(Job):
         start_gcode = settings["machine_start_gcode"]
         # Remove all the comments from the start g-code
         start_gcode = re.sub(r";.+?(\n|$)", "\n", start_gcode)
-        bed_temperature_settings = ["material_bed_temperature", "material_bed_temperature_layer_0"]
-        pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(bed_temperature_settings) # match {setting} as well as {setting, extruder_nr}
-        settings["material_bed_temp_prepend"] = re.search(pattern, start_gcode) == None
-        print_temperature_settings = ["material_print_temperature", "material_print_temperature_layer_0", "default_material_print_temperature", "material_initial_print_temperature", "material_final_print_temperature", "material_standby_temperature", "print_temperature"]
-        pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(print_temperature_settings) # match {setting} as well as {setting, extruder_nr}
-        settings["material_print_temp_prepend"] = re.search(pattern, start_gcode) is None
+
+        if settings["material_bed_temp_prepend"]:
+            bed_temperature_settings = ["material_bed_temperature", "material_bed_temperature_layer_0"]
+            pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(bed_temperature_settings) # match {setting} as well as {setting, extruder_nr}
+            settings["material_bed_temp_prepend"] = re.search(pattern, start_gcode) == None
+
+        if settings["material_print_temp_prepend"]:
+            print_temperature_settings = ["material_print_temperature", "material_print_temperature_layer_0", "default_material_print_temperature", "material_initial_print_temperature", "material_final_print_temperature", "material_standby_temperature", "print_temperature"]
+            pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(print_temperature_settings) # match {setting} as well as {setting, extruder_nr}
+            settings["material_print_temp_prepend"] = re.search(pattern, start_gcode) is None
 
         # Replace the setting tokens in start and end g-code.
         # Use values from the first used extruder by default so we get the expected temperatures

plugins/MakerbotWriter/MakerbotWriter.py

@@ -231,7 +231,7 @@ class MakerbotWriter(MeshWriter):
             "printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory,
         }
 
-        meta["miracle_config"] = {"gaggles": {str(node.getName()): {} for node in nodes}}
+        meta["miracle_config"] = {"gaggles": {"instance0": {}}}
 
         version_info = dict()
         cura_engine_info = ConanInstalls.get("curaengine", {"version": "unknown", "revision": "unknown"})

resources/conandata.yml

@@ -1 +1 @@
-version: "5.8.0-alpha.0"
+version: "5.8.0-beta.1"

resources/definitions/fdmprinter.def.json

@@ -1347,7 +1347,7 @@
                     "label": "Z Seam On Vertex",
                     "description": "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)",
                     "type": "bool",
-                    "default_value": true,
+                    "default_value": false,
                     "settable_per_mesh": true,
                     "enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'"
                 },
@@ -8275,7 +8275,7 @@
                     "minimum_value_warning": "2",
                     "maximum_value": "90",
                     "default_value": 90,
-                    "value": "wall_overhang_angle",
+                    "value": "support_angle",
                     "settable_per_mesh": true
                 },
                 "wall_overhang_speed_factor":