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

cura/Settings/ContainerManager.py

@@ -349,6 +349,10 @@ class ContainerManager(QObject):
     def _updateContainerNameFilters(self):
         self._container_name_filters = {}
         for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes():
+            # Ignore default container types since those are not plugins
+            if container_type in (UM.Settings.InstanceContainer, UM.Settings.ContainerStack, UM.Settings.DefinitionContainer):
+                continue
+
             serialize_type = ""
             try:
                 plugin_metadata = UM.PluginRegistry.getInstance().getMetaData(plugin_id)

resources/definitions/fdmprinter.def.json

@@ -3077,7 +3077,8 @@
                     "label": "Infill Mesh Order",
                     "description": "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.",
                     "default_value": 0,
-                    "minimum_value_warning": "0",
+                    "value": "1 if infill_mesh else 0",
+                    "minimum_value_warning": "1",
                     "maximum_value_warning": "50",
                     "type": "int",
                     "settable_per_mesh": true,

resources/qml/Preferences/MaterialsPage.qml

@@ -135,7 +135,7 @@ UM.ManagementPage
 
                 enabled: base.currentItem != null && !base.currentItem.readOnly
 
-                checkable: true
+                checkable: enabled
             }
         }
 
@@ -150,7 +150,7 @@ UM.ManagementPage
                 bottom: parent.bottom
             }
 
-            editingEnabled: base.currentItem != null && !base.currentItem.readOnly && editButton.checked;
+            editingEnabled: editButton.checkable && editButton.checked;
 
             properties: materialProperties
             containerId: base.currentItem != null ? base.currentItem.id : ""