Merge branch 'main' into CURA-10542-drop_to_buildplate

conandata.yml

@@ -159,6 +159,10 @@ pycharm_targets:
     module_name: Cura
     name: pytest in TestGCodeListDecorator.py
     script_name: tests/TestGCodeListDecorator.py
+  - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja
+    module_name: Cura
+    name: pytest in TestHitChecker.py
+    script_name: tests/TestHitChecker.py
   - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja
     module_name: Cura
     name: pytest in TestIntentManager.py
@@ -187,6 +191,10 @@ pycharm_targets:
     module_name: Cura
     name: pytest in TestPrintInformation.py
     script_name: tests/TestPrintInformation.py
+  - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja
+    module_name: Cura
+    name: pytest in TestPrintOrderManager.py
+    script_name: tests/TestPrintOrderManager.py
   - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja
     module_name: Cura
     name: pytest in TestProfileRequirements.py

cura/CuraApplication.py

@@ -126,6 +126,7 @@ from .Machines.Models.CompatibleMachineModel import CompatibleMachineModel
 from .Machines.Models.MachineListModel import MachineListModel
 from .Machines.Models.ActiveIntentQualitiesModel import ActiveIntentQualitiesModel
 from .Machines.Models.IntentSelectionModel import IntentSelectionModel
+from .PrintOrderManager import PrintOrderManager
 from .SingleInstance import SingleInstance
 
 if TYPE_CHECKING:
@@ -204,6 +205,7 @@ class CuraApplication(QtApplication):
         self._container_manager = None
 
         self._object_manager = None
+        self._print_order_manager = None
         self._extruders_model = None
         self._extruders_model_with_optional = None
         self._build_plate_model = None
@@ -907,6 +909,7 @@ class CuraApplication(QtApplication):
         # initialize info objects
         self._print_information = PrintInformation.PrintInformation(self)
         self._cura_actions = CuraActions.CuraActions(self)
+        self._print_order_manager = PrintOrderManager(self.getObjectsModel().getNodes)
         self.processEvents()
         # Initialize setting visibility presets model.
         self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self.getPreferences(), parent = self)
@@ -989,6 +992,7 @@ class CuraApplication(QtApplication):
             t.setEnabledAxis([ToolHandle.XAxis, ToolHandle.YAxis, ToolHandle.ZAxis])
 
         Selection.selectionChanged.connect(self.onSelectionChanged)
+        self._print_order_manager.printOrderChanged.connect(self._onPrintOrderChanged)
 
         # Set default background color for scene
         self.getRenderer().setBackgroundColor(QColor(245, 245, 245))
@@ -1262,6 +1266,7 @@ class CuraApplication(QtApplication):
         self.processEvents()
         engine.rootContext().setContextProperty("Printer", self)
         engine.rootContext().setContextProperty("CuraApplication", self)
+        engine.rootContext().setContextProperty("PrintOrderManager", self._print_order_manager)
         engine.rootContext().setContextProperty("PrintInformation", self._print_information)
         engine.rootContext().setContextProperty("CuraActions", self._cura_actions)
         engine.rootContext().setContextProperty("CuraSDKVersion", ApplicationMetadata.CuraSDKVersion)
@@ -1757,8 +1762,12 @@ class CuraApplication(QtApplication):
             Selection.remove(node)
         Selection.add(group_node)
 
+        all_nodes = self.getObjectsModel().getNodes()
+        PrintOrderManager.updatePrintOrdersAfterGroupOperation(all_nodes, group_node, selected_nodes)
+
     @pyqtSlot()
     def ungroupSelected(self) -> None:
+        all_nodes = self.getObjectsModel().getNodes()
         selected_objects = Selection.getAllSelectedObjects().copy()
         for node in selected_objects:
             if node.callDecoration("isGroup"):
@@ -1766,21 +1775,30 @@ class CuraApplication(QtApplication):
 
                 group_parent = node.getParent()
                 children = node.getChildren().copy()
-                for child in children:
-                    # Ungroup only 1 level deep
-                    if child.getParent() != node:
-                        continue
 
+                # Ungroup only 1 level deep
+                children_to_ungroup = list(filter(lambda child: child.getParent() == node, children))
+                for child in children_to_ungroup:
                     # Set the parent of the children to the parent of the group-node
                     op.addOperation(SetParentOperation(child, group_parent))
 
                     # Add all individual nodes to the selection
                     Selection.add(child)
 
+                PrintOrderManager.updatePrintOrdersAfterUngroupOperation(all_nodes, node, children_to_ungroup)
                 op.push()
                 # Note: The group removes itself from the scene once all its children have left it,
                 # see GroupDecorator._onChildrenChanged
 
+    def _onPrintOrderChanged(self) -> None:
+        # update object list
+        scene = self.getController().getScene()
+        scene.sceneChanged.emit(scene.getRoot())
+
+        # reset if already was sliced
+        Application.getInstance().getBackend().needsSlicing()
+        Application.getInstance().getBackend().tickle()
+
     def _createSplashScreen(self) -> Optional[CuraSplashScreen.CuraSplashScreen]:
         if self._is_headless:
             return None

cura/HitChecker.py

@@ -0,0 +1,88 @@
+from typing import List, Dict
+from cura.Scene.CuraSceneNode import CuraSceneNode
+
+
+class HitChecker:
+    """Checks if nodes can be printed without causing any collisions and interference"""
+
+    def __init__(self, nodes: List[CuraSceneNode]) -> None:
+        self._hit_map = self._buildHitMap(nodes)
+
+    def anyTwoNodesBlockEachOther(self, nodes: List[CuraSceneNode]) -> bool:
+        """Returns True if any 2 nodes block each other"""
+        for a in nodes:
+            for b in nodes:
+                if self._hit_map[a][b] and self._hit_map[b][a]:
+                    return True
+        return False
+
+    def canPrintBefore(self, node: CuraSceneNode, other_nodes: List[CuraSceneNode]) -> bool:
+        """Returns True if node doesn't block other_nodes and can be printed before them"""
+        no_hits = all(not self._hit_map[node][other_node] for other_node in other_nodes)
+        return no_hits
+
+    def canPrintAfter(self, node: CuraSceneNode, other_nodes: List[CuraSceneNode]) -> bool:
+        """Returns True if node doesn't hit other nodes and can be printed after them"""
+        no_hits = all(not self._hit_map[other_node][node] for other_node in other_nodes)
+        return no_hits
+
+    def calculateScore(self, a: CuraSceneNode, b: CuraSceneNode) -> int:
+        """Calculate score simply sums the number of other objects it 'blocks'
+
+        :param a: node
+        :param b: node
+        :return: sum of the number of other objects
+        """
+
+        score_a = sum(self._hit_map[a].values())
+        score_b = sum(self._hit_map[b].values())
+        return score_a - score_b
+
+    def canPrintNodesInProvidedOrder(self, ordered_nodes: List[CuraSceneNode]) -> bool:
+        """Returns True If nodes don't have any hits in provided order"""
+        for node_index, node in enumerate(ordered_nodes):
+            nodes_before = ordered_nodes[:node_index - 1] if node_index - 1 >= 0 else []
+            nodes_after = ordered_nodes[node_index + 1:] if node_index + 1 < len(ordered_nodes) else []
+            if not self.canPrintBefore(node, nodes_after) or not self.canPrintAfter(node, nodes_before):
+                return False
+        return True
+
+    @staticmethod
+    def _buildHitMap(nodes: List[CuraSceneNode]) -> Dict[CuraSceneNode, CuraSceneNode]:
+        """Pre-computes all hits between all objects
+
+        :nodes: nodes that need to be checked for collisions
+        :return: dictionary where hit_map[node1][node2] is False if there node1 can be printed before node2
+        """
+        hit_map = {j: {i: HitChecker._checkHit(j, i) for i in nodes} for j in nodes}
+        return hit_map
+
+    @staticmethod
+    def _checkHit(a: CuraSceneNode, b: CuraSceneNode) -> bool:
+        """Checks if a can be printed before b
+
+        :param a: node
+        :param b: node
+        :return: False if a can be printed before b
+        """
+
+        if a == b:
+            return False
+
+        a_hit_hull = a.callDecoration("getConvexHullBoundary")
+        b_hit_hull = b.callDecoration("getConvexHullHeadFull")
+        overlap = a_hit_hull.intersectsPolygon(b_hit_hull)
+
+        if overlap:
+            return True
+
+        # Adhesion areas must never overlap, regardless of printing order
+        # This would cause over-extrusion
+        a_hit_hull = a.callDecoration("getAdhesionArea")
+        b_hit_hull = b.callDecoration("getAdhesionArea")
+        overlap = a_hit_hull.intersectsPolygon(b_hit_hull)
+
+        if overlap:
+            return True
+        else:
+            return False

cura/OneAtATimeIterator.py

@@ -7,6 +7,11 @@ from UM.Scene.Iterator import Iterator
 from UM.Scene.SceneNode import SceneNode
 from functools import cmp_to_key
 
+from cura.HitChecker import HitChecker
+from cura.PrintOrderManager import PrintOrderManager
+from cura.Scene.CuraSceneNode import CuraSceneNode
+
+
 class OneAtATimeIterator(Iterator.Iterator):
     """Iterator that returns a list of nodes in the order that they need to be printed
 
@@ -16,8 +21,6 @@ class OneAtATimeIterator(Iterator.Iterator):
 
     def __init__(self, scene_node) -> None:
         super().__init__(scene_node) # Call super to make multiple inheritance work.
-        self._hit_map = [[]]  # type: List[List[bool]]  # For each node, which other nodes this hits. A grid of booleans on which nodes hit which.
-        self._original_node_list = []  # type: List[SceneNode]  # The nodes that need to be checked for collisions.
 
     def _fillStack(self) -> None:
         """Fills the ``_node_stack`` with a list of scene nodes that need to be printed in order. """
@@ -38,104 +41,50 @@ class OneAtATimeIterator(Iterator.Iterator):
             self._node_stack = node_list[:]
             return
 
-        # Copy the list
-        self._original_node_list = node_list[:]
+        hit_checker = HitChecker(node_list)
 
-        # Initialise the hit map (pre-compute all hits between all objects)
-        self._hit_map = [[self._checkHit(i, j) for i in node_list] for j in node_list]
+        if PrintOrderManager.isUserDefinedPrintOrderEnabled():
+            self._node_stack = self._getNodesOrderedByUser(hit_checker, node_list)
+        else:
+            self._node_stack = self._getNodesOrderedAutomatically(hit_checker, node_list)
 
-        # Check if we have to files that block each other. If this is the case, there is no solution!
-        for a in range(0, len(node_list)):
-            for b in range(0, len(node_list)):
-                if a != b and self._hit_map[a][b] and self._hit_map[b][a]:
-                    return
+            # update print orders so that user can try to arrange the nodes automatically first
+            # and if result is not satisfactory he/she can switch to manual mode and change it
+            for index, node in enumerate(self._node_stack):
+                node.printOrder = index + 1
+
+    @staticmethod
+    def _getNodesOrderedByUser(hit_checker: HitChecker, node_list: List[CuraSceneNode]) -> List[CuraSceneNode]:
+        nodes_ordered_by_user = sorted(node_list, key=lambda n: n.printOrder)
+        if hit_checker.canPrintNodesInProvidedOrder(nodes_ordered_by_user):
+            return nodes_ordered_by_user
+        return []  # No solution
+
+    @staticmethod
+    def _getNodesOrderedAutomatically(hit_checker: HitChecker, node_list: List[CuraSceneNode]) -> List[CuraSceneNode]:
+        # Check if we have two files that block each other. If this is the case, there is no solution!
+        if hit_checker.anyTwoNodesBlockEachOther(node_list):
+            return []  # No solution
 
         # Sort the original list so that items that block the most other objects are at the beginning.
         # This does not decrease the worst case running time, but should improve it in most cases.
-        sorted(node_list, key = cmp_to_key(self._calculateScore))
+        node_list = sorted(node_list, key = cmp_to_key(hit_checker.calculateScore))
 
         todo_node_list = [_ObjectOrder([], node_list)]
         while len(todo_node_list) > 0:
             current = todo_node_list.pop()
             for node in current.todo:
                 # Check if the object can be placed with what we have and still allows for a solution in the future
-                if not self._checkHitMultiple(node, current.order) and not self._checkBlockMultiple(node, current.todo):
+                if hit_checker.canPrintAfter(node, current.order) and hit_checker.canPrintBefore(node, current.todo):
                     # We found a possible result. Create new todo & order list.
                     new_todo_list = current.todo[:]
                     new_todo_list.remove(node)
                     new_order = current.order[:] + [node]
                     if len(new_todo_list) == 0:
                         # We have no more nodes to check, so quit looking.
-                        self._node_stack = new_order
-                        return
+                        return new_order # Solution found!
                     todo_node_list.append(_ObjectOrder(new_order, new_todo_list))
-        self._node_stack = [] #No result found!
-
-
-    #  Check if first object can be printed before the provided list (using the hit map)
-    def _checkHitMultiple(self, node: SceneNode, other_nodes: List[SceneNode]) -> bool:
-        node_index = self._original_node_list.index(node)
-        for other_node in other_nodes:
-            other_node_index = self._original_node_list.index(other_node)
-            if self._hit_map[node_index][other_node_index]:
-                return True
-        return False
-
-    def _checkBlockMultiple(self, node: SceneNode, other_nodes: List[SceneNode]) -> bool:
-        """Check for a node whether it hits any of the other nodes.
-
-        :param node: The node to check whether it collides with the other nodes.
-        :param other_nodes: The nodes to check for collisions.
-        :return: returns collision between nodes
-        """
-
-        node_index = self._original_node_list.index(node)
-        for other_node in other_nodes:
-            other_node_index = self._original_node_list.index(other_node)
-            if self._hit_map[other_node_index][node_index] and node_index != other_node_index:
-                return True
-        return False
-
-    def _calculateScore(self, a: SceneNode, b: SceneNode) -> int:
-        """Calculate score simply sums the number of other objects it 'blocks'
-
-        :param a: node
-        :param b: node
-        :return: sum of the number of other objects
-        """
-
-        score_a = sum(self._hit_map[self._original_node_list.index(a)])
-        score_b = sum(self._hit_map[self._original_node_list.index(b)])
-        return score_a - score_b
-
-    def _checkHit(self, a: SceneNode, b: SceneNode) -> bool:
-        """Checks if a can be printed before b
-
-        :param a: node
-        :param b: node
-        :return: true if a can be printed before b
-        """
-
-        if a == b:
-            return False
-
-        a_hit_hull = a.callDecoration("getConvexHullBoundary")
-        b_hit_hull = b.callDecoration("getConvexHullHeadFull")
-        overlap = a_hit_hull.intersectsPolygon(b_hit_hull)
-
-        if overlap:
-            return True
-
-        # Adhesion areas must never overlap, regardless of printing order
-        # This would cause over-extrusion
-        a_hit_hull = a.callDecoration("getAdhesionArea")
-        b_hit_hull = b.callDecoration("getAdhesionArea")
-        overlap = a_hit_hull.intersectsPolygon(b_hit_hull)
-
-        if overlap:
-            return True
-        else:
-            return False
+        return []  # No result found!
 
 
 class _ObjectOrder:

cura/PrintOrderManager.py

@@ -0,0 +1,171 @@
+from typing import List, Callable, Optional, Any
+
+from PyQt6.QtCore import pyqtProperty, pyqtSignal, QObject, pyqtSlot
+from UM.Application import Application
+from UM.Scene.Selection import Selection
+
+from cura.Scene.CuraSceneNode import CuraSceneNode
+
+
+class PrintOrderManager(QObject):
+    """Allows to order the object list to set the print sequence manually"""
+
+    def __init__(self, get_nodes: Callable[[], List[CuraSceneNode]]) -> None:
+        super().__init__()
+        self._get_nodes = get_nodes
+        self._configureEvents()
+
+    _settingsChanged = pyqtSignal()
+    _uiActionsOutdated = pyqtSignal()
+    printOrderChanged = pyqtSignal()
+
+    @pyqtSlot()
+    def swapSelectedAndPreviousNodes(self) -> None:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        self._swapPrintOrders(selected_node, previous_node)
+
+    @pyqtSlot()
+    def swapSelectedAndNextNodes(self) -> None:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        self._swapPrintOrders(selected_node, next_node)
+
+    @pyqtProperty(str, notify=_uiActionsOutdated)
+    def previousNodeName(self) -> str:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        return self._getNodeName(previous_node)
+
+    @pyqtProperty(str, notify=_uiActionsOutdated)
+    def nextNodeName(self) -> str:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        return self._getNodeName(next_node)
+
+    @pyqtProperty(bool, notify=_uiActionsOutdated)
+    def shouldEnablePrintBeforeAction(self) -> bool:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        can_swap_with_previous_node = selected_node is not None and previous_node is not None
+        return can_swap_with_previous_node
+
+    @pyqtProperty(bool, notify=_uiActionsOutdated)
+    def shouldEnablePrintAfterAction(self) -> bool:
+        selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes()
+        can_swap_with_next_node = selected_node is not None and next_node is not None
+        return can_swap_with_next_node
+
+    @pyqtProperty(bool, notify=_settingsChanged)
+    def shouldShowEditPrintOrderActions(self) -> bool:
+        return PrintOrderManager.isUserDefinedPrintOrderEnabled()
+
+    @staticmethod
+    def isUserDefinedPrintOrderEnabled() -> bool:
+        stack = Application.getInstance().getGlobalContainerStack()
+        is_enabled = stack and \
+                     stack.getProperty("print_sequence", "value") == "one_at_a_time" and \
+                     stack.getProperty("user_defined_print_order_enabled", "value")
+        return bool(is_enabled)
+
+    @staticmethod
+    def initializePrintOrders(nodes: List[CuraSceneNode]) -> None:
+        """Just created (loaded from file) nodes have print order 0.
+
+         This method initializes print orders with max value to put nodes at the end of object list"""
+        max_print_order = max(map(lambda n: n.printOrder, nodes), default=0)
+        for node in nodes:
+            if node.printOrder == 0:
+                max_print_order += 1
+                node.printOrder = max_print_order
+
+    @staticmethod
+    def updatePrintOrdersAfterGroupOperation(
+            all_nodes: List[CuraSceneNode],
+            group_node: CuraSceneNode,
+            grouped_nodes: List[CuraSceneNode]
+    ) -> None:
+        group_node.printOrder = min(map(lambda n: n.printOrder, grouped_nodes))
+
+        all_nodes.append(group_node)
+        for node in grouped_nodes:
+            all_nodes.remove(node)
+
+        # reassign print orders so there won't be gaps like 1 2 5 6 7
+        sorted_nodes = sorted(all_nodes, key=lambda n: n.printOrder)
+        for i, node in enumerate(sorted_nodes):
+            node.printOrder = i + 1
+
+    @staticmethod
+    def updatePrintOrdersAfterUngroupOperation(
+            all_nodes: List[CuraSceneNode],
+            group_node: CuraSceneNode,
+            ungrouped_nodes: List[CuraSceneNode]
+    ) -> None:
+        all_nodes.remove(group_node)
+        nodes_to_update_print_order = filter(lambda n: n.printOrder > group_node.printOrder, all_nodes)
+        for node in nodes_to_update_print_order:
+            node.printOrder += len(ungrouped_nodes) - 1
+
+        for i, child in enumerate(ungrouped_nodes):
+            child.printOrder = group_node.printOrder + i
+            all_nodes.append(child)
+
+    def _swapPrintOrders(self, node1: CuraSceneNode, node2: CuraSceneNode) -> None:
+        if node1 and node2:
+            node1.printOrder, node2.printOrder = node2.printOrder, node1.printOrder  # swap print orders
+            self.printOrderChanged.emit()  # update object list first
+            self._uiActionsOutdated.emit()  # then update UI actions
+
+    def _getSelectedAndNeighborNodes(self
+                                     ) -> (Optional[CuraSceneNode], Optional[CuraSceneNode], Optional[CuraSceneNode]):
+        nodes = self._get_nodes()
+        ordered_nodes = sorted(nodes, key=lambda n: n.printOrder)
+        selected_node = PrintOrderManager._getSingleSelectedNode()
+        if selected_node and selected_node in ordered_nodes:
+            selected_node_index = ordered_nodes.index(selected_node)
+        else:
+            selected_node_index = None
+
+        if selected_node_index is not None and selected_node_index - 1 >= 0:
+            previous_node = ordered_nodes[selected_node_index - 1]
+        else:
+            previous_node = None
+
+        if selected_node_index is not None and selected_node_index + 1 < len(ordered_nodes):
+            next_node = ordered_nodes[selected_node_index + 1]
+        else:
+            next_node = None
+
+        return selected_node, previous_node, next_node
+
+    @staticmethod
+    def _getNodeName(node: CuraSceneNode, max_length: int = 30) -> str:
+        node_name = node.getName() if node else ""
+        truncated_node_name = node_name[:max_length]
+        return truncated_node_name
+
+    @staticmethod
+    def _getSingleSelectedNode() -> Optional[CuraSceneNode]:
+        if len(Selection.getAllSelectedObjects()) == 1:
+            selected_node = Selection.getSelectedObject(0)
+            return selected_node
+        return None
+
+    def _configureEvents(self) -> None:
+        Selection.selectionChanged.connect(self._onSelectionChanged)
+        self._global_stack = None
+        Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
+        self._onGlobalStackChanged()
+
+    def _onGlobalStackChanged(self) -> None:
+        if self._global_stack:
+            self._global_stack.propertyChanged.disconnect(self._onSettingsChanged)
+            self._global_stack.containersChanged.disconnect(self._onSettingsChanged)
+
+        self._global_stack = Application.getInstance().getGlobalContainerStack()
+
+        if self._global_stack:
+            self._global_stack.propertyChanged.connect(self._onSettingsChanged)
+            self._global_stack.containersChanged.connect(self._onSettingsChanged)
+
+    def _onSettingsChanged(self, *args: Any) -> None:
+        self._settingsChanged.emit()
+
+    def _onSelectionChanged(self) -> None:
+        self._uiActionsOutdated.emit()

cura/Scene/CuraSceneNode.py

@@ -25,10 +25,19 @@ class CuraSceneNode(SceneNode):
         if not no_setting_override:
             self.addDecorator(SettingOverrideDecorator())  # Now we always have a getActiveExtruderPosition, unless explicitly disabled
         self._outside_buildarea = False
+        self._print_order = 0
 
     def setOutsideBuildArea(self, new_value: bool) -> None:
         self._outside_buildarea = new_value
 
+    @property
+    def printOrder(self):
+        return self._print_order
+
+    @printOrder.setter
+    def printOrder(self, new_value):
+        self._print_order = new_value
+
     def isOutsideBuildArea(self) -> bool:
         return self._outside_buildarea or self.callDecoration("getBuildPlateNumber") < 0
 
@@ -157,3 +166,6 @@ class CuraSceneNode(SceneNode):
 
     def transformChanged(self) -> None:
         self._transformChanged()
+
+    def __repr__(self) -> str:
+        return "{print_order}. {name}".format(print_order = self._print_order, name = self.getName())

cura/UI/ObjectsModel.py

@@ -14,6 +14,9 @@ from UM.Scene.SceneNode import SceneNode
 from UM.Scene.Selection import Selection
 from UM.i18n import i18nCatalog
 
+from cura.PrintOrderManager import PrintOrderManager
+from cura.Scene.CuraSceneNode import CuraSceneNode
+
 catalog = i18nCatalog("cura")
 
 
@@ -76,6 +79,9 @@ class ObjectsModel(ListModel):
             self._build_plate_number = nr
             self._update()
 
+    def getNodes(self) -> List[CuraSceneNode]:
+        return list(map(lambda n: n["node"], self.items))
+
     def _updateSceneDelayed(self, source) -> None:
         if not isinstance(source, Camera):
             self._update_timer.start()
@@ -175,6 +181,10 @@ class ObjectsModel(ListModel):
 
         all_nodes = self._renameNodes(name_to_node_info_dict)
 
+        user_defined_print_order_enabled = PrintOrderManager.isUserDefinedPrintOrderEnabled()
+        if user_defined_print_order_enabled:
+            PrintOrderManager.initializePrintOrders(all_nodes)
+
         for node in all_nodes:
             if hasattr(node, "isOutsideBuildArea"):
                 is_outside_build_area = node.isOutsideBuildArea()  # type: ignore
@@ -223,8 +233,13 @@ class ObjectsModel(ListModel):
                 # for anti overhang meshes and groups the extruder nr is irrelevant
                 extruder_number = -1
 
+            if not user_defined_print_order_enabled:
+                name = node.getName()
+            else:
+                name = "{print_order}. {name}".format(print_order = node.printOrder, name = node.getName())
+
             nodes.append({
-                "name": node.getName(),
+                "name": name,
                 "selected": Selection.isSelected(node),
                 "outside_build_area": is_outside_build_area,
                 "buildplate_number": node_build_plate_number,
@@ -234,5 +249,5 @@ class ObjectsModel(ListModel):
                 "node": node
             })
 
-        nodes = sorted(nodes, key=lambda n: n["name"])
+        nodes = sorted(nodes, key=lambda n: n["name"] if not user_defined_print_order_enabled else n["node"].printOrder)
         self.setItems(nodes)

plugins/3MFReader/ThreeMFReader.py

@@ -177,6 +177,9 @@ class ThreeMFReader(MeshReader):
                     else:
                         Logger.log("w", "Unable to find extruder in position %s", setting_value)
                     continue
+                if key == "print_order":
+                    um_node.printOrder = int(setting_value)
+                    continue
                 if key in known_setting_keys:
                     setting_container.setProperty(key, "value", setting_value)
                 else:

plugins/3MFWriter/ThreeMFWriter.py

@@ -17,6 +17,7 @@ from cura.CuraApplication import CuraApplication
 from cura.CuraPackageManager import CuraPackageManager
 from cura.Settings import CuraContainerStack
 from cura.Utils.Threading import call_on_qt_thread
+from cura.Scene.CuraSceneNode import CuraSceneNode
 from cura.Snapshot import Snapshot
 
 from PyQt6.QtCore import QBuffer
@@ -134,6 +135,9 @@ class ThreeMFWriter(MeshWriter):
             for key in changed_setting_keys:
                 savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value")))
 
+        if isinstance(um_node, CuraSceneNode):
+            savitar_node.setSetting("cura:print_order", str(um_node.printOrder))
+
         # Store the metadata.
         for key, value in um_node.metadata.items():
             savitar_node.setSetting(key, value)

resources/definitions/fdmprinter.def.json

@@ -7246,6 +7246,16 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
                 },
+                "user_defined_print_order_enabled":
+                {
+                    "label": "Set Print Sequence Manually",
+                    "description": "Allows to order the object list to set the print sequence manually. First object from the list will be printed first.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "enabled": "print_sequence == 'one_at_a_time'"
+                },
                 "infill_mesh":
                 {
                     "label": "Infill Mesh",

resources/definitions/ultimaker.def.json

@@ -106,6 +106,7 @@
         "retraction_combing_max_distance": { "value": 15 },
         "retraction_count_max": { "value": 25 },
         "retraction_extrusion_window": { "value": 1 },
+        "retraction_min_travel": { "value": 5 },
         "roofing_layer_count": { "value": "1" },
         "roofing_material_flow": { "value": "material_flow" },
         "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },

resources/definitions/ultimaker3.def.json

@@ -156,7 +156,6 @@
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
         "retraction_hop_only_when_collides": { "value": "True" },
-        "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
         "skin_overlap": { "value": "10" },
         "speed_prime_tower": { "value": "speed_topbottom" },

resources/definitions/ultimaker_method_base.def.json

@@ -373,7 +373,6 @@
         "retraction_hop": { "value": 0.4 },
         "retraction_hop_enabled": { "value": true },
         "retraction_hop_only_when_collides": { "value": false },
-        "retraction_min_travel": { "value": "line_width * 4" },
         "retraction_prime_speed": { "value": "retraction_speed" },
         "retraction_speed": { "value": 5 },
         "roofing_layer_count": { "value": 2 },

resources/definitions/ultimaker_s3.def.json

@@ -108,7 +108,6 @@
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
         "retraction_hop_only_when_collides": { "value": "True" },
-        "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
         "retraction_speed": { "value": "45" },
         "speed_prime_tower": { "value": "speed_topbottom" },

resources/definitions/ultimaker_s5.def.json

@@ -110,7 +110,6 @@
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
         "retraction_hop_only_when_collides": { "value": "True" },
-        "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
         "retraction_speed": { "value": "45" },
         "speed_prime_tower": { "value": "speed_topbottom" },

resources/i18n/cs_CZ/cura.po

@@ -4946,6 +4946,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Rozdělit modely"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Tisknout před"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Tisknout po"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Odinstalovat"

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

@@ -2583,6 +2583,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Tisková sekvence"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Nastavit tiskovou sekvenci ručně"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Umožňuje řadit seznam objektů pro ruční nastavení tiskové sekvence. První objekt ze seznamu bude vytisknut jako první."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Rychlost tisku"

resources/i18n/cura.pot

@@ -4565,6 +4565,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr ""
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr ""
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr ""
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr ""

resources/i18n/de_DE/cura.po

@@ -4930,6 +4930,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Gruppierung für Modelle aufheben"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Vor dem Drucken"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Nach dem Drucken"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Deinstallieren"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Druckreihenfolge"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Druckreihenfolge manuell einstellen"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Ermöglicht das Ordnen der Objektliste, um die Druckreihenfolge manuell festzulegen. Das erste Objekt aus der Liste wird zuerst gedruckt."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Druckgeschwindigkeit"

resources/i18n/es_ES/cura.po

@@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Desagrupar modelos"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Imprimir antes"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Imprimir después"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Desinstalar"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Secuencia de impresión"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Establecer secuencia de impresión manualmente"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Permite ordenar la lista de objetos para establecer la secuencia de impresión manualmente. El primer objeto de la lista se imprimirá primero."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Velocidad de impresión"

resources/i18n/fdmprinter.def.json.pot

@@ -4588,6 +4588,14 @@ msgctxt "print_sequence option one_at_a_time"
 msgid "One at a Time"
 msgstr ""
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr ""
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr ""
+
 msgctxt "infill_mesh label"
 msgid "Infill Mesh"
 msgstr ""

resources/i18n/fi_FI/cura.po

@@ -4899,6 +4899,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Poista mallien ryhmitys"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Tulosta ennen"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Tulosta jälkeen"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr ""

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

@@ -2578,6 +2578,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Tulostusjärjestys"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Aseta tulostusjärjestys manuaalisesti"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Mahdollistaa kohteiden järjestämisen tulostusjärjestyksen manuaaliseen asettamiseen. Listan ensimmäinen kohde tulostetaan ensin."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Tulostusnopeus"

resources/i18n/fr_FR/cura.po

@@ -4928,6 +4928,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Dégrouper les modèles"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Imprimer avant"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Imprimer après"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Désinstaller"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Séquence d'impression"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Définir la séquence d'impression manuellement"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Permet de classer la liste des objets pour définir manuellement la séquence d'impression. Le premier objet de la liste sera imprimé en premier."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Vitesse d’impression"

resources/i18n/hu_HU/cura.po

@@ -4913,6 +4913,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Csoport bontása"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Nyomtatás előtt"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Nyomtatás után"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr ""

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

@@ -2585,6 +2585,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Nyomtatási sorrend"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Nyomtatási sorrend kézi beállítása"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Lehetővé teszi az objektumlista rendezését a nyomtatási sorrend kézi beállításához. A lista első objektuma lesz először nyomtatva."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Nyomtatási sebesség"

resources/i18n/it_IT/cura.po

@@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Separa modelli"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Stampa prima"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Stampa dopo"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Disinstalla"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Sequenza di stampa"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Imposta manualmente la sequenza di stampa"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Consente di ordinare l'elenco degli oggetti per impostare manualmente la sequenza di stampa. Il primo oggetto dell'elenco sarà stampato per primo."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Velocità di stampa"

resources/i18n/ja_JP/cura.po

@@ -4914,6 +4914,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "モデルを非グループ化"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "印刷前"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "印刷後"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "アンインストール"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "印刷頻度"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "手動で印刷順序を設定する"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "オブジェクトリストを並べ替えて、手動で印刷順序を設定することができます。リストの最初のオブジェクトが最初に印刷されます。"
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "印刷速度"

resources/i18n/ko_KR/cura.po

@@ -4917,6 +4917,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "모델 그룹 해제"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "인쇄 전"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "인쇄 후"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "설치 제거"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "프린팅 순서"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "수동으로 인쇄 순서 설정"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "객체 목록을 정렬하여 수동으로 인쇄 순서를 설정할 수 있습니다. 목록의 첫 번째 객체가 먼저 인쇄됩니다."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "프린팅 속도"

resources/i18n/nl_NL/cura.po

@@ -4925,6 +4925,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Groeperen van Modellen Opheffen"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Afdrukken voor"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Afdrukken na"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "De-installeren"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Printvolgorde"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Handmatig afdrukvolgorde instellen"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Maakt het mogelijk de objectlijst te ordenen om de afdrukvolgorde handmatig in te stellen. Het eerste object van de lijst wordt als eerste afgedrukt."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Printsnelheid"

resources/i18n/pl_PL/cura.po

@@ -4916,6 +4916,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Rozgrupuj modele"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Drukuj przed"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Drukuj po"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr ""

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

@@ -2584,6 +2584,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Sekwencja Wydruku"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Ręczne ustawienie kolejności drukowania"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Umożliwia ręczne ustawienie kolejności drukowania na liście obiektów. Pierwszy obiekt z listy zostanie wydrukowany jako pierwszy."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Prędkość Druku"

resources/i18n/pt_BR/cura.po

@@ -4942,6 +4942,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Desagrupar Modelos"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Imprimir antes"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Imprimir depois"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Desinstalar"

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

@@ -2585,6 +2585,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Sequência de Impressão"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Definir sequência de impressão manualmente"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Permite ordenar a lista de objetos para definir a sequência de impressão manualmente. O primeiro objeto da lista será impresso primeiro."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Velocidade de Impressão"

resources/i18n/pt_PT/cura.po

@@ -4932,6 +4932,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Desagrupar Modelos"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Imprimir antes"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Imprimir depois"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Desinstalar"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Sequência de impressão"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Definir sequência de impressão manualmente"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Permite ordenar a lista de objetos para definir a sequência de impressão manualmente. O primeiro objeto da lista será impresso primeiro."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Velocidade de Impressão"

resources/i18n/ru_RU/cura.po

@@ -4955,6 +4955,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Разгруппировать модели"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Печатать до"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Печатать после"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Удалить"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Последовательная печать"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Установить последовательность печати вручную"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Позволяет упорядочить список объектов для ручной настройки последовательности печати. Первый объект из списка будет напечатан первым."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Скорость печати"

resources/i18n/tr_TR/cura.po

@@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "Model Grubunu Çöz"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "Önce Yazdır"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "Sonra Yazdır"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "Kaldır"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "Yazdırma Dizisi"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "Baskı Sırasını Manuel Olarak Ayarla"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "Nesne listesini sıralayarak baskı sırasını manuel olarak ayarlamayı sağlar. Listeden ilk nesne ilk olarak basılacak."
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "Yazdırma Hızı"

resources/i18n/zh_CN/cura.po

@@ -4919,6 +4919,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "拆分模型"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "打印前"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "打印后"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr "卸载"

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

@@ -2580,6 +2580,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "打印序列"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "手动设置打印顺序"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "允许对对象列表进行排序，以手动设置打印顺序。列表中的第一个对象将首先被打印。"
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "打印速度"

resources/i18n/zh_TW/cura.po

@@ -4911,6 +4911,14 @@ msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Models"
 msgstr "取消模型群組"
 
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print Before"
+msgstr "列印前"
+
+msgctxt "@action:inmenu menubar:edit"
+msgid "Print After"
+msgstr "列印後"
+
 msgctxt "@button"
 msgid "Uninstall"
 msgstr ""

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

@@ -2585,6 +2585,14 @@ msgctxt "print_sequence label"
 msgid "Print Sequence"
 msgstr "列印順序"
 
+msgctxt "user_defined_print_order_enabled label"
+msgid "Set Print Sequence Manually"
+msgstr "手動設置列印順序"
+
+msgctxt "user_defined_print_order_enabled description"
+msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first."
+msgstr "允許手動設置物件列表以設定列印順序。列表中的第一個物件將首先被列印。"
+
 msgctxt "speed_print label"
 msgid "Print Speed"
 msgstr "列印速度"

resources/qml/Actions.qml

@@ -35,6 +35,9 @@ Item
     property alias mergeObjects: mergeObjectsAction
     //property alias unMergeObjects: unMergeObjectsAction
 
+    property alias printObjectBeforePrevious: printObjectBeforePreviousAction
+    property alias printObjectAfterNext: printObjectAfterNextAction
+
     property alias multiplyObject: multiplyObjectAction
 
     property alias selectAll: selectAllAction
@@ -405,6 +408,26 @@ Item
         onTriggered: CuraApplication.ungroupSelected()
     }
 
+    Action
+    {
+        id: printObjectBeforePreviousAction
+        text: catalog.i18nc("@action:inmenu menubar:edit","Print Before") + " " + PrintOrderManager.previousNodeName
+        enabled: PrintOrderManager.shouldEnablePrintBeforeAction
+        icon.name: "print-before"
+        shortcut: "PgUp"
+        onTriggered: PrintOrderManager.swapSelectedAndPreviousNodes()
+    }
+
+    Action
+    {
+        id: printObjectAfterNextAction
+        text: catalog.i18nc("@action:inmenu menubar:edit","Print After") + " " + PrintOrderManager.nextNodeName
+        enabled: PrintOrderManager.shouldEnablePrintAfterAction
+        icon.name: "print-after"
+        shortcut: "PgDown"
+        onTriggered: PrintOrderManager.swapSelectedAndNextNodes()
+    }
+
     Action
     {
         id: mergeObjectsAction

resources/qml/Menus/ContextMenu.qml

@@ -78,6 +78,19 @@ Cura.Menu
     Cura.MenuItem { action: Cura.Actions.mergeObjects }
     Cura.MenuItem { action: Cura.Actions.unGroupObjects }
 
+    // Edit print sequence actions
+    Cura.MenuSeparator { visible: PrintOrderManager.shouldShowEditPrintOrderActions }
+    Cura.MenuItem
+    {
+        action: Cura.Actions.printObjectBeforePrevious
+        visible: PrintOrderManager.shouldShowEditPrintOrderActions
+    }
+    Cura.MenuItem
+    {
+        action: Cura.Actions.printObjectAfterNext
+        visible: PrintOrderManager.shouldShowEditPrintOrderActions
+    }
+
     Connections
     {
         target: UM.Controller

resources/qml/Menus/EditMenu.qml

@@ -25,4 +25,17 @@ Cura.Menu
     Cura.MenuItem { action: Cura.Actions.groupObjects }
     Cura.MenuItem { action: Cura.Actions.mergeObjects }
     Cura.MenuItem { action: Cura.Actions.unGroupObjects }
+
+    // Edit print sequence actions
+    Cura.MenuSeparator { visible: PrintOrderManager.shouldShowEditPrintOrderActions }
+    Cura.MenuItem
+    {
+        action: Cura.Actions.printObjectBeforePrevious
+        visible: PrintOrderManager.shouldShowEditPrintOrderActions
+    }
+    Cura.MenuItem
+    {
+        action: Cura.Actions.printObjectAfterNext
+        visible: PrintOrderManager.shouldShowEditPrintOrderActions
+    }
 }

resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg

@@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4
 material_print_temperature = =default_material_print_temperature - 20
 ooze_shield_angle = 40
 raft_airgap = 0.4
-retraction_min_travel = 5
 speed_print = 70
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)

resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg

@@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg

@@ -28,7 +28,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 retraction_prime_speed = 15
 speed_print = 25
 speed_wall = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg

@@ -27,7 +27,6 @@ acceleration_wall_x = =acceleration_wall
 bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
-cool_fan_speed_0 = 0
 cool_min_layer_time = 4
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -65,7 +64,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg

@@ -63,7 +63,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg

@@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg

@@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg

@@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg

@@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg

@@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg

@@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg

@@ -28,7 +28,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 25 / 25)
 speed_wall = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg

@@ -29,7 +29,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 25 / 25)
 speed_wall = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg

@@ -29,7 +29,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 25 / 25)
 speed_wall = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg

@@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop_only_when_collides = True
-retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 0.8)

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg

@@ -29,7 +29,6 @@ prime_tower_wipe_enabled = True
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop_only_when_collides = True
-retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 0.8)

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg

@@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
 retraction_hop_only_when_collides = True
-retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 0.8)

resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg

@@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg

@@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+infill_material_flow = =1.05 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -49,6 +50,7 @@ raft_airgap = 0.15
 retraction_amount = 6.5
 retraction_prime_speed = 15
 retraction_speed = 45
+skin_material_flow = =material_flow
 small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
@@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
+wall_x_material_flow = =1.05 * wall_material_flow
+wall_x_material_flow_roofing = =wall_material_flow
 z_seam_relative = True
 z_seam_type = back
 zig_zaggify_infill = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg

@@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.4
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg

@@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg

@@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg

@@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -48,6 +49,7 @@ prime_tower_enable = False
 retraction_amount = 8
 retraction_prime_speed = 15
 retraction_speed = 45
+skin_material_flow = =1.05 * material_flow
 small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
@@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
+wall_x_material_flow = =1.1 * wall_material_flow
+wall_x_material_flow_roofing = =wall_material_flow
 z_seam_relative = True
 z_seam_type = back
 zig_zaggify_infill = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg

@@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.4
 top_bottom_thickness = =max(1.2 , layer_height * 6)
 wall_0_wipe_dist = 0.8
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg

@@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg

@@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -49,6 +50,7 @@ raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed
 retraction_speed = 45
+skin_material_flow = =1.05 * material_flow
 small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
@@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
+wall_x_material_flow = =1.1 * wall_material_flow
+wall_x_material_flow_roofing = =wall_material_flow
 z_seam_relative = True
 z_seam_type = back
 zig_zaggify_infill = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg

@@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg

@@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.35
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg

@@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.3
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 z_seam_relative = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg

@@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -48,6 +49,7 @@ raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed
 retraction_speed = 45
+skin_material_flow = =1.05 * material_flow
 small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
@@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.35
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
+wall_x_material_flow = =1.1 * wall_material_flow
+wall_x_material_flow_roofing = =wall_material_flow
 z_seam_relative = True
 z_seam_type = back
 zig_zaggify_infill = True

resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg

@@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance
 support_interface_enable = True
 support_structure = tree
 support_top_distance = =support_z_distance
-support_z_distance = =math.ceil(0.3/layer_height)*layer_height
+support_z_distance = 0.4
 top_bottom_thickness = =max(1 , layer_height * 5)
 wall_0_wipe_dist = 0.8
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.2mm.inst.cfg

@@ -24,7 +24,6 @@ prime_tower_min_volume = 10
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
-retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
 switch_extruder_prime_speed = 15

resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.3mm.inst.cfg

@@ -24,7 +24,6 @@ prime_tower_min_volume = 15
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
-retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
 switch_extruder_prime_speed = 15

resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.4mm.inst.cfg

@@ -24,7 +24,6 @@ prime_tower_min_volume = 20
 retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
-retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_infill = =math.ceil(speed_wall * 30 / 30)
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg

@@ -27,7 +27,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
-retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 25 / 30)

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg

@@ -28,7 +28,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
-retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 23 / 30)

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg

@@ -27,7 +27,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
-retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
 speed_infill = =speed_print
 speed_print = 30

resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg

@@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4
 material_print_temperature = =default_material_print_temperature - 20
 ooze_shield_angle = 40
 raft_airgap = 0.4
-retraction_min_travel = 5
 speed_print = 70
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)

resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg

@@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg

@@ -28,7 +28,6 @@ retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
 retraction_hop = 2
 retraction_hop_only_when_collides = True
-retraction_min_travel = 0.8
 retraction_prime_speed = 15
 speed_print = 25
 speed_wall = =math.ceil(speed_print * 25 / 25)