Merge remote-tracking branch 'origin' into clean_print_job_info_block

resources/definitions/fdmextruder.def.json

@@ -178,7 +178,19 @@
                     "maximum_value": "machine_height",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
-                }
+                },
+               "machine_extruder_cooling_fan_number":
+                {
+                    "label": "Extruder Print Cooling Fan",
+                    "description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.",
+                    "type": "int",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "settable_per_meshgroup": false,
+                    "setttable_globally": false
+               }
             }
         },
         "platform_adhesion":

resources/definitions/ultimaker2.def.json

@@ -14,6 +14,7 @@
         "platform_offset": [9, 0, 0],
         "has_materials": false,
         "has_machine_quality": true,
+        "preferred_variant_name": "0.4 mm",
         "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
         "first_start_actions": ["UM2UpgradeSelection"],
         "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"],

resources/qml/Cura.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 
 import UM 1.3 as UM
-import Cura 1.0 as Cura
+import Cura 1.1 as Cura
 
 import "Menus"
 
@@ -21,7 +21,6 @@ UM.MainWindow
     property bool showPrintMonitor: false
 
     backgroundColor: UM.Theme.getColor("viewport_background")
-
     // This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage
     // It should be phased out in newer plugin versions.
     Connections

resources/qml/Preferences/Materials/MaterialsSlot.qml

@@ -41,6 +41,15 @@ Rectangle
         anchors.left: swatch.right
         anchors.verticalCenter: materialSlot.verticalCenter
         anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
+        font.italic:
+        {
+            var selected_material = Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex]
+            if(selected_material == material.root_material_id)
+            {
+                return true
+            }
+            return false
+        }
     }
     MouseArea
     {