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 1/5] 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 b62a5939b98..3acb9823921 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 1de740b000c..5472c50b5f1 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 264f963c106..82d904cd7f4 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 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 2/5] 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 3acb9823921..79a47fd7b25 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 5472c50b5f1..5e63ddea79a 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 82d904cd7f4..ac64e3a95da 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 24618a869b1..add1782368e 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 30ac2e297de..ec82e6b630b 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 d289147439b..f7b45aa0e74 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 a02aa1068b6f7e7a054615f55cf99254eb2f682e Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 3 Nov 2023 11:48:52 +0100 Subject: [PATCH 3/5] Updated Changelog for 5.6 New and improved changelog --- resources/texts/change_log.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index a4c59c2749c..972cb8fbfb7 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,25 @@ +[5.6] + +* New features and improvements: +- Introduced the MethodX and MethodXL printers with it's 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 +- Updated the Support Z Distance to allow for more different values, no longer only multiple layerheights + +* Bug fixes: +- Fixed a crash for some linux users when trying to open the file menu + +* Printer definitions, profiles and materials: +- Introduced Ender 3 V3 SE, contributed by @dim1triy + +* Community translations: +- Updated Spanish translation for Lightning infill, contributed by @Pelochus + +* Known Issue +- The predicted printing time for dual extrusion printjobs on the Method are deviating from the actual printing time. Printjobs will take longer than predicted for now. + + [5.5] * Engine Plugins 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 4/5] - 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 9af2d716a03..9da713da8ce 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 1de740b000c..5472c50b5f1 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 264f963c106..82d904cd7f4 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 b41dad63115..3fb0c11ffc2 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 8e0a4cdddb1..b64da2988f6 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 d52463de8e7..3dae18f97a4 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 62acfc95bf4..4ede69a5f42 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 d76660f0e76..13f2325424a 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 97143d7344c..8af0b5ce3f5 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 e23b9f48b27..7445bd2d42c 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 bb7091627bb..c3fda29d4cd 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 f5a988aea6d..f0407d43fe0 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 864c0d8bdc0..59890d0568a 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 5/5] 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 b0c83399f6b..dad62c9ba6c 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}", ))