Merge branch 'master' into CURA-8640_PyQt6

# Conflicts:
#	cura/UI/CuraSplashScreen.py

resources/definitions/fdmprinter.def.json

@@ -758,6 +758,16 @@
                     "default_value": 10.0,
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
+                },
+                "machine_scale_fan_speed_zero_to_one":
+                {
+                    "label": "Scale Fan Speed To 0-1",
+                    "description": "Scale the fan speed to be between 0 and 1 instead of between 0 and 256.",
+                    "type": "bool",
+                    "default_value": true,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
                 }
             }
         },
@@ -1211,8 +1221,6 @@
                     "unit": "mm",
                     "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
                     "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)",
-                    "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size",
-                    "maximum_value_warning_old": "2 * machine_nozzle_size",
                     "default_value": 0.3,
                     "value": "machine_nozzle_size * .75",
                     "type": "float",
@@ -1239,7 +1247,6 @@
                                     "unit": "%",
                                     "default_value": 50,
                                     "value": "max(1, min(99, 100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0))",
-                                    "value_explicit": "100 * (2 * min_even_wall_line_width - wall_line_width_0) / (wall_line_width_0 + wall_line_width_x - wall_line_width_0)",
                                     "minimum_value": "1",
                                     "maximum_value": "99"
                                 }
@@ -6454,8 +6461,10 @@
                     "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.",
                     "type": "float",
                     "unit": "μm²",
-                    "default_value": 50000,
+                    "default_value": 2000,
                     "minimum_value": "0",
+                    "minimum_value_warning": "500",
+                    "maximum_value_warning": "50000",
                     "settable_per_mesh": true
                 }
             }

resources/definitions/ultimaker.def.json

@@ -62,9 +62,6 @@
         "speed_equalize_flow_width_factor": {
             "value": "110.0"
         },
-        "meshfix_maximum_extrusion_area_deviation": {
-            "value": "50000"
-        },
         "top_layers": {
             "value": "math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))"
         },

resources/qml/ActionButton.qml

@@ -45,49 +45,6 @@ Button
     // but it can exceed a maximum, then this value have to be set.
     property int maximumWidth: 0
 
-    // These properties are deprecated.
-    // To (maybe) prevent a major SDK upgrade, mark them as deprecated instead of just outright removing them.
-    // Note, if you still want rounded corners, use (something based on) Cura.RoundedRectangle.
-    property alias cornerSide: deprecatedProperties.cornerSide
-    property alias shadowColor: deprecatedProperties.shadowColor
-    property alias shadowEnabled: deprecatedProperties.shadowEnabled
-
-    Item
-    {
-        id: deprecatedProperties
-
-        visible: false
-        enabled: false
-        width: 0
-        height: 0
-
-        property var cornerSide: null
-        property var shadowColor: null
-        property var shadowEnabled: null
-
-        onCornerSideChanged:
-        {
-            if (cornerSide != null)
-            {
-                CuraApplication.writeToLog("w", "'ActionButton.cornerSide' is deprecated since 4.11. Rounded corners can still be made with 'Cura.RoundedRectangle'.");
-            }
-        }
-        onShadowColorChanged:
-        {
-            if (shadowColor != null)
-            {
-                CuraApplication.writeToLog("w", "'ActionButton.shadowColor' is deprecated since 4.11.")
-            }
-        }
-        onShadowEnabledChanged:
-        {
-            if (shadowEnabled != null)
-            {
-                CuraApplication.writeToLog("w", "'ActionButton.shadowEnabled' is deprecated since 4.11.")
-            }
-        }
-    }
-
     leftPadding: UM.Theme.getSize("default_margin").width
     rightPadding: UM.Theme.getSize("default_margin").width
     height: UM.Theme.getSize("action_button").height
@@ -167,16 +124,12 @@ Button
         }
     }
 
-    background: Cura.RoundedRectangle
+    background: Rectangle
     {
         id: backgroundRect
         color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor
         border.width: UM.Theme.getSize("default_lining").width
         border.color: button.enabled ? (button.hovered ? button.outlineHoverColor : button.outlineColor) : button.outlineDisabledColor
-
-        // Disable the rounded-ness of this rectangle. We can't use a normal Rectangle here yet, as the API/SDK has only just been deprecated.
-        radius: 0
-        cornerSide: Cura.RoundedRectangle.Direction.None
     }
 
     UM.ToolTip

resources/qml/Actions.qml

@@ -40,7 +40,6 @@ Item
     property alias selectAll: selectAllAction
     property alias deleteAll: deleteAllAction
     property alias reloadAll: reloadAllAction
-    property alias arrangeAllBuildPlates: arrangeAllBuildPlatesAction
     property alias arrangeAll: arrangeAllAction
     property alias arrangeSelection: arrangeSelectionAction
     property alias resetAllTranslation: resetAllTranslationAction
@@ -407,13 +406,6 @@ Item
         onTriggered: CuraApplication.reloadAll()
     }
 
-    Action
-    {
-        id: arrangeAllBuildPlatesAction
-        text: catalog.i18nc("@action:inmenu menubar:edit","Arrange All Models To All Build Plates")
-        onTriggered: Printer.arrangeObjectsToAllBuildPlates()
-    }
-
     Action
     {
         id: arrangeAllAction

resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

@@ -55,7 +55,7 @@ Cura.ExpandablePopup
                     Layout.maximumWidth: Math.round(parent.width / extrudersModel.count)
                     Layout.fillHeight: true
 
-                    property var extruderStack: activeMachine ? activeMachine.extruders[model.index]: null
+                    property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null
                     property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack)
                     property bool valueError: activeMachine ? Cura.ContainerManager.getContainerMetaDataEntry(extruderStack.material.id, "compatible", "") != "True" : false