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 @@
 # 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 @@ def parseTokenResponse(self, token_response: QNetworkReply, callback: Callable[[
             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 @@ def applyNameMappingHotend(hotendId) -> str:
             "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 @@ def getMaterialFromDefinition(guid, type, brand, name):
                             "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.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 @@ def _convertSavitarNodeToUMNode(savitar_node: Savitar.SceneNode, file_name: str
                     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 @@ def _buildGlobalSettingsMessage(self, stack: ContainerStack) -> None:
         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 @@ def _getMeta(self, root_nodes: List[SceneNode]) -> Tuple[Dict[str, any], str]:
             "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":

resources/definitions/ultimaker_method.def.json

@@ -97,6 +97,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "67" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {

resources/definitions/ultimaker_method_base.def.json

@@ -191,6 +191,7 @@
         "bridge_wall_material_flow": { "value": "material_flow" },
         "bridge_wall_speed": { "value": "speed_wall" },
         "brim_width": { "value": 5 },
+        "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gradual_support_infill_steps": { "value": 0 },
         "infill_before_walls": { "value": false },
@@ -316,7 +317,7 @@
         "machine_nozzle_cool_down_speed": { "value": 0.8 },
         "machine_nozzle_heat_up_speed": { "value": 3.5 },
         "machine_scale_fan_speed_zero_to_one": { "value": true },
-        "machine_start_gcode": { "default_value": "" },
+        "machine_start_gcode": { "default_value": "G0 Z20" },
         "material_bed_temperature": { "enabled": "machine_heated_bed" },
         "material_flow": { "value": 100 },
         "material_initial_print_temperature": { "value": "material_print_temperature-10" },
@@ -341,6 +342,7 @@
         "raft_base_line_width": { "value": 1.4 },
         "raft_base_speed": { "value": 10 },
         "raft_base_thickness": { "value": 0.8 },
+        "raft_base_wall_count": { "value": "raft_wall_count" },
         "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" },
         "raft_interface_fan_speed": { "value": 0 },
         "raft_interface_layers": { "value": 2 },
@@ -352,8 +354,8 @@
         "raft_smoothing": { "value": 9.5 },
         "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
         "raft_surface_fan_speed": { "value": 0 },
-        "raft_surface_monotonic": { "value": true },
         "raft_surface_wall_count": { "value": "raft_wall_count" },
+        "raft_wall_count": { "value": 2 },
         "retract_at_layer_change": { "value": true },
         "retraction_amount": { "value": 0.75 },
         "retraction_combing": { "value": "'off'" },
@@ -363,7 +365,7 @@
         "retraction_hop": { "value": 0.4 },
         "retraction_hop_enabled": { "value": true },
         "retraction_hop_only_when_collides": { "value": false },
-        "retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" },
+        "retraction_min_travel": { "value": "0.6" },
         "retraction_prime_speed": { "value": "retraction_speed" },
         "retraction_speed": { "value": 5 },
         "roofing_layer_count": { "value": 2 },
@@ -390,31 +392,30 @@
         "speed_wall_0": { "value": "speed_wall * 30/40" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": 40 },
-        "support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else 0" },
-        "support_bottom_enable": { "value": "false if extruder_nr == support_extruder_nr else true" },
+        "support_bottom_height": { "value": "2*support_infill_sparse_thickness" },
         "support_bottom_material_flow": { "value": "material_flow" },
-        "support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" },
+        "support_bottom_wall_count": { "value": "0" },
         "support_brim_enable": { "value": false },
         "support_conical_min_width": { "value": 10 },
         "support_enable": { "value": true },
         "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" },
-        "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" },
+        "support_fan_enable": { "value": "True" },
         "support_infill_rate": { "value": 20.0 },
         "support_infill_sparse_thickness": { "value": "layer_height" },
         "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "4*support_infill_sparse_thickness" },
         "support_interface_material_flow": { "value": "material_flow" },
-        "support_interface_offset": { "value": "1 if extruder_nr == support_extruder_nr else 0" },
         "support_interface_pattern": { "value": "'lines'" },
-        "support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" },
+        "support_interface_wall_count": { "value": "1" },
         "support_material_flow": { "value": "material_flow" },
-        "support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" },
+        "support_offset": { "value": "1.8" },
         "support_pattern": { "value": "'lines'" },
-        "support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" },
+        "support_roof_height": { "value": "4*layer_height" },
         "support_roof_material_flow": { "value": "material_flow" },
         "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" },
-        "support_top_distance": { "value": "support_z_distance" },
         "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" },
         "support_xy_distance": { "value": 0.2 },
+        "support_xy_distance_overhang": { "value": "support_xy_distance" },
         "switch_extruder_retraction_amount": { "value": 0.5 },
         "switch_extruder_retraction_speeds": { "value": "retraction_speed" },
         "top_bottom_thickness": { "value": "5*layer_height" },

resources/definitions/ultimaker_methodx.def.json

@@ -71,6 +71,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "107" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {
@@ -104,9 +105,7 @@
         "machine_height": { "default_value": 196 },
         "machine_name": { "default_value": "UltiMaker Method X" },
         "machine_width": { "default_value": 283.3 },
-        "material_flow": { "value": 97 },
         "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" },
-        "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" },
-        "skin_material_flow": { "value": "0.95*material_flow" }
+        "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }
     }
 }

resources/definitions/ultimaker_methodxl.def.json

@@ -27,6 +27,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "100" },
         "machine_depth": { "default_value": 320 },
         "machine_disallowed_areas":
         {

resources/i18n/cs_CZ/cura.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-13 09:02+0100\n"
+"POT-Creation-Date: 2024-07-08 09:05+0200\n"
 "PO-Revision-Date: 2023-09-03 18:15+0200\n"
 "Last-Translator: Miroslav Šustek <[email protected]>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@@ -870,6 +870,10 @@ msgctxt "@label"
 msgid "Color scheme"
 msgstr "Barevné schéma"
 
+msgctxt "@label"
+msgid "Combination not recommended. Load BB core to slot 1 (left) for better reliability."
+msgstr ""
+
 msgctxt "@info"
 msgid "Compare and save."
 msgstr "Porovnat a uložit."
@@ -2431,6 +2435,10 @@ msgctxt "name"
 msgid "Makerbot Printfile Writer"
 msgstr ""
 
+msgctxt "@item:inlistbox"
+msgid "Makerbot Sketch Printfile"
+msgstr ""
+
 msgctxt "@error"
 msgid "MakerbotWriter could not save to the designated path."
 msgstr ""
@@ -3877,6 +3885,10 @@ msgctxt "@placeholder"
 msgid "Search"
 msgstr "Hledat"
 
+msgctxt "@label:textbox"
+msgid "Search Printer"
+msgstr ""
+
 msgctxt "@info"
 msgid "Search in the browser"
 msgstr "Hledat v prohlížeči"
@@ -4756,7 +4768,7 @@ msgid "This configuration is not available because %1 is not recognized. Please
 msgstr "Tato konfigurace není k dispozici, protože %1 nebyl rozpoznán. Navštivte prosím %2 a stáhněte si správný materiálový profil."
 
 msgctxt "@text:window"
-msgid "This is a Cura Universal project file. Would you like to open it as a Cura project or Cura Universal Project or import the models from it?"
+msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?"
 msgstr ""
 
 msgctxt "@text:window"