Merge branch 'main' into CURA-9272_semver_postfix

.github/workflows/conan-package-create.yml

@@ -149,5 +149,5 @@ jobs:
                 run: conan upload "*" -r cura --all -c
 
             -   name: Upload the Package(s) community
-                if: ${{ always() && inputs.conan_upload_community == 'true' }}
+                if: ${{ always() && inputs.conan_upload_community == true }}
                 run: conan upload "*" -r cura-ce -c

.github/workflows/conan-recipe-export.yml

@@ -102,5 +102,5 @@ jobs:
                 run: conan upload "*" -r cura --all -c
 
             -   name: Upload the Package(s) community
-                if: ${{ always() && inputs.conan_upload_community == 'true' }}
+                if: ${{ always() && inputs.conan_upload_community == true }}
                 run: conan upload "*" -r cura-ce -c

.github/workflows/requirements-conan-package.txt

@@ -1,2 +1,2 @@
-conan!=1.51.0,!=1.51.1,!=1.51.2
+conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3
 sip==6.5.1

conanfile.py

@@ -9,7 +9,7 @@ from conan.tools import files
 from conan.tools.env import VirtualRunEnv, Environment
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.48.0"
 
 
 class CuraConan(ConanFile):

resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml

@@ -51,7 +51,17 @@ Item
     {
         target: infillSlider
         property: "value"
-        value: parseInt(infillDensity.properties.value)
+        value: {
+            // The infill slider has a max value of 100. When it is given a value > 100 onValueChanged updates the setting to be 100.
+            // When changing to an intent with infillDensity > 100, it would always be clamped to 100.
+            // This will force the slider to ignore the first onValueChanged for values > 100 so higher values can be set.
+            var density = parseInt(infillDensity.properties.value)
+            if (density > 100) {
+                infillSlider.ignoreValueChange = true
+            }
+
+            return density
+        }
     }
 
     // Here are the elements that are shown in the left column
@@ -84,6 +94,8 @@ Item
         {
             id: infillSlider
 
+            property var ignoreValueChange: false
+
             width: parent.width
             height: UM.Theme.getSize("print_setup_slider_handle").height // The handle is the widest element of the slider
 
@@ -157,7 +169,13 @@ Item
                 target: infillSlider
                 function onValueChanged()
                 {
-                    // Don't round the value if it's already the same
+                    if (infillSlider.ignoreValueChange)
+                    {
+                        infillSlider.ignoreValueChange = false
+                        return
+                    }
+
+                    // Don't update if the setting value, if the slider has the same value
                     if (parseInt(infillDensity.properties.value) == infillSlider.value)
                     {
                         return