Merge branch '5.6' of github.com:Ultimaker/Cura into 5.6

BCN3D · Nov 7, 2023 · 0c78cdb · 0c78cdb
2 parents f3760fc + cba4151
commit 0c78cdb
Show file tree

Hide file tree

Showing 35 changed files with 92 additions and 56 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -287,7 +287,7 @@ jobs:
           with open("release-notes.md", "w") as f:
               f.write(release_notes.render(
                 timestamp="${{ steps.filename.outputs.NIGHTLY_TIME }}",
-                branch="" if ${{ needs.default-values.outputs.release_tag == 'nightly' }} else current_nightly_beta,
+                branch="" if "${{ needs.default-values.outputs.release_tag == 'nightly' }}" == 'true' else current_nightly_beta,
                 branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}",
               ))
 

diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja
@@ -1,8 +1,6 @@
 # Copyright (c) 2023 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from pkg_resources import working_set
-
 CuraAppName = "{{ cura_app_name }}"
 CuraAppDisplayName = "{{ cura_app_display_name  }}"
 CuraVersion = "{{ cura_version }}"
@@ -16,4 +14,4 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}"
 CuraLatestURL = "{{ cura_latest_url }}"
 
 ConanInstalls = {{ conan_installs }}
-PythonInstalls = {package.key: {'version': package.version} for package in working_set}
+PythonInstalls = {{ python_installs }}
diff --git a/conanfile.py b/conanfile.py
@@ -152,6 +152,23 @@ def _conan_installs(self):
             }
         return conan_installs
 
+    def _python_installs(self):
+        python_installs = {}
+
+        # list of python installs
+        python_ins_cmd = f"python -c \"import pkg_resources; print(';'.join([(s.key+','+ s.version) for s in pkg_resources.working_set]))\""
+        from six import StringIO
+        buffer = StringIO()
+        self.run(python_ins_cmd, run_environment= True, env = "conanrun",  output=buffer)
+
+        packages = str(buffer.getvalue()).split("-----------------\n")
+        packages = packages[1].strip('\r\n').split(";")
+        for package in packages:
+            name, version = package.split(",")
+            python_installs[name] = {"version": version}
+
+        return python_installs
+
     def _generate_cura_version(self, location):
         with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
             cura_version_py = Template(f.read())
@@ -178,6 +195,7 @@ def _generate_cura_version(self, location):
                 cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"],
                 cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"],
                 conan_installs=self._conan_installs(),
+                python_installs=self._python_installs(),
             ))
 
     def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):

diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py
@@ -606,7 +606,7 @@ def preRead(self, file_name, show_dialog=True, *args, **kwargs):
         self._dialog.setNumVisibleSettings(num_visible_settings)
         self._dialog.setQualityName(quality_name)
         self._dialog.setQualityType(quality_type)
-        self._dialog.setIntentName(intent_name)
+        self._dialog.setIntentName(intent_category)
         self._dialog.setNumSettingsOverriddenByQualityChanges(num_settings_overridden_by_quality_changes)
         self._dialog.setNumUserSettings(num_user_settings)
         self._dialog.setActiveMode(active_mode)

diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py
@@ -6,6 +6,7 @@
 from typing import List, Optional, Dict, cast
 
 from cura.Machines.Models.MachineListModel import MachineListModel
+from cura.Machines.Models.IntentTranslations import intent_translations
 from cura.Settings.GlobalStack import GlobalStack
 from UM.Application import Application
 from UM.FlameProfiler import pyqtSlot
@@ -223,7 +224,14 @@ def intentName(self) -> str:
 
     def setIntentName(self, intent_name: str) -> None:
         if self._intent_name != intent_name:
-            self._intent_name = intent_name
+            try:
+                 self._intent_name = intent_translations[intent_name]["name"]
+            except:
+                self._intent_name = intent_name.title()
+            self.intentNameChanged.emit()
+
+        if not self._intent_name:
+            self._intent_name = intent_translations["default"]["name"]
             self.intentNameChanged.emit()
 
     @pyqtProperty(str, notify=activeModeChanged)

diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py
@@ -51,9 +51,9 @@ def __init__(self) -> None:
     ]
     _META_VERSION = "3.0.0"
     _PRINT_NAME_MAP = {
-        "Makerbot Method": "fire_e",
-        "Makerbot Method X": "lava_f",
-        "Makerbot Method XL": "magma_10",
+        "UltiMaker Method": "fire_e",
+        "UltiMaker Method X": "lava_f",
+        "UltiMaker Method XL": "magma_10",
     }
     _EXTRUDER_NAME_MAP = {
         "1XA": "mk14_hot",

diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json
@@ -13,5 +13,10 @@
     "DUAL600": "strateo3d",
     "IDEX420": "strateo3d_IDEX420",
     "IDEX420 Duplicate": "strateo3d_IDEX420_duplicate",
-    "IDEX420 Mirror": "strateo3d_IDEX420_mirror"
-}
+    "IDEX420 Mirror": "strateo3d_IDEX420_mirror",
+    "UltiMaker Method": "ultimaker_method",
+    "UltiMaker Method X": "ultimaker_methodx",
+    "UltiMaker Method XL": "ultimaker_methodxl",
+    "UltiMaker Sketch": "ultimaker_sketch",
+    "UltiMaker Sketch Large": "ultimaker_sketch_large"
+}
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
@@ -1396,7 +1396,6 @@
                 {
                     "label": "Z Seam Relative",
                     "description": "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate.",
-                    "unit": "mm",
                     "type": "bool",
                     "default_value": false,
                     "enabled": "z_seam_type == 'back'",
@@ -7839,7 +7838,7 @@
                     "type": "float",
                     "minimum_value": "5",
                     "minimum_value_warning": "50",
-                    "maximum_value_warning": "150",
+                    "maximum_value_warning": "250",
                     "enabled": "bridge_settings_enabled",
                     "settable_per_mesh": true
                 },
@@ -7866,7 +7865,7 @@
                     "type": "float",
                     "minimum_value": "5",
                     "minimum_value_warning": "50",
-                    "maximum_value_warning": "150",
+                    "maximum_value_warning": "250",
                     "enabled": "bridge_settings_enabled",
                     "settable_per_mesh": true
                 },

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Makerbot Method Base Profile",
+    "name": "UltiMaker Method Base Profile",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": false,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_platform.stl",
@@ -328,7 +328,7 @@
         "machine_heated_build_volume": { "default_value": true },
         "machine_height": { "default_value": 196 },
         "machine_min_cool_heat_time_window": { "value": 15 },
-        "machine_name": { "default_value": "Makerbot Method" },
+        "machine_name": { "default_value": "UltiMaker Method" },
         "machine_nozzle_cool_down_speed": { "value": 0.8 },
         "machine_nozzle_heat_up_speed": { "value": 3.5 },
         "machine_start_gcode": { "default_value": "" },
@@ -348,7 +348,7 @@
         "prime_blob_enable": { "enabled": false },
         "prime_tower_base_curve_magnitude": { "value": 2 },
         "prime_tower_base_height": { "value": 6 },
-        "prime_tower_base_size": { "value": 6 },
+        "prime_tower_base_size": { "value": 10 },
         "prime_tower_enable": { "value": false },
         "prime_tower_flow": { "value": "material_flow" },
         "prime_tower_line_width": { "value": 1 },

diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Makerbot Method X",
+    "name": "UltiMaker Method X",
     "inherits": "ultimaker_method_base",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_platform.stl",
@@ -83,6 +83,6 @@
     },
     "overrides":
     {
-        "machine_name": { "default_value": "Makerbot Method X" }
+        "machine_name": { "default_value": "UltiMaker Method X" }
     }
 }
diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Makerbot Method XL",
+    "name": "UltiMaker Method XL",
     "inherits": "ultimaker_methodx",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_xl_platform.stl",
@@ -35,7 +35,7 @@
         "machine_depth": { "default_value": 305 },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 317 },
-        "machine_name": { "default_value": "Makerbot Method XL" },
+        "machine_name": { "default_value": "UltiMaker Method XL" },
         "machine_width": { "default_value": 305 },
         "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
         "speed_travel": { "value": 500 }

diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S3",
+    "name": "UltiMaker S3",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s3_platform.obj",

diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S5",
+    "name": "UltiMaker S5",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s5_platform.obj",

diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S7",
+    "name": "UltiMaker S7",
     "inherits": "ultimaker_s5",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s7_platform.obj",

diff --git a/...odx_lab_um-abscf-175_0.2mm_solid.inst.cfg → ...dx_labs_um-abscf-175_0.2mm_solid.inst.cfg b/...odx_lab_um-abscf-175_0.2mm_solid.inst.cfg → ...dx_labs_um-abscf-175_0.2mm_solid.inst.cfg
@@ -9,7 +9,7 @@ material = ultimaker_abscf_175
 quality_type = draft
 setting_version = 22
 type = intent
-variant = Lab
+variant = LABS
 
 [values]
 infill_sparse_density = 100

diff --git a/...hodx_lab_um-absr-175_0.2mm_solid.inst.cfg → ...odx_labs_um-absr-175_0.2mm_solid.inst.cfg b/...hodx_lab_um-absr-175_0.2mm_solid.inst.cfg → ...odx_labs_um-absr-175_0.2mm_solid.inst.cfg
@@ -9,7 +9,7 @@ material = ultimaker_absr_175
 quality_type = draft
 setting_version = 22
 type = intent
-variant = Lab
+variant = LABS
 
 [values]
 infill_sparse_density = 100

diff --git a/...dxl_lab_um-abscf-175_0.2mm_solid.inst.cfg → ...xl_labs_um-abscf-175_0.2mm_solid.inst.cfg b/...dxl_lab_um-abscf-175_0.2mm_solid.inst.cfg → ...xl_labs_um-abscf-175_0.2mm_solid.inst.cfg
@@ -9,7 +9,7 @@ material = ultimaker_abscf_175
 quality_type = draft
 setting_version = 22
 type = intent
-variant = Lab
+variant = LABS
 
 [values]
 infill_sparse_density = 100

diff --git a/...odxl_lab_um-absr-175_0.2mm_solid.inst.cfg → ...dxl_labs_um-absr-175_0.2mm_solid.inst.cfg b/...odxl_lab_um-absr-175_0.2mm_solid.inst.cfg → ...dxl_labs_um-absr-175_0.2mm_solid.inst.cfg
@@ -9,7 +9,7 @@ material = ultimaker_absr_175
 quality_type = draft
 setting_version = 22
 type = intent
-variant = Lab
+variant = LABS
 
 [values]
 infill_sparse_density = 100

diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml
@@ -38,6 +38,8 @@ UM.Dialog
             width: Math.floor(base.width * 0.85)
             height: Math.floor(width * UM.Theme.getSize("logo").height / UM.Theme.getSize("logo").width)
             source: UM.Theme.getImage("logo")
+            sourceSize.width: width
+            sourceSize.height: height
             fillMode: Image.PreserveAspectFit
 
             anchors.centerIn: parent
@@ -107,9 +109,10 @@ UM.Dialog
 
     Flickable
     {
+        id: scroll
         anchors.fill: parent
         ScrollBar.vertical: UM.ScrollBar {
-            visible: contentHeight > height
+            visible: scroll.contentHeight > height
         }
         contentHeight: content.height
         clip: true

diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
@@ -76,6 +76,7 @@ Cura.Menu
     {
         id: genericMenu
         title: catalog.i18nc("@label:category menu label", "Generic")
+        enabled: genericMaterialsModel.items.length > 0
 
         Instantiator
         {

diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg
@@ -13,7 +13,7 @@ weight = -2
 
 [values]
 cool_fan_enabled = False
-raft_air_gap = 0.3
+raft_airgap = 0.3
 speed_prime_tower = 30.0
 speed_print = 120.0
 speed_roofing = 55

diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg
@@ -13,7 +13,7 @@ weight = -2
 
 [values]
 cool_fan_enabled = False
-raft_air_gap = 0.3
+raft_airgap = 0.3
 speed_prime_tower = 30.0
 speed_print = 120.0
 speed_roofing = 55

diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg
@@ -13,6 +13,8 @@ weight = -2
 
 [values]
 brim_replaces_support = False
+cool_fan_enabled = False
+cool_min_temperature = =material_print_temperature
 raft_airgap = 0.0
 retract_at_layer_change = True
 speed_prime_tower = 25.0

diff --git a/...m_methodx_lab_um-abscf-175_0.2mm.inst.cfg → ..._methodx_labs_um-abscf-175_0.2mm.inst.cfg b/...m_methodx_lab_um-abscf-175_0.2mm.inst.cfg → ..._methodx_labs_um-abscf-175_0.2mm.inst.cfg
@@ -8,12 +8,12 @@ material = ultimaker_abscf_175
 quality_type = draft
 setting_version = 22
 type = quality
-variant = Lab
+variant = LABS
 weight = -2
 
 [values]
 cool_fan_enabled = False
-raft_air_gap = 0.3
+raft_airgap = 0.3
 speed_prime_tower = 30.0
 speed_print = 120.0
 speed_roofing = 55

diff --git a/...um_methodx_lab_um-absr-175_0.2mm.inst.cfg → ...m_methodx_labs_um-absr-175_0.2mm.inst.cfg b/...um_methodx_lab_um-absr-175_0.2mm.inst.cfg → ...m_methodx_labs_um-absr-175_0.2mm.inst.cfg
@@ -8,12 +8,12 @@ material = ultimaker_absr_175
 quality_type = draft
 setting_version = 22
 type = quality
-variant = Lab
+variant = LABS
 weight = -2
 
 [values]
 cool_fan_enabled = False
-raft_air_gap = 0.3
+raft_airgap = 0.3
 speed_prime_tower = 30.0
 speed_print = 120.0
 speed_roofing = 55

diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg
@@ -15,7 +15,7 @@ weight = -2
 build_volume_temperature = 85
 cool_fan_enabled = False
 default_material_bed_temperature = 95
-raft_air_gap = 0.3
+raft_airgap = 0.3
 speed_prime_tower = 30.0
 speed_print = 120.0
 speed_roofing = 55