Merge remote-tracking branch 'origin/5.10'

conandata.yml

@@ -265,6 +265,10 @@ pycharm_targets:
     module_name: Cura
     name: pytest in TestSettingVisibilityPresets.py
     script_name: tests/Settings/TestSettingVisibilityPresets.py
+  - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja
+    module_name: Cura
+    name: pytest in TestStartEndGCode.py
+    script_name: tests/Machines/TestStartEndGCode.py
 
 pip_requirements_core:
   any_os:

cura/Arranging/ArrangeObjectsJob.py

@@ -40,7 +40,7 @@ class ArrangeObjectsJob(Job):
 
         found_solution_for_all = False
         try:
-            found_solution_for_all = arranger.arrange()
+            found_solution_for_all = arranger.arrange(only_if_full_success = True)
         except:  # If the thread crashes, the message should still close
             Logger.logException("e",
                                 "Unable to arrange the objects on the buildplate. The arrange algorithm has crashed.")

cura/Arranging/Arranger.py

@@ -16,12 +16,16 @@ class Arranger:
         """
         raise NotImplementedError
 
-    def arrange(self, add_new_nodes_in_scene: bool = False) -> bool:
+    def arrange(self, add_new_nodes_in_scene: bool = False, only_if_full_success: bool = False) -> bool:
         """
         Find placement for a set of scene nodes, and move them by using a single grouped operation.
         :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations
         :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects
         """
         grouped_operation, not_fit_count = self.createGroupOperationForArrange(add_new_nodes_in_scene)
-        grouped_operation.push()
-        return not_fit_count == 0
+        full_success = not_fit_count == 0
+
+        if full_success or not only_if_full_success:
+            grouped_operation.push()
+
+        return full_success

cura/Arranging/Nest2DArrange.py

@@ -54,22 +54,6 @@ class Nest2DArrange(Arranger):
         machine_depth = self._build_volume.getDepth() - (edge_disallowed_size * 2)
         build_plate_bounding_box = Box(int(machine_width * self._factor), int(machine_depth * self._factor))
 
-        if self._fixed_nodes is None:
-            self._fixed_nodes = []
-
-        # Add all the items we want to arrange
-        node_items = []
-        for node in self._nodes_to_arrange:
-            hull_polygon = node.callDecoration("getConvexHull")
-            if not hull_polygon or hull_polygon.getPoints is None:
-                Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName()))
-                continue
-            converted_points = []
-            for point in hull_polygon.getPoints():
-                converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor)))
-            item = Item(converted_points)
-            node_items.append(item)
-
         # Use a tiny margin for the build_plate_polygon (the nesting doesn't like overlapping disallowed areas)
         half_machine_width = 0.5 * machine_width - 1
         half_machine_depth = 0.5 * machine_depth - 1
@@ -80,40 +64,66 @@ class Nest2DArrange(Arranger):
             [half_machine_width, half_machine_depth]
         ], numpy.float32))
 
-        disallowed_areas = self._build_volume.getDisallowedAreas()
-        for area in disallowed_areas:
-            converted_points = []
+        def _convert_points(points):
+            if points is not None and len(points) > 2:  # numpy array has to be explicitly checked against None
+                converted_points = []
+                for point in points:
+                    converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor)))
+                return [converted_points]
+            else:
+                return []
 
+        polygons_nodes_to_arrange = []
+        for node in self._nodes_to_arrange:
+            hull_polygon = node.callDecoration("getConvexHull")
+            if not hull_polygon or hull_polygon.getPoints is None:
+                Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName()))
+                continue
+
+            polygons_nodes_to_arrange += _convert_points(hull_polygon.getPoints())
+
+        polygons_disallowed_areas = []
+        for area in self._build_volume.getDisallowedAreas():
             # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise)
             clipped_area = area.intersectionConvexHulls(build_plate_polygon)
 
-            if clipped_area.getPoints() is not None and len(
-                    clipped_area.getPoints()) > 2:  # numpy array has to be explicitly checked against None
-                for point in clipped_area.getPoints():
-                    converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor)))
+            polygons_disallowed_areas += _convert_points(clipped_area.getPoints())
 
-                disallowed_area = Item(converted_points)
+        polygons_fixed_nodes = []
+        if self._fixed_nodes is None:
+            self._fixed_nodes = []
+        for node in self._fixed_nodes:
+            hull_polygon = node.callDecoration("getConvexHull")
+
+            if hull_polygon is not None:
+                polygons_fixed_nodes += _convert_points(hull_polygon.getPoints())
+
+        strategies = [NfpConfig.Alignment.CENTER,
+                      NfpConfig.Alignment.BOTTOM_LEFT,
+                      NfpConfig.Alignment.BOTTOM_RIGHT,
+                      NfpConfig.Alignment.TOP_LEFT,
+                      NfpConfig.Alignment.TOP_RIGHT]
+        found_solution_for_all = False
+        while not found_solution_for_all and len(strategies) > 0:
+
+            # Add all the items we want to arrange
+            node_items = []
+            for polygon in polygons_nodes_to_arrange:
+                node_items.append(Item(polygon))
+
+            for polygon in polygons_disallowed_areas:
+                disallowed_area = Item(polygon)
                 disallowed_area.markAsDisallowedAreaInBin(0)
                 node_items.append(disallowed_area)
 
-        for node in self._fixed_nodes:
-            converted_points = []
-            hull_polygon = node.callDecoration("getConvexHull")
-
-            if hull_polygon is not None and hull_polygon.getPoints() is not None and len(
-                    hull_polygon.getPoints()) > 2:  # numpy array has to be explicitly checked against None
-                for point in hull_polygon.getPoints():
-                    converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor)))
-                item = Item(converted_points)
+            for polygon in polygons_fixed_nodes:
+                item = Item(polygon)
                 item.markAsFixedInBin(0)
                 node_items.append(item)
 
-        strategies = [NfpConfig.Alignment.CENTER] * 3 + [NfpConfig.Alignment.BOTTOM_LEFT] * 3
-        found_solution_for_all = False
-        while not found_solution_for_all and len(strategies) > 0:
             config = NfpConfig()
             config.accuracy = 1.0
-            config.alignment = NfpConfig.Alignment.CENTER
+            config.alignment = NfpConfig.Alignment.DONT_ALIGN
             config.starting_point = strategies[0]
             strategies = strategies[1:]
 

cura/Machines/Models/ActiveIntentQualitiesModel.py

@@ -72,6 +72,13 @@ class ActiveIntentQualitiesModel(ListModel):
                     new_items.append(intent)
                     added_quality_type_set.add(intent["quality_type"])
 
+        # If there aren't any possibilities when the Intent is kept the same, attempt to set it 'back' to default.
+        current_quality_type = global_stack.quality.getMetaDataEntry("quality_type")
+        if len(new_items) == 0 and self._intent_category != "default" and current_quality_type != "not_supported":
+            IntentManager.getInstance().selectIntent("default", current_quality_type)
+            self._update()
+            return
+
         new_items = sorted(new_items, key=lambda x: x["layer_height"])
         self.setItems(new_items)
 

cura/MultiplyObjectsJob.py

@@ -84,6 +84,7 @@ class MultiplyObjectsJob(Job):
                 arranger = Nest2DArrange(nodes, Application.getInstance().getBuildVolume(), fixed_nodes, factor=1000)
 
             group_operation, not_fit_count = arranger.createGroupOperationForArrange(add_new_nodes_in_scene=True)
+            found_solution_for_all = not_fit_count == 0
 
         if nodes_to_add_without_arrange:
             for nested_node in nodes_to_add_without_arrange:

cura/UI/PrintInformation.py

@@ -449,6 +449,6 @@ class PrintInformation(QObject):
         """If this is a sort of output 'device' (like local or online file storage, rather than a printer),
            the user could have altered the file-name, and thus the project name should be altered as well."""
         if isinstance(output_device, ProjectOutputDevice):
-            new_name = output_device.getLastOutputName()
+            new_name = output_device.popLastOutputName()
             if new_name is not None:
                 self.setJobName(os.path.splitext(os.path.basename(new_name))[0])

plugins/CuraEngineBackend/StartSliceJob.py

@@ -76,7 +76,7 @@ class GcodeStartEndFormatter:
     # will be used. Alternatively, if the expression is formatted as "{[expression], [extruder_nr]}",
     # then the expression will be evaluated with the extruder stack of the specified extruder_nr.
 
-    _instruction_regex = re.compile(r"{(?P<condition>if|else|elif|endif)?\s*(?P<expression>.*?)\s*(?:,\s*(?P<extruder_nr_expr>.*))?\s*}(?P<end_of_line>\n?)")
+    _instruction_regex = re.compile(r"{(?P<condition>if|else|elif|endif)?\s*(?P<expression>[^{}]*?)\s*(?:,\s*(?P<extruder_nr_expr>[^{}]*))?\s*}(?P<end_of_line>\n?)")
 
     def __init__(self, all_extruder_settings: Dict[str, Dict[str, Any]], default_extruder_nr: int = -1) -> None:
         super().__init__()

plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py

@@ -163,11 +163,21 @@ class PurgeLinesAndUnload(Script):
                 "move_to_start":
                 {
                     "label": "Circle around to layer start  ⚠️​",
-                    "description": "Depending on where the 'Layer Start X' and 'Layer Start Y' are for the print, the opening travel move can pass across the print area and leave a string there.  This option will generate an orthogonal path that moves the nozzle around the edges of the build plate and then comes in to the Start Point.  || ⚠️​ || The nozzle will drop to Z0.0 and touch the build plate at each stop in order to 'nail down the string' so it doesn't follow in a straight line.",
+                    "description": "Depending on where the 'Layer Start X' and 'Layer Start Y' are for the print, the opening travel move can pass across the print area and leave a string there.  This option will generate an orthogonal path that moves the nozzle around the edges of the build plate and then comes in to the Start Point.  || ⚠️​ || The nozzle can drop to Z0.0 and touch the build plate at each stop in order to 'nail down the string'.  The nozzle always raises after the touch-down.  It will not drag on the bed.",
                     "type": "bool",
                     "default_value": false,
                     "enabled": true
                 },
+                "move_to_start_min_z":
+                {
+                    "label": "    Minimum Z height ⚠️​",
+                    "description": "When moving to the start position, the nozzle can touch down on the build plate at each stop (Z = 0.0).  That will stick the string to the build plate at each direction change so it doesn't pull across the print area.  Some printers may not respond well to Z=0.0.  You may set a minimum Z height here (min is 0.0 and max is 0.50).  The string must stick or it defeats the purpose of moving around the periphery.",
+                    "type": "float",
+                    "default_value": 0.0,
+                    "minimum_value": 0.0,
+                    "maximum_value": 0.5,
+                    "enabled": "move_to_start"
+                },
                 "adjust_starting_e":
                 {
                     "label": "Adjust Starting E location",
@@ -254,7 +264,9 @@ class PurgeLinesAndUnload(Script):
             self.prime_blob_distance = self.getSettingValueByKey("prime_blob_distance")
         else:
             self.prime_blob_distance = 0
-
+        # Set the minimum Z to stick the string to the build plate when Move to Start is selected.
+        self.touchdown_z = self.getSettingValueByKey("move_to_start_min_z")
+        
         # Mapping settings to corresponding methods
         procedures = {
             "add_purge_lines": self._add_purge_lines,
@@ -385,7 +397,7 @@ class PurgeLinesAndUnload(Script):
         def add_move(axis: str, position: float) -> None:
             moves.append(
                 f"G0 F{self.speed_travel} {axis}{position} ; Start move\n"
-                f"G0 F600 Z0 ; Nail down the string\n"
+                f"G0 F600 Z{self.touchdown_z} ; Nail down the string\n"
                 f"G0 F600 Z2 ; Move up\n"
             )
 
@@ -479,6 +491,14 @@ class PurgeLinesAndUnload(Script):
 
         def calculate_purge_volume(line_width, purge_length, volume_per_mm):
             return round((line_width * 0.3 * purge_length) * 1.25 / volume_per_mm, 5)
+        
+        def adjust_for_prime_blob_gcode(retract_speed, retract_distance):
+            """Generates G-code lines for prime blob adjustment."""
+            gcode_lines = [
+                f"G1 F{retract_speed} E{retract_distance} ; Unretract",
+                "G92 E0 ; Reset extruder"
+            ]
+            return "\n".join(gcode_lines)
 
         purge_location = self.getSettingValueByKey("purge_line_location")
         purge_extrusion_full = True if self.getSettingValueByKey("purge_line_length") == "purge_full" else False
@@ -494,6 +514,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n"
@@ -513,6 +535,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} ; Move\nG0 Y{self.machine_back - 10} ; Move\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n"
@@ -533,6 +557,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Y{self.machine_front + self.border_distance} ; Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n"
@@ -554,6 +580,8 @@ class PurgeLinesAndUnload(Script):
                 purge_str += f"G0 F{self.speed_travel} Y{self.machine_back - self.border_distance} ; Ortho Move to back\n"
                 purge_str += f"G0 X{self.machine_right - 10} ; Ortho move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n"
@@ -575,6 +603,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n"
@@ -594,6 +624,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} Z2 ; Move\nG0 Y{self.machine_back - 10} Z2 ; Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n"
@@ -613,6 +645,8 @@ class PurgeLinesAndUnload(Script):
                 # Travel to the purge start
                 purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Z2 ; Move\nG0 Y{self.machine_front + self.border_distance} Z2 ; Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n"
@@ -633,6 +667,8 @@ class PurgeLinesAndUnload(Script):
                 purge_str += f"G0 F{self.speed_travel} Y{self.machine_back - self.border_distance} Z2; Ortho Move to back\n"
                 purge_str += f"G0 X{self.machine_right - 10} Z2 ; Ortho Move to start\n"
                 purge_str += f"G0 F600 Z0.3 ; Move down\n"
+                if self.prime_blob_enable:
+                    purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist)
                 # Purge two lines
                 purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n"
                 purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n"
@@ -945,7 +981,7 @@ class PurgeLinesAndUnload(Script):
         blob_string = "G0 F1200 Z20 ; Move up\n"
         blob_string += f"G0 F{self.speed_travel} X{blob_x} Y{blob_y} ; Move to blob location\n"
         blob_string += f"G1 F{speed_blob} E{self.prime_blob_distance} ; Blob\n"
-        blob_string += f"G1 F{self.retract_speed} E-{self.retract_dist} ; Retract\n"
+        blob_string += f"G1 F{self.retract_speed} E{self.prime_blob_distance - self.retract_dist} ; Retract\n"
         blob_string += "G92 E0 ; Reset extruder\n"
         blob_string += "M300 P500 S600 ; Beep\n"
         blob_string += "G4 S2 ; Wait\n"

plugins/SimulationView/SimulationPass.py

@@ -67,39 +67,40 @@ class SimulationPass(RenderPass):
         if not self._compatibility_mode:
             self._layer_shader.setUniformValue("u_starts_color", Color(*Application.getInstance().getTheme().getColor("layerview_starts").getRgb()))
 
-        if self._layer_view:
-            self._layer_shader.setUniformValue("u_max_feedrate", self._layer_view.getMaxFeedrate())
-            self._layer_shader.setUniformValue("u_min_feedrate", self._layer_view.getMinFeedrate())
-            self._layer_shader.setUniformValue("u_max_thickness", self._layer_view.getMaxThickness())
-            self._layer_shader.setUniformValue("u_min_thickness", self._layer_view.getMinThickness())
-            self._layer_shader.setUniformValue("u_max_line_width", self._layer_view.getMaxLineWidth())
-            self._layer_shader.setUniformValue("u_min_line_width", self._layer_view.getMinLineWidth())
-            self._layer_shader.setUniformValue("u_max_flow_rate", self._layer_view.getMaxFlowRate())
-            self._layer_shader.setUniformValue("u_min_flow_rate", self._layer_view.getMinFlowRate())
-            self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getSimulationViewType())
-            self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities())
-            self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves())
-            self._layer_shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers())
-            self._layer_shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin())
-            self._layer_shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill())
-            self._layer_shader.setUniformValue("u_show_starts", self._layer_view.getShowStarts())
-        else:
-            #defaults
-            self._layer_shader.setUniformValue("u_max_feedrate", 1)
-            self._layer_shader.setUniformValue("u_min_feedrate", 0)
-            self._layer_shader.setUniformValue("u_max_thickness", 1)
-            self._layer_shader.setUniformValue("u_min_thickness", 0)
-            self._layer_shader.setUniformValue("u_max_flow_rate", 1)
-            self._layer_shader.setUniformValue("u_min_flow_rate", 0)
-            self._layer_shader.setUniformValue("u_max_line_width", 1)
-            self._layer_shader.setUniformValue("u_min_line_width", 0)
-            self._layer_shader.setUniformValue("u_layer_view_type", 1)
-            self._layer_shader.setUniformValue("u_extruder_opacity", [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]])
-            self._layer_shader.setUniformValue("u_show_travel_moves", 0)
-            self._layer_shader.setUniformValue("u_show_helpers", 1)
-            self._layer_shader.setUniformValue("u_show_skin", 1)
-            self._layer_shader.setUniformValue("u_show_infill", 1)
-            self._layer_shader.setUniformValue("u_show_starts", 1)
+        for shader in [self._layer_shader, self._layer_shadow_shader]:
+            if self._layer_view:
+                shader.setUniformValue("u_max_feedrate", self._layer_view.getMaxFeedrate())
+                shader.setUniformValue("u_min_feedrate", self._layer_view.getMinFeedrate())
+                shader.setUniformValue("u_max_thickness", self._layer_view.getMaxThickness())
+                shader.setUniformValue("u_min_thickness", self._layer_view.getMinThickness())
+                shader.setUniformValue("u_max_line_width", self._layer_view.getMaxLineWidth())
+                shader.setUniformValue("u_min_line_width", self._layer_view.getMinLineWidth())
+                shader.setUniformValue("u_max_flow_rate", self._layer_view.getMaxFlowRate())
+                shader.setUniformValue("u_min_flow_rate", self._layer_view.getMinFlowRate())
+                shader.setUniformValue("u_layer_view_type", self._layer_view.getSimulationViewType())
+                shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities())
+                shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves())
+                shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers())
+                shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin())
+                shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill())
+                shader.setUniformValue("u_show_starts", self._layer_view.getShowStarts())
+            else:
+                #defaults
+                shader.setUniformValue("u_max_feedrate", 1)
+                shader.setUniformValue("u_min_feedrate", 0)
+                shader.setUniformValue("u_max_thickness", 1)
+                shader.setUniformValue("u_min_thickness", 0)
+                shader.setUniformValue("u_max_flow_rate", 1)
+                shader.setUniformValue("u_min_flow_rate", 0)
+                shader.setUniformValue("u_max_line_width", 1)
+                shader.setUniformValue("u_min_line_width", 0)
+                shader.setUniformValue("u_layer_view_type", 1)
+                shader.setUniformValue("u_extruder_opacity", [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]])
+                shader.setUniformValue("u_show_travel_moves", 0)
+                shader.setUniformValue("u_show_helpers", 1)
+                shader.setUniformValue("u_show_skin", 1)
+                shader.setUniformValue("u_show_infill", 1)
+                shader.setUniformValue("u_show_starts", 1)
 
         if not self._tool_handle_shader:
             self._tool_handle_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "toolhandle.shader"))

resources/definitions/fdmextruder.def.json

@@ -7,7 +7,7 @@
         "author": "Ultimaker",
         "manufacturer": "Unknown",
         "position": "0",
-        "setting_version": 24,
+        "setting_version": 25,
         "type": "extruder"
     },
     "settings":

resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Unknown",
         "manufacturer": "Unknown",
-        "setting_version": 24,
+        "setting_version": 25,
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,
@@ -3021,6 +3021,7 @@
                                     "minimum_value": "0.0001",
                                     "minimum_value_warning": "50",
                                     "maximum_value_warning": "150",
+                                    "enabled": "roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3035,6 +3036,7 @@
                                     "minimum_value": "0.0001",
                                     "minimum_value_warning": "50",
                                     "maximum_value_warning": "150",
+                                    "enabled": "roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3049,6 +3051,7 @@
                                     "minimum_value": "0.0001",
                                     "minimum_value_warning": "50",
                                     "maximum_value_warning": "150",
+                                    "enabled": "flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3063,6 +3066,7 @@
                                     "minimum_value": "0.0001",
                                     "minimum_value_warning": "50",
                                     "maximum_value_warning": "150",
+                                    "enabled": "flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
@@ -3464,6 +3468,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall_0",
+                                    "enabled": "roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3478,6 +3483,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall_x",
+                                    "enabled": "roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3492,6 +3498,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall_0",
+                                    "enabled": "flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3506,6 +3513,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall_x",
+                                    "enabled": "flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
@@ -3878,7 +3886,7 @@
                                     "maximum_value_warning": "10000",
                                     "default_value": 3000,
                                     "value": "acceleration_wall_0",
-                                    "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3893,7 +3901,7 @@
                                     "maximum_value_warning": "10000",
                                     "default_value": 3000,
                                     "value": "acceleration_wall_x",
-                                    "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3908,7 +3916,7 @@
                                     "maximum_value_warning": "10000",
                                     "default_value": 3000,
                                     "value": "acceleration_wall_0",
-                                    "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -3923,7 +3931,7 @@
                                     "maximum_value_warning": "10000",
                                     "default_value": 3000,
                                     "value": "acceleration_wall_x",
-                                    "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
@@ -4251,7 +4259,7 @@
                                     "maximum_value_warning": "50",
                                     "default_value": 20,
                                     "value": "jerk_wall_0",
-                                    "enabled": "resolveOrValue('jerk_enabled')",
+                                    "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -4265,7 +4273,7 @@
                                     "maximum_value_warning": "50",
                                     "default_value": 20,
                                     "value": "jerk_wall_x",
-                                    "enabled": "resolveOrValue('jerk_enabled')",
+                                    "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -4279,7 +4287,7 @@
                                     "maximum_value_warning": "50",
                                     "default_value": 20,
                                     "value": "jerk_wall_0",
-                                    "enabled": "resolveOrValue('jerk_enabled')",
+                                    "enabled": "resolveOrValue('jerk_enabled') and flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
@@ -4293,7 +4301,7 @@
                                     "maximum_value_warning": "50",
                                     "default_value": 20,
                                     "value": "jerk_wall_x",
-                                    "enabled": "resolveOrValue('jerk_enabled')",
+                                    "enabled": "resolveOrValue('jerk_enabled') and flooring_layer_count > 0 and bottom_layers > 0",
                                     "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
@@ -4985,31 +4993,6 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "cool_min_layer_time_overhang":
-                {
-                    "label": "Minimum Layer Time with Overhang",
-                    "description": "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated.",
-                    "unit": "s",
-                    "type": "float",
-                    "default_value": 5,
-                    "value": "cool_min_layer_time",
-                    "minimum_value": "0",
-                    "maximum_value_warning": "600",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
-                "cool_min_layer_time_overhang_min_segment_length":
-                {
-                    "label": "Minimum Overhang Segment Length",
-                    "description": "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value.",
-                    "unit": "mm",
-                    "type": "float",
-                    "default_value": 5,
-                    "minimum_value": "0",
-                    "maximum_value_warning": "500",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
                 "cool_min_speed":
                 {
                     "label": "Minimum Speed",
@@ -8699,6 +8682,33 @@
                     "default_value": 90,
                     "settable_per_mesh": true
                 },
+                "cool_min_layer_time_overhang":
+                {
+                    "label": "Minimum Layer Time with Overhang",
+                    "description": "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated.",
+                    "unit": "s",
+                    "type": "float",
+                    "default_value": 5,
+                    "value": "cool_min_layer_time",
+                    "minimum_value": "0",
+                    "maximum_value_warning": "600",
+                    "enabled": "wall_overhang_angle < 90",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "cool_min_layer_time_overhang_min_segment_length":
+                {
+                    "label": "Minimum Overhang Segment Length",
+                    "description": "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 5,
+                    "minimum_value": "0",
+                    "maximum_value_warning": "500",
+                    "enabled": "wall_overhang_angle < 90",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "seam_overhang_angle":
                 {
                     "label": "Seam Overhanging Wall Angle",
@@ -8719,6 +8729,7 @@
                     "unit": "%",
                     "type": "[int]",
                     "default_value": "[100]",
+                    "enabled": "wall_overhang_angle < 90",
                     "settable_per_mesh": true
                 },
                 "bridge_settings_enabled":

resources/definitions/ultimaker.def.json

@@ -84,7 +84,7 @@
         "material_standby_temperature":
         {
             "minimum_value": "0",
-            "value": "material_print_temperature - 100"
+            "value": "resolveOrValue('material_print_temperature') - 100"
         },
         "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" },
         "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" },

resources/definitions/ultimaker_replicator_plus.def.json

@@ -65,7 +65,7 @@
         "machine_extruder_trains": { "0": "ultimaker_replicator_extruder" },
         "preferred_material": "ultimaker_pla_175",
         "preferred_quality_type": "draft",
-        "preferred_variant_name": "ultimaker_replicator_smart_extruder_plus",
+        "preferred_variant_name": "Smart Extruder+",
         "reference_machine_id": "replicator_b",
         "supports_network_connection": true,
         "supports_usb_connection": false,

resources/definitions/ultimaker_s8.def.json

@@ -48,29 +48,147 @@
     },
     "overrides":
     {
-        "acceleration_infill": { "value": "acceleration_print" },
-        "acceleration_layer_0": { "value": 2000 },
-        "acceleration_prime_tower": { "value": "acceleration_print" },
-        "acceleration_print": { "value": 20000 },
-        "acceleration_print_layer_0": { "value": "acceleration_layer_0" },
-        "acceleration_roofing": { "value": "acceleration_wall_0" },
-        "acceleration_skirt_brim": { "value": "acceleration_layer_0" },
-        "acceleration_support": { "value": "acceleration_print" },
-        "acceleration_support_bottom": { "value": "acceleration_support_interface" },
-        "acceleration_support_infill": { "value": "acceleration_support" },
-        "acceleration_support_interface": { "value": "acceleration_support" },
-        "acceleration_support_roof": { "value": "acceleration_support_interface" },
-        "acceleration_topbottom": { "value": "acceleration_print" },
-        "acceleration_travel": { "value": 10000 },
+        "acceleration_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_roofing"
+        },
+        "acceleration_infill":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print"
+        },
+        "acceleration_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": 2000
+        },
+        "acceleration_prime_tower":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print"
+        },
+        "acceleration_print":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": 20000
+        },
+        "acceleration_print_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall_0"
+        },
+        "acceleration_skirt_brim":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_support":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print"
+        },
+        "acceleration_support_bottom":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_support_interface"
+        },
+        "acceleration_support_infill":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_support"
+        },
+        "acceleration_support_interface":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_support"
+        },
+        "acceleration_support_roof":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_support_interface"
+        },
+        "acceleration_topbottom":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print"
+        },
+        "acceleration_travel":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": 10000
+        },
         "acceleration_travel_enabled": { "value": true },
-        "acceleration_travel_layer_0": { "value": "acceleration_layer_0" },
-        "acceleration_wall": { "value": "acceleration_print/8" },
-        "acceleration_wall_0": { "value": "acceleration_wall" },
-        "acceleration_wall_0_roofing": { "value": "acceleration_wall_0" },
-        "acceleration_wall_x": { "value": "acceleration_print" },
-        "acceleration_wall_x_roofing": { "value": "acceleration_wall" },
-        "adhesion_type": { "value": "'skirt'" },
-        "bottom_thickness": { "value": "3*layer_height if top_layers==4 else top_bottom_thickness" },
+        "acceleration_travel_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_wall":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print/8"
+        },
+        "acceleration_wall_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall"
+        },
+        "acceleration_wall_0_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall_0_roofing"
+        },
+        "acceleration_wall_0_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall_0"
+        },
+        "acceleration_wall_x":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_print"
+        },
+        "acceleration_wall_x_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall_x_roofing"
+        },
+        "acceleration_wall_x_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x*0.8",
+            "value": "acceleration_wall"
+        },
+        "adhesion_type": { "value": "'brim' if support_enable and support_structure=='tree' else 'skirt'" },
+        "bottom_thickness": { "value": "3*layer_height if top_layers==4 and not support_enable else top_bottom_thickness" },
         "bridge_skin_material_flow": { "value": 200 },
         "bridge_skin_speed":
         {
@@ -89,16 +207,28 @@
         "cool_min_layer_time_overhang": { "value": 9 },
         "cool_min_layer_time_overhang_min_segment_length": { "value": 2 },
         "cool_min_speed": { "value": 6 },
-        "cool_min_temperature": { "value": "material_print_temperature-15" },
+        "cool_min_temperature":
+        {
+            "minimum_value_warning": "material_print_temperature-15",
+            "value": "material_print_temperature-15"
+        },
         "default_material_print_temperature": { "maximum_value_warning": 320 },
         "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" },
+        "flooring_layer_count": { "value": 1 },
         "gradual_flow_enabled": { "value": false },
         "hole_xy_offset": { "value": 0.075 },
+        "infill_material_flow": { "value": "material_flow" },
         "infill_overlap": { "value": 10 },
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" },
         "infill_sparse_density": { "value": 15 },
         "infill_wall_line_count": { "value": "1 if infill_sparse_density > 80 else 0" },
         "initial_bottom_layers": { "value": 2 },
+        "jerk_flooring":
+        {
+            "maximum_value_warning": "machine_max_jerk_xy / 2",
+            "unit": "m/s\u00b3",
+            "value": "jerk_roofing"
+        },
         "jerk_infill":
         {
             "maximum_value_warning": "machine_max_jerk_xy / 2",
@@ -202,6 +332,12 @@
             "unit": "m/s\u00b3",
             "value": "jerk_wall"
         },
+        "jerk_wall_0_flooring":
+        {
+            "maximum_value_warning": "machine_max_jerk_xy / 2",
+            "unit": "m/s\u00b3",
+            "value": "jerk_wall_0_roofing"
+        },
         "jerk_wall_0_roofing":
         {
             "maximum_value_warning": "machine_max_jerk_xy / 2",
@@ -214,6 +350,12 @@
             "unit": "m/s\u00b3",
             "value": "jerk_print"
         },
+        "jerk_wall_x_flooring":
+        {
+            "maximum_value_warning": "machine_max_jerk_xy / 2",
+            "unit": "m/s\u00b3",
+            "value": "jerk_wall_x_roofing"
+        },
         "jerk_wall_x_roofing":
         {
             "maximum_value_warning": "machine_max_jerk_xy / 2",
@@ -221,6 +363,8 @@
             "value": "jerk_wall_0"
         },
         "machine_gcode_flavor": { "default_value": "Cheetah" },
+        "machine_max_acceleration_x": { "default_value": 50000 },
+        "machine_max_acceleration_y": { "default_value": 50000 },
         "machine_max_feedrate_x": { "default_value": 500 },
         "machine_max_feedrate_y": { "default_value": 500 },
         "machine_max_jerk_e":
@@ -261,6 +405,7 @@
         "optimize_wall_printing_order": { "value": false },
         "prime_tower_brim_enable": { "value": true },
         "prime_tower_min_volume": { "value": 10 },
+        "prime_tower_mode": { "resolve": "'normal'" },
         "retraction_amount": { "value": 6.5 },
         "retraction_combing_avoid_distance": { "value": 1.2 },
         "retraction_combing_max_distance": { "value": 50 },
@@ -273,6 +418,7 @@
         "skin_material_flow": { "value": 95 },
         "skin_overlap": { "value": 0 },
         "skin_preshrink": { "value": 0 },
+        "skirt_brim_minimal_length": { "value": 1000 },
         "skirt_brim_speed":
         {
             "maximum_value_warning": 300,
@@ -281,6 +427,11 @@
         "skirt_line_count": { "value": 5 },
         "small_skin_on_surface": { "value": false },
         "small_skin_width": { "value": 4 },
+        "speed_flooring":
+        {
+            "maximum_value_warning": 300,
+            "value": "speed_roofing"
+        },
         "speed_infill":
         {
             "maximum_value_warning": 300,
@@ -319,7 +470,7 @@
         "speed_support":
         {
             "maximum_value_warning": 300,
-            "value": "speed_wall_0"
+            "value": "speed_wall"
         },
         "speed_support_bottom":
         {
@@ -334,7 +485,7 @@
         "speed_support_interface":
         {
             "maximum_value_warning": 300,
-            "value": 50
+            "value": 80
         },
         "speed_support_roof":
         {
@@ -349,11 +500,13 @@
         "speed_travel":
         {
             "maximum_value": 500,
-            "value": 500
+            "maximum_value_warning": 400,
+            "value": 400
         },
         "speed_travel_layer_0":
         {
             "maximum_value": 500,
+            "maximum_value_warning": 400,
             "value": 150
         },
         "speed_wall":
@@ -366,6 +519,11 @@
             "maximum_value_warning": 300,
             "value": "speed_wall"
         },
+        "speed_wall_0_flooring":
+        {
+            "maximum_value_warning": 300,
+            "value": "speed_wall_0_roofing"
+        },
         "speed_wall_0_roofing":
         {
             "maximum_value_warning": 300,
@@ -376,19 +534,36 @@
             "maximum_value_warning": 300,
             "value": "speed_print"
         },
+        "speed_wall_x_flooring":
+        {
+            "maximum_value_warning": 300,
+            "value": "speed_wall_x_roofing"
+        },
         "speed_wall_x_roofing":
         {
             "maximum_value_warning": 300,
             "value": "speed_wall"
         },
-        "support_brim_line_count": { "value": 5 },
-        "support_infill_rate": { "value": "80 if gradual_support_infill_steps != 0 else 15" },
+        "support_angle": { "value": 60 },
+        "support_bottom_distance": { "maximum_value_warning": "3*layer_height" },
+        "support_bottom_offset": { "value": 0 },
+        "support_brim_width": { "value": 10 },
         "support_interface_enable": { "value": true },
+        "support_interface_offset": { "value": "support_offset" },
+        "support_line_width": { "value": "1.25*line_width" },
+        "support_offset": { "value": "1.2 if support_structure == 'tree' else 0.8" },
         "support_pattern": { "value": "'gyroid' if support_structure == 'tree' else 'lines'" },
+        "support_roof_height": { "minimum_value_warning": 0 },
         "support_structure": { "value": "'normal'" },
+        "support_top_distance": { "maximum_value_warning": "3*layer_height" },
+        "support_tree_bp_diameter": { "value": 15 },
+        "support_tree_tip_diameter": { "value": 1.0 },
+        "support_tree_top_rate": { "value": 20 },
+        "support_xy_distance_overhang": { "value": "machine_nozzle_size" },
         "support_z_distance": { "value": "0.4*material_shrinkage_percentage_z/100.0" },
         "top_bottom_thickness": { "value": "round(4*layer_height, 2)" },
         "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
         "wall_0_acceleration": { "value": 1000 },
         "wall_0_deceleration": { "value": 1000 },
         "wall_0_end_speed_ratio": { "value": 100 },

resources/definitions/ultimaker_sketch.def.json

@@ -55,10 +55,6 @@
             "basf_",
             "jabil_",
             "polymaker_",
-            "ultimaker_rapidrinse",
-            "ultimaker_sr30",
-            "ultimaker_petg",
-            "ultimaker_pva",
             "ultimaker_pc-abs",
             "ultimaker_pc-abs-fr"
         ],
@@ -66,6 +62,7 @@
         "has_materials": true,
         "has_variants": true,
         "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" },
+        "preferred_material": "ultimaker_pla_175",
         "preferred_quality_type": "draft",
         "preferred_variant_name": "0.4mm",
         "reference_machine_id": "sketch",

resources/definitions/ultimaker_sketch_sprint.def.json

@@ -397,8 +397,6 @@
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
         "z_seam_position": { "value": "'backleft'" },
         "z_seam_type": { "value": "'sharpest_corner'" },
-        "z_seam_x": { "value": 150 },
-        "z_seam_y": { "value": 180 },
         "zig_zaggify_infill": { "value": true }
     }
 }

resources/i18n/ja_JP/cura.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-02-21 15:37+0100\n"
-"PO-Revision-Date: 2024-10-30 02:53+0000\n"
+"PO-Revision-Date: 2025-03-02 04:30+0000\n"
 "Last-Translator: h1data <h1data@users.noreply.github.com>\n"
 "Language-Team: Japanese <https://github.com/h1data/Cura/wiki>\n"
 "Language: ja_JP\n"
@@ -175,7 +175,7 @@ msgstr "3Dビュー"
 
 msgctxt "name"
 msgid "3DConnexion mouses"
-msgstr ""
+msgstr "3DConnexionマウス"
 
 msgctxt "@item:inlistbox"
 msgid "3MF File"
@@ -474,7 +474,7 @@ msgstr "G-codeファイルの読み込み、表示を許可する。"
 
 msgctxt "description"
 msgid "Allows working with 3D mouses inside Cura."
-msgstr ""
+msgstr "Curaで3Dマウスの利用を許可します。"
 
 msgctxt "@option:discardOrKeep"
 msgid "Always ask me this"
@@ -1063,7 +1063,7 @@ msgstr "<filename>{0}</filename>を保存できませんでした: <message>{1}<
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Could not save to removable drive {0}: {1}"
-msgstr "リムーバブルドライブ{0}に保存することができませんでした: {1}"
+msgstr "リムーバブルドライブ{0}に保存できませんでした: {1}"
 
 msgctxt "@info:text"
 msgid "Could not upload the data to the printer."
@@ -1461,7 +1461,7 @@ msgstr "リムーバブルデバイス{0}を取り出す"
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Ejected {0}. You can now safely remove the drive."
-msgstr "{0}取り出し完了。デバイスを安全に取り外せます。"
+msgstr "{0}を取り出しました。デバイスを安全に取り外せます。"
 
 msgctxt "@label"
 msgid "Empty"
@@ -1477,7 +1477,7 @@ msgstr "エクストルーダーを有効にする"
 
 msgctxt "@label"
 msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards. Disabling it results in a skirt around object by default."
-msgstr "縁またはラフトの印刷を有効にできます。これにより、オブジェクトの周囲または下に平らな部分が追加され、後で簡単に切り取ることができます。無効にすると、デフォルトでオブジェクトの周囲にスカートが形成されます。"
+msgstr "ブリムまたはラフトの印刷を有効にできます。これにより、オブジェクトの周囲または下に平らな部分が追加され、後で簡単に切り取ることができます。無効にすると、デフォルトでオブジェクトの周囲にスカートが形成されます。"
 
 msgctxt "@label"
 msgid "Enabled"
@@ -1594,7 +1594,7 @@ msgstr "エクストルーダー%1"
 
 msgctxt "@label"
 msgid "Extruder Change duration"
-msgstr ""
+msgstr "エクストルーダー切り替え時間"
 
 msgctxt "@title:label"
 msgid "Extruder End G-code"
@@ -1606,7 +1606,7 @@ msgstr "エクストルーダー終了Gコードの時間"
 
 msgctxt "@title:label"
 msgid "Extruder Prestart G-code"
-msgstr ""
+msgstr "エクストルーダー開始前G-Code"
 
 msgctxt "@title:label"
 msgid "Extruder Start G-code"
@@ -1767,7 +1767,7 @@ msgstr "プリンターと接続されていないため、ファームウェア
 
 msgctxt "@label"
 msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work."
-msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターとして成すべき点を補います。"
+msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターを動作できるようにします。"
 
 msgctxt "@label"
 msgid "Firmware update completed."
@@ -1799,7 +1799,7 @@ msgstr "次の空き"
 
 msgctxt "@option:check"
 msgid "Flip model's toolhandle Y axis (restart required)"
-msgstr ""
+msgstr "モデルツールハンドルのY軸を反転（再起動が必要）"
 
 msgctxt "@label:listbox"
 msgid "Flow"
@@ -1894,7 +1894,7 @@ msgstr "一般"
 
 msgctxt "@label"
 msgid "Generate structures to support parts of the model which have overhangs. Without these structures, these parts would collapse during printing."
-msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩壊してしまいます。"
+msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩れてしまいます。"
 
 msgctxt "@label:category menu label"
 msgid "Generic"
@@ -2023,7 +2023,7 @@ msgstr "モデルを取り込む"
 
 msgctxt "@label:MonitorStatus"
 msgid "In maintenance. Please check the printer"
-msgstr "メンテナンス。プリンターをチェックしてください"
+msgstr "メンテナンス中です。プリンターをチェックしてください"
 
 msgctxt "@info"
 msgid "In order to monitor your print from Cura, please connect the printer."
@@ -2291,7 +2291,7 @@ msgstr "ビルドプレートを調整する"
 
 msgctxt "@title:window The argument is a package name, and the second is the version."
 msgid "License for %1 %2"
-msgstr ""
+msgstr "%1 %2のライセンス"
 
 msgctxt "@item:inlistbox"
 msgid "Lighter is higher"
@@ -2399,7 +2399,7 @@ msgstr "Makerbotプリントファイルライター"
 
 msgctxt "@item:inlistbox"
 msgid "Makerbot Replicator+ Printfile"
-msgstr ""
+msgstr "Makerbot Replicator+ プリントファイル"
 
 msgctxt "@item:inlistbox"
 msgid "Makerbot Sketch Printfile"
@@ -2459,7 +2459,7 @@ msgstr "プリンター管理"
 
 msgctxt "@text"
 msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
-msgstr "UltiMaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。"
+msgstr "ここでUltiMaker Curaのプラグインと材料プロファイルを管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。"
 
 msgctxt "description"
 msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
@@ -2467,7 +2467,7 @@ msgstr "アプリケーションの拡張機能を管理し、UltiMakerウェブ
 
 msgctxt "description"
 msgid "Manages network connections to UltiMaker networked printers."
-msgstr "Ultimakerのネットワーク接属できるプリンターのネットワーク接続を管理します。"
+msgstr "ネットワーク対応Ultimakerプリンターのネットワーク接続を管理します。"
 
 msgctxt "@label"
 msgid "Manufacturer"
@@ -4015,7 +4015,7 @@ msgstr "スライスのクラッシュを自動的にUltimakerに報告するか
 
 msgctxt "@info:tooltip"
 msgid "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before."
-msgstr ""
+msgstr "ツールハンドルのY軸移動を反転するかどうか。これはモデルのY軸方向のみに影響し、プリントヘッド設定など他の設定は影響せず、従前と変わらず動作します。"
 
 msgctxt "@info:tooltip"
 msgid "Should the build plate be cleared before loading a new model in the single instance of Cura?"
@@ -4255,7 +4255,7 @@ msgstr "開始G-Code"
 
 msgctxt "@label"
 msgid "Start GCode must be first"
-msgstr ""
+msgstr "開始G-Codeを必ず最初に実行"
 
 msgctxt "@label"
 msgid "Start the slicing process"
@@ -4267,7 +4267,7 @@ msgstr "開始"
 
 msgctxt "@text"
 msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
-msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズすることができます。"
+msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズできます。"
 
 msgctxt "@label"
 msgid "Strength"
@@ -4405,7 +4405,7 @@ msgstr "バックアップが最大ファイルサイズを超えています。
 
 msgctxt "@text"
 msgid "The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy."
-msgstr "バランスのとれたプロファイルは、生産性、表面品質、機械的特性、寸法精度のバランスを取るために設計されています。"
+msgstr "バランスプロファイルは、生産性、表面品質、機械的特性、寸法精度のバランスを取るために設計されています。"
 
 msgctxt "@info:tooltip"
 msgid "The base height from the build plate in millimeters."
@@ -4470,7 +4470,7 @@ msgstr "<filename>{0}</filename> は既に存在します。ファイルを上
 
 msgctxt "@label"
 msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements."
-msgstr "配達時のファームウェアで動かすことはできますが、新しいバージョンの方がより改善され、便利なフィーチャーがついてきます。"
+msgstr "出荷時のファームウェアは動作しますが、新しいバージョンの方がより改善され、便利な機能があります。"
 
 msgctxt "@info:backup_failed"
 msgid "The following error occurred while trying to restore a Cura backup:"
@@ -4593,7 +4593,7 @@ msgstr "Digital Factoryからの応答に重要な情報がありません。"
 
 msgctxt "@tooltip"
 msgid "The target temperature of the heated bed. The bed will heat up or cool down towards this temperature. If this is 0, the bed heating is turned off."
-msgstr "ヒーティッドベッドの目標温度。ベッドはこの温度に向けて上がったり下がったりします。これが0の場合、ベッドの加熱はオフになっています。"
+msgstr "ヒーテッドベッドの目標温度。ベッドはこの温度に向けて上がったり下がったりします。これが0の場合、ベッドの加熱はオフになっています。"
 
 msgctxt "@tooltip"
 msgid "The target temperature of the hotend. The hotend will heat up or cool down towards this temperature. If this is 0, the hotend heating is turned off."
@@ -4601,11 +4601,11 @@ msgstr "ホットエンドの目標温度。ホットエンドはこの温度に
 
 msgctxt "@tooltip of temperature input"
 msgid "The temperature to pre-heat the bed to."
-msgstr "ベッドのプリヒート温度。"
+msgstr "ベッドのプレヒート温度。"
 
 msgctxt "@tooltip of temperature input"
 msgid "The temperature to pre-heat the hotend to."
-msgstr "ホットエンドをプリヒートする温度です。"
+msgstr "ホットエンドをプレヒートする温度です。"
 
 msgctxt "@text"
 msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality."
@@ -4633,7 +4633,7 @@ msgstr "このエクストルーダーの構成に一致するプロファイル
 
 msgctxt "@info:status"
 msgid "There is no active printer yet."
-msgstr "アクティブなプリンターはありません。"
+msgstr "アクティブなプリンターがありません。"
 
 msgctxt "@label"
 msgid "There is no printer found over your network."
@@ -4661,7 +4661,7 @@ msgstr "%1 が認識されていないためこの構成は利用できません
 
 msgctxt "@label"
 msgid "This configuration is not available because there is a mismatch or other problem with core-type %1. Please visit <a href='%2'>the support page</a> to check which cores this printer-type supports w.r.t. new slices."
-msgstr ""
+msgstr "この設定は不整合あるいはコアタイプ%1による他の問題により無効化されました。<a href='%2'>サポートページ</a>をご覧いただくか、このプリンター機種のどのコアが新しいスライスをサポートしているか確認してください。"
 
 msgctxt "@text:window"
 msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?"
@@ -4669,7 +4669,7 @@ msgstr "これはCura Universal Projectファイルです。Cura Universal Proje
 
 msgctxt "@text:window"
 msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?"
-msgstr "これはCuraのプロジェクトファイルです。プロジェクトとしてあけますか、それともモデルのみ取り込みますか？"
+msgstr "これはCuraのプロジェクトファイルです。プロジェクトとして開きますか、それともモデルのみ取り込みますか？"
 
 msgctxt "@label"
 msgid "This material is linked to %1 and shares some of its properties."
@@ -4789,7 +4789,7 @@ msgstr "プリントの成功率を上げるために、ビルドプレートを
 
 msgctxt "@label"
 msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer."
-msgstr "印刷ジョブをネットワーク上のプリンターに直接送信するため、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターをWiFiネットワークに接続されていることを確認してください。Curaをプリンタに接続していない場合でも、USBドライブを使用してg-codeファイルをプリンターに転送することができます。"
+msgstr "印刷ジョブをネットワーク上のプリンターに直接送信するため、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターをWiFiネットワークに接続されていることを確認してください。Curaをプリンタに接続していない場合でも、USBドライブを使用してg-codeファイルをプリンターに転送できます。"
 
 #, python-brace-format
 msgctxt "@message {printer_name} is replaced with the name of the printer"
@@ -5032,7 +5032,7 @@ msgstr "Universal Cura Project"
 
 msgctxt "@action:description Don't translate 'Universal Cura Project'"
 msgid "Universal Cura Project files can be printed on different 3D printers while retaining positional data and selected settings. When exported, all models present on the build plate will be included along with their current position, orientation, and scale. You can also select which per-extruder or per-model settings should be included to ensure proper printing."
-msgstr "Universal Cura Projectファイルは座標情報と選択した設定を保持し、さまざまな3Dプリンタで印刷することができます。エクスポートすると、ビルドプレート上に存在するすべてのモデルに、現在の位置、方向、拡大率が含まれます。適切な印刷を保証するために、エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択することもできます。"
+msgstr "Universal Cura Projectファイルは座標情報と選択した設定を保持し、さまざまな3Dプリンタで印刷できます。エクスポートすると、ビルドプレート上に存在するすべてのモデルに、現在の位置、方向、拡大率が含まれます。適切な印刷を保証するために、エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択できます。"
 
 msgctxt "@label"
 msgid "Unknown"
@@ -5229,7 +5229,7 @@ msgstr "Cura 5.8から Cura 5.9に構成をアップグレードします。"
 
 msgctxt "description"
 msgid "Upgrades configurations from Cura 5.9 to Cura 5.10"
-msgstr ""
+msgstr "Cura 5.9からCura 5.10に構成をアップグレードします。"
 
 msgctxt "@action:button"
 msgid "Upload custom Firmware"
@@ -5373,7 +5373,7 @@ msgstr "バージョン5.8から5.9へのアップグレード"
 
 msgctxt "name"
 msgid "Version Upgrade 5.9 to 5.10"
-msgstr ""
+msgstr "バージョン5.9から5.10へのアップグレード"
 
 msgctxt "@button"
 msgid "View printers in Digital Factory"
@@ -5538,11 +5538,11 @@ msgstr "Y（奥行き）"
 
 msgctxt "@label"
 msgid "Y max ( '+' towards front)"
-msgstr ""
+msgstr "Y座標最大値（'+' で前方へ）"
 
 msgctxt "@label"
 msgid "Y min ( '-' towards back)"
-msgstr ""
+msgstr "Y座標最小値（'-' で後方へ）"
 
 msgctxt "@info"
 msgid "Yes"

resources/i18n/ja_JP/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
 "POT-Creation-Date: 2025-02-21 15:37+0000\n"
-"PO-Revision-Date: 2024-10-27 13:25+0000\n"
+"PO-Revision-Date: 2025-02-25 12:01+0000\n"
 "Last-Translator: h1data <h1data@users.noreply.github.com>\n"
 "Language-Team: Japanese <https://github.com/h1data/Cura/wiki>\n"
 "Language: ja_JP\n"
@@ -38,7 +38,7 @@ msgstr "エクストルーダー"
 
 msgctxt "machine_extruder_change_duration label"
 msgid "Extruder Change duration"
-msgstr ""
+msgstr "エクストルーダー切り替え時間"
 
 msgctxt "machine_extruder_end_code label"
 msgid "Extruder End G-Code"
@@ -62,7 +62,7 @@ msgstr "エクストルーダー終了位置Y座標"
 
 msgctxt "machine_extruder_prestart_code label"
 msgid "Extruder Prestart G-Code"
-msgstr ""
+msgstr "エクストルーダー開始前G-Code"
 
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -146,7 +146,7 @@ msgstr "ノズルY座標オフセット"
 
 msgctxt "machine_extruder_prestart_code description"
 msgid "Prestart g-code to execute before switching to this extruder."
-msgstr ""
+msgstr "このエクストルーダーに切り替える前に実行される開始前G-Code。"
 
 msgctxt "machine_extruder_start_code description"
 msgid "Start g-code to execute when switching to this extruder."
@@ -218,4 +218,4 @@ msgstr "エクストルーダーをオンにする際の開始位置Y座標。"
 
 msgctxt "machine_extruder_change_duration description"
 msgid "When using a multi tool setup, this value is the tool change time in seconds.  This value will be added to the estimate time based on the number of changes that occur."
-msgstr ""
+msgstr "複数のエクストルーダーを用いる構成において、この値はエクストルーダーを切り替える時間を秒で表します。切り替えが発生する回数に基づいて、この値は残り時間に加算されます。"

resources/i18n/ja_JP/fdmprinter.def.json.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
 "POT-Creation-Date: 2025-02-21 15:37+0000\n"
-"PO-Revision-Date: 2024-10-30 02:17+0000\n"
+"PO-Revision-Date: 2025-03-02 04:31+0000\n"
 "Last-Translator: h1data <h1data@users.noreply.github.com>\n"
 "Language-Team: Japanese <https://github.com/h1data/Cura/wiki>\n"
 "Language: ja_JP\n"
@@ -34,7 +34,7 @@ msgstr "フィーダーとノズルチャンバーの間でフィラメントが
 
 msgctxt "flooring_angles description"
 msgid "A list of integer line directions to use when the bottom surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
-msgstr ""
+msgstr "底面の表面レイヤーがジグザグパターンの場合に使用する、ラインの角度を示す整数のリストです。リストの要素はレイヤーが進むごとに順番に使用され、最後に到達すると次は最初からとなります。リスト項目はカンマ区切りで、リストの全体は四角かっこで囲います。既定は空のリストで、この場合は従来の角度（45度と135度）を用います。"
 
 msgctxt "roofing_angles description"
 msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
@@ -306,71 +306,71 @@ msgstr "底面除去幅"
 
 msgctxt "acceleration_wall_x_flooring label"
 msgid "Bottom Surface Inner Wall Acceleration"
-msgstr ""
+msgstr "底面内側ウォールの加速度"
 
 msgctxt "jerk_wall_x_flooring label"
 msgid "Bottom Surface Inner Wall Jerk"
-msgstr ""
+msgstr "底面内側ウォールのジャーク"
 
 msgctxt "speed_wall_x_flooring label"
 msgid "Bottom Surface Inner Wall Speed"
-msgstr ""
+msgstr "底面内側ウォールの速度"
 
 msgctxt "wall_x_material_flow_flooring label"
 msgid "Bottom Surface Inner Wall(s) Flow"
-msgstr ""
+msgstr "底面内側ウォールのフロー"
 
 msgctxt "acceleration_wall_0_flooring label"
 msgid "Bottom Surface Outer Wall Acceleration"
-msgstr ""
+msgstr "底面外側ウォールの加速度"
 
 msgctxt "wall_0_material_flow_flooring label"
 msgid "Bottom Surface Outer Wall Flow"
-msgstr ""
+msgstr "底面外側ウォールのフロー"
 
 msgctxt "jerk_wall_0_flooring label"
 msgid "Bottom Surface Outer Wall Jerk"
-msgstr ""
+msgstr "底面外側ウォールのジャーク"
 
 msgctxt "speed_wall_0_flooring label"
 msgid "Bottom Surface Outer Wall Speed"
-msgstr ""
+msgstr "底面外側ウォールの速度"
 
 msgctxt "acceleration_flooring label"
 msgid "Bottom Surface Skin Acceleration"
-msgstr ""
+msgstr "底面スキンの加速度"
 
 msgctxt "flooring_extruder_nr label"
 msgid "Bottom Surface Skin Extruder"
-msgstr ""
+msgstr "底面スキン用エクストルーダー"
 
 msgctxt "flooring_material_flow label"
 msgid "Bottom Surface Skin Flow"
-msgstr ""
+msgstr "底面スキンのフロー"
 
 msgctxt "jerk_flooring label"
 msgid "Bottom Surface Skin Jerk"
-msgstr ""
+msgstr "底面スキンのジャーク"
 
 msgctxt "flooring_layer_count label"
 msgid "Bottom Surface Skin Layers"
-msgstr ""
+msgstr "底面スキンのレイヤー数"
 
 msgctxt "flooring_angles label"
 msgid "Bottom Surface Skin Line Directions"
-msgstr ""
+msgstr "底面ライン方向"
 
 msgctxt "flooring_line_width label"
 msgid "Bottom Surface Skin Line Width"
-msgstr ""
+msgstr "底面スキンのライン幅"
 
 msgctxt "flooring_pattern label"
 msgid "Bottom Surface Skin Pattern"
-msgstr ""
+msgstr "底面スキンのパターン"
 
 msgctxt "speed_flooring label"
 msgid "Bottom Surface Skin Speed"
-msgstr ""
+msgstr "底面スキンの速度"
 
 msgctxt "bottom_thickness label"
 msgid "Bottom Thickness"
@@ -610,7 +610,7 @@ msgstr "コマンドライン設定"
 
 msgctxt "flooring_pattern option concentric"
 msgid "Concentric"
-msgstr ""
+msgstr "同心円"
 
 msgctxt "infill_pattern option concentric"
 msgid "Concentric"
@@ -1122,7 +1122,7 @@ msgstr "ノズル切替え後のプライムに必要な余剰材料。"
 
 msgctxt "variant_name"
 msgid "Extruder"
-msgstr ""
+msgstr "エクストルーダー"
 
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -1222,7 +1222,7 @@ msgstr "最初のレイヤーの底面ラインのフロー補正"
 
 msgctxt "wall_x_material_flow_flooring description"
 msgid "Flow compensation on bottom surface wall lines for all wall lines except the outermost one."
-msgstr ""
+msgstr "最も外側を除いた底面ウォールのすべてのラインにフロー補正を行います。"
 
 msgctxt "infill_material_flow description"
 msgid "Flow compensation on infill lines."
@@ -1234,7 +1234,7 @@ msgstr "支持材の天井面または床面のフロー補正。"
 
 msgctxt "flooring_material_flow description"
 msgid "Flow compensation on lines of the areas at the bottom of the print."
-msgstr ""
+msgstr "造形物の底におけるラインにフロー補正を行います。"
 
 msgctxt "roofing_material_flow description"
 msgid "Flow compensation on lines of the areas at the top of the print."
@@ -1262,7 +1262,7 @@ msgstr "支持材のフロー補正。"
 
 msgctxt "wall_0_material_flow_flooring description"
 msgid "Flow compensation on the bottom surface outermost wall line."
-msgstr ""
+msgstr "最も外側の底面ウォールのラインにフロー補正を行います。"
 
 msgctxt "wall_0_material_flow_layer_0 description"
 msgid "Flow compensation on the outermost wall line of the first layer."
@@ -1482,7 +1482,7 @@ msgstr "Griffin"
 
 msgctxt "machine_gcode_flavor option Cheetah"
 msgid "Griffin+Cheetah"
-msgstr ""
+msgstr "Griffin+Cheetah"
 
 msgctxt "group_outer_walls label"
 msgid "Group Outer Walls"
@@ -1890,7 +1890,7 @@ msgstr "内側から外側へ"
 
 msgctxt "retraction_combing_avoid_distance label"
 msgid "Inside Travel Avoid Distance"
-msgstr ""
+msgstr "内側の移動経路回避距離"
 
 msgctxt "support_interface_priority option interface_lines_overwrite_support_area"
 msgid "Interface lines preferred"
@@ -2082,7 +2082,7 @@ msgstr "ライン幅"
 
 msgctxt "flooring_pattern option lines"
 msgid "Lines"
-msgstr ""
+msgstr "ライン"
 
 msgctxt "infill_pattern option lines"
 msgid "Lines"
@@ -2414,7 +2414,7 @@ msgstr "最小レイヤー時間"
 
 msgctxt "cool_min_layer_time_overhang label"
 msgid "Minimum Layer Time with Overhang"
-msgstr ""
+msgstr "オーバーハングするレイヤーの最小時間"
 
 msgctxt "min_odd_wall_line_width label"
 msgid "Minimum Odd Wall Line Width"
@@ -2422,7 +2422,7 @@ msgstr "最小奇数ウォールライン幅"
 
 msgctxt "cool_min_layer_time_overhang_min_segment_length label"
 msgid "Minimum Overhang Segment Length"
-msgstr ""
+msgstr "オーバーハングセグメントの最小距離"
 
 msgctxt "minimum_polygon_circumference label"
 msgid "Minimum Polygon Circumference"
@@ -2510,7 +2510,7 @@ msgstr "型ルーフ高さ"
 
 msgctxt "flooring_monotonic label"
 msgid "Monotonic Bottom Surface Order"
-msgstr ""
+msgstr "底面方向の一貫性"
 
 msgctxt "ironing_monotonic label"
 msgid "Monotonic Ironing Order"
@@ -2734,7 +2734,7 @@ msgstr "外側ウォール加速度"
 
 msgctxt "wall_0_deceleration label"
 msgid "Outer Wall End Deceleration"
-msgstr ""
+msgstr "外側ウォールの終了時減速度"
 
 msgctxt "wall_0_end_speed_ratio label"
 msgid "Outer Wall End Speed Ratio"
@@ -2770,7 +2770,7 @@ msgstr "外側ウォールでの速度スプリットの距離"
 
 msgctxt "wall_0_acceleration label"
 msgid "Outer Wall Start Acceleration"
-msgstr ""
+msgstr "外側ウォール開始時加速度"
 
 msgctxt "wall_0_start_speed_ratio label"
 msgid "Outer Wall Start Speed Ratio"
@@ -2798,11 +2798,11 @@ msgstr "オーバーハングウォール角"
 
 msgctxt "wall_overhang_speed_factors label"
 msgid "Overhanging Wall Speeds"
-msgstr ""
+msgstr "オーバーハングウォール速度"
 
 msgctxt "wall_overhang_speed_factors description"
 msgid "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting [75, 50, 25]"
-msgstr ""
+msgstr "オーバーハングするウォールは、通常のプリント速度に対し設定したパーセントの速度でプリントされます。複数の値を指定でき、オーバーハングしたウォールが増えるごとに遅くすることができます。設定例：[75, 50, 25]"
 
 msgctxt "wipe_pause description"
 msgid "Pause after the unretract."
@@ -2838,7 +2838,7 @@ msgstr "希望枝角度"
 
 msgctxt "material_pressure_advance_factor label"
 msgid "Pressure advance factor"
-msgstr ""
+msgstr "圧力推進係数"
 
 msgctxt "wall_transition_filter_deviation description"
 msgid "Prevent transitioning back and forth between one extra wall and one less. This margin extends the range of line widths which follow to [Minimum Wall Line Width - Margin, 2 * Minimum Wall Line Width + Margin]. Increasing this margin reduces the number of transitions, which reduces the number of extrusion starts/stops and travel time. However, large line width variation can lead to under- or overextrusion problems."
@@ -2918,7 +2918,7 @@ msgstr "印刷加速度"
 
 msgctxt "variant_name"
 msgid "Print Core"
-msgstr ""
+msgstr "プリントコア"
 
 msgctxt "jerk_print label"
 msgid "Print Jerk"
@@ -2950,7 +2950,7 @@ msgstr "印刷物の隣に、ノズルを切り替えた後の材料でタワー
 
 msgctxt "flooring_monotonic description"
 msgid "Print bottom surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent."
-msgstr ""
+msgstr "底面のラインを一方向に揃えることで、隣接するラインと常に重なり合います。これによりわずかに印刷時間がかかりますが、平面がより一貫した見た目になります。"
 
 msgctxt "infill_support_enabled description"
 msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength."
@@ -3670,7 +3670,7 @@ msgstr "開始G-Code"
 
 msgctxt "machine_start_gcode_first label"
 msgid "Start GCode must be first"
-msgstr ""
+msgstr "開始G-Codeを必ず最初に実行"
 
 msgctxt "z_seam_type description"
 msgid "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker."
@@ -4094,7 +4094,7 @@ msgstr "内側のウォールがが出力される際のスピード。"
 
 msgctxt "acceleration_flooring description"
 msgid "The acceleration with which bottom surface skin layers are printed."
-msgstr ""
+msgstr "底面レイヤーが印刷される際の加速度。"
 
 msgctxt "acceleration_infill description"
 msgid "The acceleration with which infill is printed."
@@ -4114,11 +4114,11 @@ msgstr "ラフトの底面印刷時の加速度。"
 
 msgctxt "acceleration_wall_x_flooring description"
 msgid "The acceleration with which the bottom surface inner walls are printed."
-msgstr ""
+msgstr "底面内側ウォールが印刷される際の加速度。"
 
 msgctxt "acceleration_wall_0_flooring description"
 msgid "The acceleration with which the bottom surface outermost walls are printed."
-msgstr ""
+msgstr "底面の最も外側のウォールが印刷される際の加速度。"
 
 msgctxt "acceleration_support_bottom description"
 msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model."
@@ -4338,7 +4338,7 @@ msgstr "次のレイヤーの高さを前のレイヤーの高さと比べた差
 
 msgctxt "machine_head_with_fans_polygon description"
 msgid "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative.  Rear of the nozzle is 'Y Min' and must be negative.  X Max (right) and Y Max (front) are positive numbers.  Gantry height is the dimension from the build plate to the X gantry beam."
-msgstr ""
+msgstr "一度にプリントする場合の「モデルとの安全距離」に使用される、プリントヘッドの座標です。これらの数値は最初のエクストルーダーノズルの中心線との相対値になります。ノズルの左側がX軸の最小値で、必ず負の値になります。ノズルの後方がY軸の最小値で、必ず負の値になります。X軸最大値（右側）とY軸最大値（前方）は正の値になります。ガントリーの高さはビルドプレートからガントリーの梁（はり）との距離になります。"
 
 msgctxt "ironing_line_spacing description"
 msgid "The distance between the lines of ironing."
@@ -4350,7 +4350,7 @@ msgstr "Z軸シームにおける、モデルとそのサポート構造との
 
 msgctxt "retraction_combing_avoid_distance description"
 msgid "The distance between the nozzle and already printed outer walls when travelling inside a model."
-msgstr ""
+msgstr "モデルの内側を移動する際の、ノズルとプリント済みの外側ウォールとの距離。"
 
 msgctxt "travel_avoid_distance description"
 msgid "The distance between the nozzle and already printed parts when avoiding during travel moves."
@@ -4462,7 +4462,7 @@ msgstr "インフィル造形時に使われるエクストルーダー。デュ
 
 msgctxt "flooring_extruder_nr description"
 msgid "The extruder train used for printing the bottom most skin. This is used in multi-extrusion."
-msgstr ""
+msgstr "最低面のスキンを印刷時に使用するエクストルーダー列。複数のエクストルーダーがある場合に使用されます。"
 
 msgctxt "wall_x_extruder_nr description"
 msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion."
@@ -4714,7 +4714,7 @@ msgstr "内側のウォールがプリントされれう際の最大瞬間速度
 
 msgctxt "jerk_flooring description"
 msgid "The maximum instantaneous velocity change with which bottom surface skin layers are printed."
-msgstr ""
+msgstr "底面スキンレイヤーをプリントする際の最大瞬間速度変化です。"
 
 msgctxt "jerk_infill description"
 msgid "The maximum instantaneous velocity change with which infill is printed."
@@ -4722,11 +4722,11 @@ msgstr "インフィルの印刷時の瞬間速度の変更。"
 
 msgctxt "jerk_wall_x_flooring description"
 msgid "The maximum instantaneous velocity change with which the bottom surface inner walls are printed."
-msgstr ""
+msgstr "底面内側ウォールをプリントする際の最大瞬間速度変化です。"
 
 msgctxt "jerk_wall_0_flooring description"
 msgid "The maximum instantaneous velocity change with which the bottom surface outermost walls are printed."
-msgstr ""
+msgstr "底面の最も外側のウォールをプリントする際の最大瞬間速度変化です。"
 
 msgctxt "jerk_support_bottom description"
 msgid "The maximum instantaneous velocity change with which the floors of support are printed."
@@ -4870,7 +4870,7 @@ msgstr "プライムタワーシェルの最小の厚さ。厚くすることで
 
 msgctxt "cool_min_layer_time_overhang description"
 msgid "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated."
-msgstr ""
+msgstr "オーバーハングになる押し出しを含むレイヤーでの最小時間です。これは1つのレイヤーに最低限かける時間までプリンターを強制的に遅くします。これにより、次のレイヤーを印刷する前にプリントされた材料が適切に冷却されるようになります。ヘッド持ち上げが無効かつ最低速度を下回ってしまう場合は、レイヤーの印刷時間は最小レイヤー印刷時間より短くなります。"
 
 msgctxt "cool_min_layer_time description"
 msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated."
@@ -4906,7 +4906,7 @@ msgstr "最底面のレイヤー数。下の厚さで計算すると、この値
 
 msgctxt "flooring_layer_count description"
 msgid "The number of bottom most skin layers. Usually only one bottom most layer is sufficient to generate higher quality bottom surfaces."
-msgstr ""
+msgstr "最低面レイヤーの数です。通常、最低面はより良い品質の底面にするのに1レイヤーで十分です。"
 
 msgctxt "raft_base_wall_count description"
 msgid "The number of contours to print around the linear pattern in the base layer of the raft."
@@ -4990,7 +4990,7 @@ msgstr "ノズルの外径。"
 
 msgctxt "flooring_pattern description"
 msgid "The pattern of the bottom most layers."
-msgstr ""
+msgstr "最低面レイヤーのパターンです。"
 
 msgctxt "infill_pattern description"
 msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object."
@@ -5074,7 +5074,7 @@ msgstr "内側のウォールをプリントする速度。外側より内側の
 
 msgctxt "speed_flooring description"
 msgid "The speed at which bottom surface skin layers are printed."
-msgstr ""
+msgstr "底面レイヤーをプリントする際の速度です。"
 
 msgctxt "bridge_skin_speed description"
 msgid "The speed at which bridge skin regions are printed."
@@ -5094,11 +5094,11 @@ msgstr "ベースラフト層が印刷される速度。ノズルから出てく
 
 msgctxt "speed_wall_x_flooring description"
 msgid "The speed at which the bottom surface inner walls are printed."
-msgstr ""
+msgstr "底面内側ウォールをプリントする際の速度です。"
 
 msgctxt "speed_wall_0_flooring description"
 msgid "The speed at which the bottom surface outermost wall is printed."
-msgstr ""
+msgstr "底面の最も外側のウォールをプリントする際の速度です。"
 
 msgctxt "bridge_wall_speed description"
 msgid "The speed at which the bridge walls are printed."
@@ -5422,7 +5422,7 @@ msgstr "この設定は、ラフト上層部の輪郭の内側の角をどの程
 
 msgctxt "machine_start_gcode_first description"
 msgid "This setting controls if the start-gcode is forced to always be the first g-code. Without this option other g-code, such as a T0 can be inserted before the start g-code."
-msgstr ""
+msgstr "この設定は開始G-Codeが必ず最初のG-Codeとなるよう制御します。この設定が無効の場合、T0といった他のG-Codeが開始G-Codeの前に挿入される場合があります。"
 
 msgctxt "retraction_count_max description"
 msgid "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues."
@@ -5658,7 +5658,7 @@ msgstr "ウォールのシームがこの角度以上にオーバーハングし
 
 msgctxt "material_pressure_advance_factor description"
 msgid "Tuning factor for pressure advance, which is meant to synchronize extrusion with motion"
-msgstr ""
+msgstr "吐出と動作を同期するための、圧力推進を調整する係数です。"
 
 msgctxt "machine_gcode_flavor option UltiGCode"
 msgid "Ultimaker 2"
@@ -5874,7 +5874,7 @@ msgstr "部品が薄くなるにつれて異なる数のウォール間を移行
 
 msgctxt "cool_min_layer_time_overhang_min_segment_length description"
 msgid "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value."
-msgstr ""
+msgstr "オーバーハングするレイヤーに最小時間を適用する際、少なくとも1つの連続したオーバーハング移動がこの値より長くなるよう適用されます。"
 
 msgctxt "wipe_hop_enable description"
 msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate."
@@ -5926,7 +5926,7 @@ msgstr "オブジェクトが保存された座標系を使用する代わりに
 
 msgctxt "machine_nozzle_temp_enabled description"
 msgid "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura."
-msgstr "Curaから温度を制御するかどうか。これをオフにして、Cura外からノズル温度を制御することで無効化。"
+msgstr "Curaから温度を制御するかどうか。これをオフにすることで、Cura外からノズル温度を制御します。"
 
 msgctxt "material_bed_temp_prepend description"
 msgid "Whether to include build plate temperature commands at the start of the gcode. When the start_gcode already contains build plate temperature commands Cura frontend will automatically disable this setting."
@@ -5974,7 +5974,7 @@ msgstr "サポートのルーフ、フロアのライン幅。"
 
 msgctxt "flooring_line_width description"
 msgid "Width of a single line of the areas at the bottom of the print."
-msgstr ""
+msgstr "プリントの底面領域における1本のラインの幅です。"
 
 msgctxt "roofing_line_width description"
 msgid "Width of a single line of the areas at the top of the print."
@@ -6178,7 +6178,7 @@ msgstr "ZがX/Yを上書き"
 
 msgctxt "flooring_pattern option zigzag"
 msgid "Zig Zag"
-msgstr ""
+msgstr "ジグザグ"
 
 msgctxt "infill_pattern option zigzag"
 msgid "Zig Zag"

resources/intent/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg

@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25

resources/intent/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg

@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25

resources/qml/Preferences/SettingVisibilityItem.qml

@@ -11,7 +11,7 @@ Item
     // Use the depth of the model to move the item, but also leave space for the visibility / enabled exclamation mark.
 
     // Align checkbox with SettingVisibilityCategory icon with + 5
-    x: definition ? definition.depth * UM.Theme.getSize("narrow_margin").width : UM.Theme.getSize("default_margin").width
+    x: definition ? definition.depth * UM.Theme.getSize("wide_margin").width : UM.Theme.getSize("default_margin").width
 
     UM.TooltipArea
     {
@@ -46,33 +46,26 @@ Item
 
         text:
         {
-            if(provider.properties.enabled == "True")
-            {
-                return ""
-            }
-            var key = definition ? definition.key : ""
-            var requires = settingDefinitionsModel.getRequires(key, "enabled")
-            if (requires.length == 0)
-            {
-                return catalog.i18nc("@item:tooltip", "This setting has been hidden by the active machine and will not be visible.");
-            }
-            else
-            {
-                var requires_text = ""
-                for (var i in requires)
-                {
-                    if (requires_text == "")
-                    {
-                        requires_text = requires[i].label
-                    }
-                    else
-                    {
-                        requires_text += ", " + requires[i].label
-                    }
-                }
+            if (provider.properties.enabled === "True") return "";
 
-                return catalog.i18ncp("@item:tooltip %1 is list of setting names", "This setting has been hidden by the value of %1. Change the value of that setting to make this setting visible.", "This setting has been hidden by the values of %1. Change the values of those settings to make this setting visible.", requires.length) .arg(requires_text);
+            var key = definition ? definition.key : "";
+            var requires = settingDefinitionsModel.getRequires(key, "enabled");
+
+            if (requires.length === 0) {
+                return catalog.i18nc(
+                    "@item:tooltip",
+                    "This setting has been hidden by the active machine and will not be visible."
+                );
             }
+
+            var requiresText = requires.map(r => r.label).join(", ");
+
+            return catalog.i18ncp(
+                "@item:tooltip %1 is list of setting names",
+                "This setting has been hidden by the value of %1. Change the value of that setting to make this setting visible.",
+                "This setting has been hidden by the values of %1. Change the values of those settings to make this setting visible.",
+                requires.length
+            ).arg(requiresText);
         }
 
         UM.ColorImage

resources/qml/Preferences/SettingVisibilityPage.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2022 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.1
+import QtQuick 2.15
 import QtQuick.Controls 2.15
 
 import UM 1.5 as UM
@@ -27,10 +27,7 @@ UM.PreferencesPage
     ]
 
     signal scrollToSection( string key )
-    onScrollToSection:
-    {
-        settingsListView.positionViewAtIndex(definitionsModel.getIndex(key), ListView.Beginning)
-    }
+    onScrollToSection: settingsListView.positionViewAtIndex(definitionsModel.getIndex(key), ListView.Beginning)
 
     function reset()
     {
@@ -118,30 +115,14 @@ UM.PreferencesPage
             model: settingVisibilityPresetsModel.items
             textRole: "name"
 
-            currentIndex:
-            {
-                var idx = -1;
-                for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
-                {
-                    if(settingVisibilityPresetsModel.items[i].presetId === settingVisibilityPresetsModel.activePreset)
-                    {
-                        idx = i;
-                        break;
-                    }
-                }
-                return idx;
-            }
-
-            onActivated:
-            {
-                var preset_id = settingVisibilityPresetsModel.items[index].presetId
-                settingVisibilityPresetsModel.setActivePreset(preset_id)
-            }
+            currentIndex: settingVisibilityPresetsModel.items.findIndex(i => i.presetId === settingVisibilityPresetsModel.activePreset)
+            onActivated: settingVisibilityPresetsModel.setActivePreset(settingVisibilityPresetsModel.items[index].presetId)
         }
 
         ListView
         {
             id: settingsListView
+            reuseItems: true
             anchors
             {
                 top: filter.bottom
@@ -165,31 +146,30 @@ UM.PreferencesPage
                 visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
             }
 
-            property Component settingVisibilityCategory: Cura.SettingVisibilityCategory {}
-            property Component settingVisibilityItem: Cura.SettingVisibilityItem {}
+            Component
+            {
+                id: settingVisibilityCategory
+                Cura.SettingVisibilityCategory {}
+            }
+
+            Component
+            {
+                id: settingVisibilityItem
+                Cura.SettingVisibilityItem {}
+            }
 
             delegate: Loader
             {
                 id: loader
-
                 width: settingsListView.width - scrollBar.width
                 height: model.type !== undefined ? UM.Theme.getSize("section").height : 0
 
                 property var definition: model
                 property var settingDefinitionsModel: definitionsModel
 
-                asynchronous: true
+                asynchronous: false
                 active: model.type !== undefined
-                sourceComponent:
-                {
-                    switch (model.type)
-                    {
-                        case "category":
-                            return settingsListView.settingVisibilityCategory
-                        default:
-                            return settingsListView.settingVisibilityItem
-                    }
-                }
+                sourceComponent: model.type === "category" ? settingVisibilityCategory : settingVisibilityItem
             }
         }
     }

resources/qml/Settings/SettingItem.qml

@@ -53,6 +53,7 @@ Item
     signal showTooltip(string text)
     signal hideTooltip()
     signal showAllHiddenInheritedSettings(string category_id)
+    signal setScrollPositionChangeLoseFocus(bool lose_focus)
 
     function createTooltipText()
     {

resources/qml/Settings/SettingTextField.qml

@@ -92,6 +92,8 @@ SettingItem
 
         UM.Label
         {
+            id: unitLabel
+
             anchors
             {
                 left: parent.left
@@ -106,6 +108,16 @@ SettingItem
             horizontalAlignment: (input.effectiveHorizontalAlignment == Text.AlignLeft) ? Text.AlignRight : Text.AlignLeft
             textFormat: Text.PlainText
             color: UM.Theme.getColor("setting_unit")
+
+            Binding
+            {
+                target: unitLabel
+                property: "text"
+                value:
+                {
+                    return propertyProvider.properties.unit;
+                }
+            }
         }
 
         TextInput
@@ -148,6 +160,11 @@ SettingItem
                 if(activeFocus)
                 {
                     base.focusReceived();
+                    setScrollPositionChangeLoseFocus(false);
+                }
+                else
+                {
+                    setScrollPositionChangeLoseFocus(true);
                 }
                 base.focusGainedByClick = false;
             }

resources/qml/Settings/SettingView.qml

@@ -15,6 +15,7 @@ Item
 
     property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
     property bool findingSettings
+    property bool loseFocusOnScrollPositionChange: true
 
     Item
     {
@@ -195,7 +196,7 @@ Item
             onPositionChanged: {
                 // This removes focus from items when scrolling.
                 // This fixes comboboxes staying open and scrolling container
-                if (!activeFocus && !filter.activeFocus) {
+                if (!activeFocus && !filter.activeFocus && loseFocusOnScrollPositionChange) {
                     forceActiveFocus();
                 }
             }
@@ -320,7 +321,7 @@ Item
 
                 containerStackId: contents.activeMachineId
                 key: model.key
-                watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
+                watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve", "unit" ]
                 storeIndex: 0
                 removeUnusedValue: model.resolve === undefined
             }
@@ -378,6 +379,10 @@ Item
                         }
                     }
                 }
+                function onSetScrollPositionChangeLoseFocus(lose_focus)
+                {
+                    loseFocusOnScrollPositionChange = lose_focus;
+                }
             }
         }
 

resources/quality/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg

@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s3
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25

resources/quality/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg

@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s5
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25

resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg

@@ -23,6 +23,7 @@ retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
 speed_prime_tower = 25
 speed_support = 50
+support_angle = 45
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 support_z_distance = 0

resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg

@@ -24,6 +24,7 @@ retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
 speed_prime_tower = 25
 speed_support = 50
+support_angle = 45
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 support_z_distance = 0

resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg

@@ -24,6 +24,7 @@ retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
 speed_prime_tower = 25
 speed_support = 50
+support_angle = 45
 support_interface_enable = True
 support_z_distance = 0
 

resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg

@@ -24,6 +24,7 @@ retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
 speed_prime_tower = 25
 speed_support = 50
+support_angle = 45
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
 support_z_distance = 0

resources/setting_visibility/expert.cfg

@@ -251,8 +251,6 @@ cool_fan_speed_0
 cool_fan_full_at_height
 cool_fan_full_layer
 cool_min_layer_time
-cool_min_layer_time_overhang
-cool_min_layer_time_overhang_min_segment_length
 cool_min_speed
 cool_lift_head
 cool_during_extruder_switch

resources/texts/change_log.txt

@@ -1,3 +1,64 @@
+[5.10]
+
+* New features and improvements:
+- UltiMaker S8 Support: Added compatibility for the UltiMaker S8 printer.
+- Cheetah Gcode Flavor: Introduced a new Marlin-like Gcode flavor called Cheetah.
+- SpaceMouse support: Navigate the view seamlessly with a 3D mouse, thanks to a collaboration with 3Dconnexion.
+- Cloud Printing for Sketch Sprint: Enabled printing over cloud with Digital Factory for Sketch Sprint users.
+- Interlocking Settings: Moved Interlocking settings out of experimental into expert
+- Build System Upgrade: Upgraded the build system from Conan 1 to Conan 2. Updated documentation is available.
+- Preview Looping: When the last layer is played in the preview, the first layer will now play again instead of stopping.
+- Updated About Page: The About Page now shows the used sources, their licenses, and their versions in a clearer way
+- Flip Y-axis Translate Tool Handle: Added an option to flip the Y-axis translate tool handle in preferences contributed by @GregValiant.
+- Rotation by Input & Snap Angle Input: Introduced rotation by input & snap angle input contributed by @HellAholic and @GregValiant.
+- Purge Lines And Unload Filament Post Processing Script: Added a Purge Lines and Unload Filament Post Processing Script contributed by @GregValiant and @HellAholic
+- Thingiverse "Open in Cura" Button Linux Support: Enabled the "Open in Cura" button from Thingiverse to open files in Linux contributed by @hadess.
+- Multitool Printer Configuration Options: Introduced 3 new configuration options in machine settings for multitool printers contributed by @TheSin-.
+- Search and Replace Post-Processing Plug-In: Significantly improved the Search and Replace post-processing plug-in with features like replacing only the first instance, limiting search to a layer range, and ignoring start-up or ending G-code contributed by @GregValiant
+- Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276
+
+
+* New settings:
+- Overhanging Wall Speeds, now gives you the ability to tune multiple values. Don’t forget to adjust the Overhanging Wall Angle to start using the setting. 
+- Minimum Layer Time with Overhang and Minimum Overhang Segment Length: Fine-tune the minimum layer time for overhangs.
+- Inside Travel Avoid Distance: Finetune combing movements.
+- Pressure Advance Factor Setting: New setting for machine definitions.
+- You can now tune the Bottom Surface Skin, like you can tune the Top Surface Skin! You can now tune Extruder, Layers, Line Width, Pattern, Line Directions, Outer Wall Flow, Inner Wall(s) Flow, Flow, Outer Wall Speed, Inner Wall Speed, Skin Speed, Inner Wall Acceleration, Skin Acceleration, Outer Wall Jerk, Inner Wall Jerk, Skin Jerk, and Monotonic Bottom Surface Order
+- Enable/Disable USB Printing: A hidden preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used.
+
+* Bug fixes:
+- Resolved a crash that occurred when switching materials on Sovol printers.
+- Random Seam no longer favors one side and not is truly random again
+- Reduced the slicing time when no support needs to be generated 
+- Fixed a bug where Seam on Vertex with a User Defined seam position was not working correctly.
+- Gcode replacement with a single line of code no longer produces values in separate lines
+- Setting names that become too long after translation are now truncated.
+- Updated UltiMaker printer logos to align with the current style.
+- The number of decimal places displayed for layer height in the top bar has been reduced.
+- Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders.
+- Improved how fast the settings are loaded in the Settings Visibility window when scrolling
+- Improved how disallowed areas and other models are taken into account when arranging models on the buildplate
+- Preview playback now only shows visible parts. Infill lines, shell, and helpers are always hidden if disabled in preview's color scheme
+
+* Printer definitions, profiles, and materials:
+- Introduced Visual Intents for the Sketch Sprint
+- Introduced new Extra Fast and Draft profiles for the Sketch Sprint
+- Introduced profiles for Sketch printers for Metallic PLA with improved surface quality (matte vs shiny)
+- Introduce High Speed and High Speed Solid intents for Method, Method X, and Method XL
+- Introduced PC ABS and PC ABS FR materials for Method X and Method XL
+- Introduced Nylon Slide for UltiMaker S Series Printers
+- Updated the Breakaway Build Volume Temperature for UltiMaker Factor 4
+- Introduced Makerbot Replicator +
+- Updated Voron2 printers to include TPU ASA and PVA, contributed by @WCEngineer
+- Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276
+
+Cura 5.10 supports macOS 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support previous versions of macOS.
+
+[5.9.1]
+
+* New features and improvements:
+The About Page now shows some of the used sources, their licenses, and their versions in a clearer way. This will be even more complete in Cura 5.10.
+
 [5.9]
 
 * New features and improvements:

tests/Machines/TestStartEndGCode.py

@@ -7,12 +7,6 @@ from unittest.mock import MagicMock
 from plugins.CuraEngineBackend.StartSliceJob import GcodeStartEndFormatter
 
 
-# def createMockedInstanceContainer(container_id):
-#     result = MagicMock()
-#     result.getId = MagicMock(return_value=container_id)
-#     result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect)
-#     return result
-
 class MockValueProvider:
     ##  Creates a mock value provider.
     #
@@ -259,7 +253,7 @@ Q2000
         ''
     ),
 
-(
+    (
         'Unexpected end character',
         None,
 '''{if material_temperature > 200, 0}}
@@ -270,6 +264,20 @@ S2000
 '''S2000
 '''
     ),
+
+    (
+        'Multiple replaces on single line',
+        None,
+'''BT={bed_temperature} IE={initial_extruder}''',
+'''BT=50.0 IE=0'''
+    ),
+
+    (
+        'Multiple extruder replaces on single line',
+        None,
+'''MT0={material_temperature, 0} MT1={material_temperature, 1}''',
+'''MT0=190.0 MT1=210.0'''
+    ),
 ]
 
 def pytest_generate_tests(metafunc):