Merge branch '5.6' into CURA-11262-Update-products-to-id.json

BCN3D · Nov 6, 2023 · 4230f1f · 4230f1f
2 parents 55f8ef9 + 6c481bb
commit 4230f1f
Show file tree

Hide file tree

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

diff --git a/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/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
@@ -83,6 +83,6 @@
     },
     "overrides":
     {
-        "machine_name": { "default_value": "Makerbot Method X" }
+        "machine_name": { "default_value": "UltiMaker Method X" }
     }
 }
diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json
@@ -35,7 +35,7 @@
         "machine_depth": { "default_value": 305 },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 317 },
-        "machine_name": { "default_value": "Makerbot Method XL" },
+        "machine_name": { "default_value": "UltiMaker Method XL" },
         "machine_width": { "default_value": 305 },
         "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
         "speed_travel": { "value": 500 }

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

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

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

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

diff --git a/...m_methodx_lab_um-abscf-175_0.2mm.inst.cfg → ..._methodx_labs_um-abscf-175_0.2mm.inst.cfg b/...m_methodx_lab_um-abscf-175_0.2mm.inst.cfg → ..._methodx_labs_um-abscf-175_0.2mm.inst.cfg
@@ -8,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/...um_methodx_lab_um-absr-175_0.2mm.inst.cfg → ...m_methodx_labs_um-absr-175_0.2mm.inst.cfg b/...um_methodx_lab_um-absr-175_0.2mm.inst.cfg → ...m_methodx_labs_um-absr-175_0.2mm.inst.cfg
@@ -8,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/..._methodxl_lab_um-abscf-175_0.2mm.inst.cfg → ...methodxl_labs_um-abscf-175_0.2mm.inst.cfg b/..._methodxl_lab_um-abscf-175_0.2mm.inst.cfg → ...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/...m_methodxl_lab_um-absr-175_0.2mm.inst.cfg → ..._methodxl_labs_um-absr-175_0.2mm.inst.cfg b/...m_methodxl_lab_um-absr-175_0.2mm.inst.cfg → ..._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/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
@@ -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/...s/variants/ultimaker_methodx_LAB.inst.cfg → .../variants/ultimaker_methodx_LABS.inst.cfg b/...s/variants/ultimaker_methodx_LAB.inst.cfg → .../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/.../variants/ultimaker_methodxl_LAB.inst.cfg → ...variants/ultimaker_methodxl_LABS.inst.cfg b/.../variants/ultimaker_methodxl_LAB.inst.cfg → ...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