Merge branch '5.5' into CURA-10994_translations_v5p5

Ultimaker · Sep 29, 2023 · 0966baa · 0966baa
2 parents 22d75df + 5552b5c
commit 0966baa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py
@@ -28,6 +28,7 @@
 empty_material_container.setMetaDataEntry("base_file", "empty_material")
 empty_material_container.setMetaDataEntry("GUID", "FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF")
 empty_material_container.setMetaDataEntry("material", "empty")
+empty_material_container.setMetaDataEntry("brand", "empty_brand")
 
 # Empty quality
 EMPTY_QUALITY_CONTAINER_ID = "empty_quality"

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
@@ -2453,7 +2453,7 @@
                 "material_print_temperature_layer_0":
                 {
                     "label": "Printing Temperature Initial Layer",
-                    "description": "The temperature used for printing the first layer. Set at 0 to disable special handling of the initial layer.",
+                    "description": "The temperature used for printing the first layer.",
                     "unit": "\u00b0C",
                     "type": "float",
                     "default_value": 215,
@@ -8125,6 +8125,14 @@
                     "resolve": "max(extruderValues('raft_base_wall_count'))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
+                },
+                "group_outer_walls":
+                {
+                    "label": "Group Outer Walls",
+                    "description": "Outer walls of different islands in the same layer are printed in sequence. When enabled the amount of flow changes is limited because walls are printed one type at a time, when disabled the number of travels between islands is reduced because walls in the same islands are grouped.",
+                    "type": "bool",
+                    "default_value": true,
+                    "settable_per_mesh": true
                 }
             }
         },

diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
@@ -39,7 +39,7 @@ Flickable
         padding: UM.Theme.getSize("default_margin").width
         spacing: UM.Theme.getSize("default_margin").height
 
-        width: recommendedPrintSetup.width - 2 * padding - (scroll.visible ? scroll.width : 0)
+        width: recommendedPrintSetup.width - 2 * padding - UM.Theme.getSize("thin_margin").width
 
         // TODO
         property real firstColumnWidth: Math.round(width / 3)

diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg
@@ -32,6 +32,7 @@ wall_0_wipe_dist
 wall_0_inset
 wall_transition_filter_distance
 optimize_wall_printing_order
+group_outer_walls
 inset_direction
 alternate_extra_perimeter
 fill_outline_gaps