Merge remote-tracking branch 'origin/5.6'

Ultimaker · Nov 3, 2023 · 5eb5387 · 5eb5387
2 parents d69a5e0 + a96ec76
commit 5eb5387
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 22 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -298,7 +298,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/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",
@@ -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
@@ -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
@@ -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
@@ -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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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