Merge branch 'master' of github.com:Ultimaker/Cura

cura/PlatformPhysics.py

@@ -76,7 +76,7 @@ class PlatformPhysics:
                 move_vector = move_vector.set(y = -bbox.bottom + z_offset)
 
             # If there is no convex hull for the node, start calculating it and continue.
-            if not node.getDecorator(ConvexHullDecorator):
+            if not node.getDecorator(ConvexHullDecorator) and not node.callDecoration("isNonPrintingMesh"):
                 node.addDecorator(ConvexHullDecorator())
 
             # only push away objects if this node is a printing mesh

plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml

@@ -22,7 +22,7 @@ Item
 
     property int labelWidth: 210 * screenScaleFactor
     property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0
-    property var labelFont: UM.Theme.getFont("medium")
+    property var labelFont: UM.Theme.getFont("default")
 
     property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0
     property int columnSpacing: 3 * screenScaleFactor

resources/definitions/fdmprinter.def.json

@@ -3945,6 +3945,7 @@
                     "maximum_value": "180",
                     "default_value": 0,
                     "enabled": "support_enable and support_pattern != 'concentric' and support_infill_rate > 0",
+                    "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },

resources/qml/Cura.qml

@@ -818,7 +818,12 @@ UM.MainWindow
     Connections
     {
         target: Cura.Actions.addMachine
-        onTriggered: addMachineDialog.show()
+        onTriggered:
+        {
+            // Make sure to show from the first page when the dialog shows up.
+            addMachineDialog.resetModelState()
+            addMachineDialog.show()
+        }
     }
 
     AboutDialog

resources/qml/WelcomePages/UserAgreementContent.qml

@@ -43,7 +43,7 @@ Item
             + "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
         textFormat: Text.RichText
         wrapMode: Text.WordWrap
-        font: UM.Theme.getFont("default")
+        font: UM.Theme.getFont("medium")
         color: UM.Theme.getColor("text")
         renderType: Text.NativeRendering
     }

resources/qml/WelcomePages/WhatsNewContent.qml

@@ -44,6 +44,7 @@ Item
         textArea.textFormat: Text.RichText
         textArea.wrapMode: Text.WordWrap
         textArea.readOnly: true
+        textArea.font: UM.Theme.getFont("medium")
     }
 
     Cura.PrimaryButton

resources/qml/WelcomePages/WizardDialog.qml

@@ -24,20 +24,15 @@ Window
 
     minimumWidth: 580 * screenScaleFactor
     minimumHeight: 600 * screenScaleFactor
-    maximumWidth: minimumWidth
-    maximumHeight: minimumHeight
 
     color: UM.Theme.getColor("main_background")
 
     property var model: null  // Needs to be set by whoever is using this dialog.
     property alias progressBarVisible: wizardPanel.progressBarVisible
 
-    onVisibilityChanged:
+    function resetModelState()
     {
-        if (visible)
-        {
-            model.resetState()
-        }
+        model.resetState()
     }
 
     WizardPanel