From 293f2ebda9d0bde887729f80f36b1f0351f96818 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 2 Nov 2023 16:52:34 +0100 Subject: [PATCH 01/23] Revert "Find python dependencies directly in python" This reverts commit e7188c2f9f92b6c9a695d850a987aab0bed5de08. --- CuraVersion.py.jinja | 4 +--- conanfile.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 690a1386d3..515293b8af 100644 --- 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} \ No newline at end of file +PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index 3a53cbf529..9fd377b6b3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -152,6 +152,25 @@ class CuraConan(ConanFile): } return conan_installs + def _python_installs(self): + python_installs = {} + + # list of python installs + outer = '"' if self.settings.os == "Windows" else "'" + inner = "'" if self.settings.os == "Windows" else '"' + python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}" + 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 +197,7 @@ class CuraConan(ConanFile): 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): From 0fd8284a5c9558fd70d3808f8489cb472d6545a3 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 2 Nov 2023 16:53:03 +0100 Subject: [PATCH 02/23] Set source size on image CURA-11263 --- resources/qml/Dialogs/AboutDialog.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index d687f4a25d..abf04613a4 100644 --- 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 From cf2be72cd316bfda6c204908c06d0731579f26db Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 2 Nov 2023 17:15:18 +0100 Subject: [PATCH 03/23] Grey out menu if no items are present CURA-11266 --- resources/qml/Menus/MaterialMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index cee28cee6a..e4d4c37efe 100644 --- 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 { From a43b98dd21967c2a5638fb9ce250c338ee54630b Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:51:07 +0100 Subject: [PATCH 04/23] Update the MakerBot B To align with the branding guide. CURA-11267 --- resources/definitions/ultimaker_method_base.def.json | 2 +- resources/definitions/ultimaker_methodx.def.json | 2 +- resources/definitions/ultimaker_methodxl.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index b62a5939b9..3acb982392 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Method Base Profile", + "name": "MakerBot Method Base Profile", "inherits": "ultimaker", "metadata": { diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 1de740b000..5472c50b5f 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Method X", + "name": "MakerBot Method X", "inherits": "ultimaker_method_base", "metadata": { diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 264f963c10..82d904cd7f 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Method XL", + "name": "MakerBot Method XL", "inherits": "ultimaker_methodx", "metadata": { From d0f1641c4bfaa2d5774b0fe490c6f5659fd44bc1 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:04:43 +0100 Subject: [PATCH 05/23] Set bridging flow to 200 for PETG AA08 02 Increase flow during bridging to prevent stretching and breaking the thread --- resources/definitions/fdmprinter.def.json | 4 ++-- .../quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg | 4 ++-- .../quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c20010090f..63cea43190 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7839,7 +7839,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 +7866,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/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg index 58503dfcd9..e62880cf41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg @@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall acceleration_wall = =acceleration_infill acceleration_wall_0 = 1500 acceleration_wall_x = =acceleration_wall -bridge_skin_material_flow = 100 +bridge_skin_material_flow = 200 bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 -bridge_wall_material_flow = 100 +bridge_wall_material_flow = 200 bridge_wall_speed = 20 cool_min_layer_time = 4 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg index e74b8444f0..a144394b5a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg @@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall acceleration_wall = =acceleration_infill acceleration_wall_0 = 1500 acceleration_wall_x = =acceleration_wall -bridge_skin_material_flow = 100 +bridge_skin_material_flow = 200 bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 -bridge_wall_material_flow = 100 +bridge_wall_material_flow = 200 bridge_wall_speed = 20 cool_min_layer_time = 4 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' From d8e6a2b0b42966a84eec6d60307ab28a479139e0 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:54:28 +0100 Subject: [PATCH 06/23] Align S-line printers This should be in line with the updated brand guide. --- resources/definitions/ultimaker_method_base.def.json | 4 ++-- resources/definitions/ultimaker_methodx.def.json | 4 ++-- resources/definitions/ultimaker_methodxl.def.json | 4 ++-- resources/definitions/ultimaker_s3.def.json | 4 ++-- resources/definitions/ultimaker_s5.def.json | 4 ++-- resources/definitions/ultimaker_s7.def.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 3acb982392..79a47fd7b2 100644 --- 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", diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 5472c50b5f..5e63ddea79 100644 --- 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", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 82d904cd7f..ac64e3a95d 100644 --- 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", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 24618a869b..add1782368 100644 --- 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 index 30ac2e297d..ec82e6b630 100644 --- 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 index d289147439..f7b45aa0e7 100644 --- 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", From a225ee56fd52f1e6052e6be76408bbb74ab84065 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 11:45:25 +0100 Subject: [PATCH 07/23] Resolve QML warning CURA-11263 --- resources/qml/Dialogs/AboutDialog.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index abf04613a4..8ea0c01888 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -109,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 From f9dcb89d3e5192d83bb2bb1d0d7359494170d427 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:19:12 +0100 Subject: [PATCH 08/23] - Bug fix: raft_air_gap -> raft_airgap - Larger prime tower foot (6->10mm) - RapidRinse: disable fan and small area temperature = print temeprature --- resources/definitions/ultimaker_method_base.def.json | 2 +- resources/definitions/ultimaker_methodx.def.json | 2 +- resources/definitions/ultimaker_methodxl.def.json | 2 +- .../ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 2 ++ .../um_methodx_lab_um-abscf-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 2 ++ .../um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_lab_um-absr-175_0.2mm.inst.cfg | 2 +- 13 files changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 9af2d716a0..9da713da8c 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -349,7 +349,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 index 1de740b000..5472c50b5f 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Method X", + "name": "MakerBot Method X", "inherits": "ultimaker_method_base", "metadata": { diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 264f963c10..82d904cd7f 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Method XL", + "name": "MakerBot Method XL", "inherits": "ultimaker_methodx", "metadata": { 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 index b41dad6311..3fb0c11ffc 100644 --- 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 index 8e0a4cdddb..b64da2988f 100644 --- 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 index d52463de8e..3dae18f97a 100644 --- 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/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg index 62acfc95bf..4ede69a5f4 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_lab_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_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg index d76660f0e7..13f2325424 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_lab_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_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 index 97143d7344..8af0b5ce3f 100644 --- 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 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg index e23b9f48b2..7445bd2d42 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-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 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index bb7091627b..c3fda29d4c 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_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/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg index f5a988aea6..f0407d43fe 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_lab_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 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg index 864c0d8bdc..59890d0568 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-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 From a96ec7663b8a1eb068a9c3eb21d2a03477d8eebb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 3 Nov 2023 14:12:11 +0100 Subject: [PATCH 09/23] Fix build script syntax error --- .github/workflows/installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index b0c83399f6..dad62c9ba6 100644 --- 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}", )) From 51ab7409058fd38c4541064d93e87fd64902872f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 14:53:33 +0100 Subject: [PATCH 10/23] Simplify conan install CURA-11263 --- conanfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 9fd377b6b3..20ded4bc3c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -156,9 +156,7 @@ class CuraConan(ConanFile): python_installs = {} # list of python installs - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' - python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}" + 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) From d6d73ed6e6da9def205e69c330a88acc6ae7d048 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:23:49 +0100 Subject: [PATCH 11/23] - Bug fix: ensure the product names in the material files match the Makerbot Method machine definition id --- plugins/XmlMaterialProfile/product_to_id.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json index 7f37a2e2b4..e0f3d74e64 100644 --- 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", + "Makerbot Method": "ultimaker_method", + "Makerbot Method X": "ultimaker_methodx", + "Makerbot Method XL": "ultimaker_methodxl", + "Makerbot Sketch": "ultimaker_sketch", + "Makerbot Sketch Large": "ultimaker_sketch_large" +} \ No newline at end of file From 35d1ae3272dd0ea5204b446db5da05ca65884f5c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 3 Nov 2023 17:04:26 +0100 Subject: [PATCH 12/23] Fix 'brand alignment' messing up actual print files. --- plugins/MakerbotWriter/MakerbotWriter.py | 6 +++--- resources/definitions/ultimaker_method_base.def.json | 2 +- resources/definitions/ultimaker_methodx.def.json | 2 +- resources/definitions/ultimaker_methodxl.def.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 7eeee9c290..a548c56853 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -51,9 +51,9 @@ class MakerbotWriter(MeshWriter): ] _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/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index f574969069..77d0cb37fc 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -329,7 +329,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": "" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 5e63ddea79..8d8e4bd4bd 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,6 +83,6 @@ }, "overrides": { - "machine_name": { "default_value": "Makerbot Method X" } + "machine_name": { "default_value": "UltiMaker Method X" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index ac64e3a95d..837432f029 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -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 } From 55f8ef9791ef8c901311ad6fb9af69bbc1e8d179 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:31:41 +0100 Subject: [PATCH 13/23] Apply suggestions from code review Change Makerbot to UltiMaker Co-authored-by: Casper Lamboo --- plugins/XmlMaterialProfile/product_to_id.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json index e0f3d74e64..5349360d6a 100644 --- a/plugins/XmlMaterialProfile/product_to_id.json +++ b/plugins/XmlMaterialProfile/product_to_id.json @@ -14,9 +14,9 @@ "IDEX420": "strateo3d_IDEX420", "IDEX420 Duplicate": "strateo3d_IDEX420_duplicate", "IDEX420 Mirror": "strateo3d_IDEX420_mirror", - "Makerbot Method": "ultimaker_method", - "Makerbot Method X": "ultimaker_methodx", - "Makerbot Method XL": "ultimaker_methodxl", - "Makerbot Sketch": "ultimaker_sketch", - "Makerbot Sketch Large": "ultimaker_sketch_large" + "UltiMaker Method": "ultimaker_method", + "UltiMaker Method X": "ultimaker_methodx", + "UltiMaker Method XL": "ultimaker_methodxl", + "UltiMaker Sketch": "ultimaker_sketch", + "UltiMaker Sketch Large": "ultimaker_sketch_large" } \ No newline at end of file From 26f472c0a2c7849c449c0869716d3dd157189335 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 6 Nov 2023 12:07:09 +0100 Subject: [PATCH 14/23] Rename Method Lab extruder to LABS CURA-11277 --- ....cfg => um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg} | 2 +- ...t.cfg => um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg} | 2 +- ...cfg => um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg} | 2 +- ....cfg => um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg} | 2 +- ...m.inst.cfg => um_methodx_labs_um-abscf-175_0.2mm.inst.cfg} | 2 +- ...mm.inst.cfg => um_methodx_labs_um-absr-175_0.2mm.inst.cfg} | 2 +- ....inst.cfg => um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg} | 2 +- ...m.inst.cfg => um_methodxl_labs_um-absr-175_0.2mm.inst.cfg} | 2 +- ...r_methodx_LAB.inst.cfg => ultimaker_methodx_LABS.inst.cfg} | 4 ++-- ...methodxl_LAB.inst.cfg => ultimaker_methodxl_LABS.inst.cfg} | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) rename resources/intent/ultimaker_methodx/{um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg => um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg} (93%) rename resources/intent/ultimaker_methodx/{um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg => um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg} (93%) rename resources/intent/ultimaker_methodxl/{um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg => um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg} (93%) rename resources/intent/ultimaker_methodxl/{um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg => um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg} (93%) rename resources/quality/ultimaker_methodx/{um_methodx_lab_um-abscf-175_0.2mm.inst.cfg => um_methodx_labs_um-abscf-175_0.2mm.inst.cfg} (98%) rename resources/quality/ultimaker_methodx/{um_methodx_lab_um-absr-175_0.2mm.inst.cfg => um_methodx_labs_um-absr-175_0.2mm.inst.cfg} (98%) rename resources/quality/ultimaker_methodxl/{um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg => um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg} (98%) rename resources/quality/ultimaker_methodxl/{um_methodxl_lab_um-absr-175_0.2mm.inst.cfg => um_methodxl_labs_um-absr-175_0.2mm.inst.cfg} (98%) rename resources/variants/{ultimaker_methodx_LAB.inst.cfg => ultimaker_methodx_LABS.inst.cfg} (81%) rename resources/variants/{ultimaker_methodxl_LAB.inst.cfg => ultimaker_methodxl_LABS.inst.cfg} (81%) diff --git a/resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg index 45c6ddfa53..a7e099e431 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_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/resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg index 30353ab97e..80c26ac0b4 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_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/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg index b277fe82c6..82735775a6 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_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/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg index 0acc11121c..87e0495be7 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_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/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 4ede69a5f4..da9564ae9d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index 13f2325424..b3107e14a3 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index f0407d43fe..5becec44d9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index 59890d0568..2114be0ff4 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_methodx_LAB.inst.cfg b/resources/variants/ultimaker_methodx_LABS.inst.cfg similarity index 81% rename from resources/variants/ultimaker_methodx_LAB.inst.cfg rename to resources/variants/ultimaker_methodx_LABS.inst.cfg index a4d66495c0..a5232706b9 100644 --- a/resources/variants/ultimaker_methodx_LAB.inst.cfg +++ b/resources/variants/ultimaker_methodx_LABS.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_methodx -name = Lab +name = LABS version = 4 [metadata] @@ -9,6 +9,6 @@ setting_version = 22 type = variant [values] -machine_nozzle_id = Lab +machine_nozzle_id = LABS machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker_methodxl_LAB.inst.cfg b/resources/variants/ultimaker_methodxl_LABS.inst.cfg similarity index 81% rename from resources/variants/ultimaker_methodxl_LAB.inst.cfg rename to resources/variants/ultimaker_methodxl_LABS.inst.cfg index 7e7b6d466f..3c6e538c19 100644 --- a/resources/variants/ultimaker_methodxl_LAB.inst.cfg +++ b/resources/variants/ultimaker_methodxl_LABS.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_methodxl -name = Lab +name = LABS version = 4 [metadata] @@ -9,6 +9,6 @@ setting_version = 22 type = variant [values] -machine_nozzle_id = Lab +machine_nozzle_id = LABS machine_nozzle_size = 0.4 From a111b39ee48e8f1b82b9507d5439cc5fa67f5582 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 6 Nov 2023 14:40:05 +0100 Subject: [PATCH 15/23] Increase print volume for method printers CURA-11260 --- .../ultimaker_method_base.def.json | 3 -- .../definitions/ultimaker_methodx.def.json | 38 ++++++++++++++++++- .../definitions/ultimaker_methodxl.def.json | 37 ++++++++++++++++-- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 77d0cb37fc..9aeb21ffc1 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,19 +321,16 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, - "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, - "machine_height": { "default_value": 196 }, "machine_min_cool_heat_time_window": { "value": 15 }, "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": "" }, - "machine_width": { "default_value": 150 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 8d8e4bd4bd..42616886c2 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,7 +69,7 @@ "platform_offset": [ 0, 0, - 0 + 16 ], "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", @@ -83,6 +83,40 @@ }, "overrides": { - "machine_name": { "default_value": "UltiMaker Method X" } + "machine_name": { "default_value": "UltiMaker Method X" }, + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95], + [-141.65, -95] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95], + [-141.65, 95] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, + "machine_height": { "default_value": 196 }, + "machine_width": { "default_value": 283.3 }, + "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)" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 837432f029..855f6f4546 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,12 +32,43 @@ }, "overrides": { - "machine_depth": { "default_value": 305 }, + "machine_name": { "default_value": "UltiMaker Method XL" }, + "machine_depth": { "default_value": 320 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-204, -160], + [204, -160], + [204, -152.5], + [-204, -152.5] + ], + [ + [-204, 160], + [204, 160], + [204, 152.5], + [-204, 152.5] + ], + [ + [-205, -160], + [-152.5, -160], + [-152.5, 160], + [-205, 160] + ], + [ + [152.5, -160], + [205, -160], + [205, 160], + [152.5, 160] + ] + ] + }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, - "machine_name": { "default_value": "UltiMaker Method XL" }, - "machine_width": { "default_value": 305 }, + "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, + "prime_tower_position_x": { "value": "(305 - (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)) - (305 / 2)" }, + "prime_tower_position_y": { "value": "305 - 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) - (305 / 2)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file From 845338d43b3758432ca82fd5a43279533ee7349f Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Mon, 6 Nov 2023 13:41:43 +0000 Subject: [PATCH 16/23] Applied printer-linter format --- resources/definitions/ultimaker_methodx.def.json | 2 +- resources/definitions/ultimaker_methodxl.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 42616886c2..0bdc8cdb9c 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,7 +83,6 @@ }, "overrides": { - "machine_name": { "default_value": "UltiMaker Method X" }, "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { @@ -115,6 +114,7 @@ ] }, "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "UltiMaker Method X" }, "machine_width": { "default_value": 283.3 }, "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)" } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 855f6f4546..c03eae2ae3 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,7 +32,6 @@ }, "overrides": { - "machine_name": { "default_value": "UltiMaker Method XL" }, "machine_depth": { "default_value": 320 }, "machine_disallowed_areas": { @@ -65,6 +64,7 @@ }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, + "machine_name": { "default_value": "UltiMaker Method XL" }, "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, "prime_tower_position_x": { "value": "(305 - (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)) - (305 / 2)" }, From f4bdda5e5b4552b69b8620b5fe981eb660ab8b5f Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 6 Nov 2023 15:53:47 +0100 Subject: [PATCH 17/23] Update grammar Changed Its to Their --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 972cb8fbfb..56a8509e56 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,7 +1,7 @@ [5.6] * New features and improvements: -- Introduced the MethodX and MethodXL printers with it's materials and the option to write to .makerbot +- Introduced the MethodX and MethodXL printers with their materials and the option to write to .makerbot - Prime tower base settings increase the stability of large prime towers; You can tune the Size, Height, and Slope to increase your prime tower sturdiness - Introduced the setting for Raft Line Spacing, but for the primetower - The Start and End gcodes now accept variables and math including the variables From 70f77dde2924855e792de74b7e51a84ef94e68c7 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 6 Nov 2023 17:24:08 +0100 Subject: [PATCH 18/23] Revert "Increase print volume for method printers" This reverts commit a111b39e --- .../ultimaker_method_base.def.json | 9 +++++ .../definitions/ultimaker_methodx.def.json | 40 ++----------------- .../definitions/ultimaker_methodxl.def.json | 37 +++-------------- 3 files changed, 18 insertions(+), 68 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 9aeb21ffc1..8740d5acc3 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,16 +321,25 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, + "machine_depth": { + "default_value": 190 + }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, + "machine_height": { + "default_value": 196 + }, "machine_min_cool_heat_time_window": { "value": 15 }, "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": "" }, + "machine_width": { + "default_value": 150 + }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 0bdc8cdb9c..a94d708590 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,7 +69,7 @@ "platform_offset": [ 0, 0, - 16 + 0 ], "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", @@ -83,40 +83,8 @@ }, "overrides": { - "machine_depth": { "default_value": 236.48 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -95], - [-141.65, -95] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 95], - [-141.65, 95] - ], - [ - [-141.65, -118.11], - [-75, -118.11], - [-75, 118.37], - [-141.65, 118.37] - ], - [ - [75, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [75, 118.37] - ] - ] - }, - "machine_height": { "default_value": 196 }, - "machine_name": { "default_value": "UltiMaker Method X" }, - "machine_width": { "default_value": 283.3 }, - "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)" } + "machine_name": { + "default_value": "UltiMaker Method X" + } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index c03eae2ae3..aa2043aa13 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,43 +32,16 @@ }, "overrides": { - "machine_depth": { "default_value": 320 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-204, -160], - [204, -160], - [204, -152.5], - [-204, -152.5] - ], - [ - [-204, 160], - [204, 160], - [204, 152.5], - [-204, 152.5] - ], - [ - [-205, -160], - [-152.5, -160], - [-152.5, 160], - [-205, 160] - ], - [ - [152.5, -160], - [205, -160], - [205, 160], - [152.5, 160] - ] - ] + "machine_depth": { + "default_value": 305 }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "UltiMaker Method XL" }, - "machine_width": { "default_value": 410 }, + "machine_width": { + "default_value": 305 + }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "prime_tower_position_x": { "value": "(305 - (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)) - (305 / 2)" }, - "prime_tower_position_y": { "value": "305 - 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) - (305 / 2)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file From f4d1db8961d56b9352ad8e285834e7c0256868b9 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 6 Nov 2023 16:25:27 +0000 Subject: [PATCH 19/23] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 12 +++--------- resources/definitions/ultimaker_methodx.def.json | 4 +--- resources/definitions/ultimaker_methodxl.def.json | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 8740d5acc3..77d0cb37fc 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,25 +321,19 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, - "machine_depth": { - "default_value": 190 - }, + "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, - "machine_height": { - "default_value": 196 - }, + "machine_height": { "default_value": 196 }, "machine_min_cool_heat_time_window": { "value": 15 }, "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": "" }, - "machine_width": { - "default_value": 150 - }, + "machine_width": { "default_value": 150 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index a94d708590..8d8e4bd4bd 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,8 +83,6 @@ }, "overrides": { - "machine_name": { - "default_value": "UltiMaker Method X" - } + "machine_name": { "default_value": "UltiMaker Method X" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index aa2043aa13..837432f029 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,15 +32,11 @@ }, "overrides": { - "machine_depth": { - "default_value": 305 - }, + "machine_depth": { "default_value": 305 }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "UltiMaker Method XL" }, - "machine_width": { - "default_value": 305 - }, + "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 } } From 22abbb82b52551c85b1d3940c6cec38ead279493 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 7 Nov 2023 10:22:17 +0100 Subject: [PATCH 20/23] Remove mm unit from bool type --- resources/definitions/fdmprinter.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index abb765b389..0c6f101d0c 100644 --- 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'", From b5c47ae8f32d3102dc909eadf52bfb9163a57362 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Thu, 2 Nov 2023 11:35:37 +0100 Subject: [PATCH 21/23] Intent type translated while reading 3mf CURA-11221 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 +- plugins/3MFReader/WorkspaceDialog.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 4e3962fd10..b97cb34b01 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -606,7 +606,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): 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 index 135cf58435..8331d49813 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -222,8 +222,14 @@ class WorkspaceDialog(QObject): return self._intent_name def setIntentName(self, intent_name: str) -> None: + intent_name = intent_name.title() if self._intent_name != intent_name: - self._intent_name = intent_name + if intent_name == "": + self._intent_name = "Balanced" + elif intent_name == "Quick": + self._intent_name = "Draft" + else: + self._intent_name = intent_name self.intentNameChanged.emit() @pyqtProperty(str, notify=activeModeChanged) From 9b9f6b1bc3521d1ac7a10906c7ea4f842d8c8975 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 6 Nov 2023 13:12:47 +0530 Subject: [PATCH 22/23] intent name translated from intent_translations CURA-11221 --- plugins/3MFReader/WorkspaceDialog.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 8331d49813..7a1a5f60ef 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -6,6 +6,7 @@ from PyQt6.QtGui import QDesktopServices 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 @@ -222,14 +223,11 @@ class WorkspaceDialog(QObject): return self._intent_name def setIntentName(self, intent_name: str) -> None: - intent_name = intent_name.title() if self._intent_name != intent_name: - if intent_name == "": - self._intent_name = "Balanced" - elif intent_name == "Quick": - self._intent_name = "Draft" - else: - self._intent_name = intent_name + try: + self._intent_name = intent_translations[intent_name]["name"] + except: + self._intent_name = intent_name.title() self.intentNameChanged.emit() @pyqtProperty(str, notify=activeModeChanged) From cba4151ffcfa3aef2bcca4feac63369b54c2dc1f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 7 Nov 2023 10:57:45 +0100 Subject: [PATCH 23/23] Also add balanced to intent names CURA-11221 --- plugins/3MFReader/WorkspaceDialog.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 7a1a5f60ef..0203fc92b5 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -230,6 +230,10 @@ class WorkspaceDialog(QObject): 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) def activeMode(self) -> str: return self._active_mode