Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0

cura/Settings/ProfilesModel.py

@@ -100,6 +100,9 @@ class ProfilesModel(InstanceContainersModel):
         extruder_stacks = extruder_manager.getActiveExtruderStacks()
         if multiple_extrusion:
             # Place the active extruder at the front of the list.
+            # This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
+            # Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
+            # cases the active_extruder is still None.
             if active_extruder in extruder_stacks:
                 extruder_stacks.remove(active_extruder)
             new_extruder_stacks = []

cura/Settings/QualityAndUserProfilesModel.py

@@ -33,8 +33,15 @@ class QualityAndUserProfilesModel(ProfilesModel):
         extruder_stacks = extruder_manager.getActiveExtruderStacks()
         if multiple_extrusion:
             # Place the active extruder at the front of the list.
-            extruder_stacks.remove(active_extruder)
-            extruder_stacks = [active_extruder] + extruder_stacks
+            # This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
+            # Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
+            # cases the active_extruder is still None.
+            if active_extruder in extruder_stacks:
+                extruder_stacks.remove(active_extruder)
+            new_extruder_stacks = []
+            if active_extruder is not None:
+                new_extruder_stacks = [active_extruder]
+            extruder_stacks = new_extruder_stacks + extruder_stacks
 
         # Fetch the list of useable qualities across all extruders.
         # The actual list of quality profiles come from the first extruder in the extruder list.

cura/Settings/UserProfilesModel.py

@@ -33,6 +33,9 @@ class UserProfilesModel(ProfilesModel):
         extruder_stacks = extruder_manager.getActiveExtruderStacks()
         if multiple_extrusion:
             # Place the active extruder at the front of the list.
+            # This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
+            # Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
+            # cases the active_extruder is still None.
             if active_extruder in extruder_stacks:
                 extruder_stacks.remove(active_extruder)
             new_extruder_stacks = []

plugins/3MFReader/WorkspaceDialog.qml

@@ -15,7 +15,7 @@ UM.Dialog
     minimumWidth: 500 * screenScaleFactor
     minimumHeight: 400 * screenScaleFactor
     width: minimumWidth
-    height: minumumHeight
+    height: minimumHeight
 
     property int comboboxHeight: 15 * screenScaleFactor
     property int spacerHeight: 10 * screenScaleFactor