Fix merge conflict

cura/CuraApplication.py

@@ -129,6 +129,15 @@ if TYPE_CHECKING:
 
 numpy.seterr(all = "ignore")
 
+try:
+    from cura.CuraVersion import CuraAppDisplayName, CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion  # type: ignore
+except ImportError:
+    CuraAppDisplayName = "Ultimaker Cura"
+    CuraVersion = "master"  # [CodeStyle: Reflecting imported value]
+    CuraBuildType = ""
+    CuraDebugMode = False
+    CuraSDKVersion = "6.0.0"
+
 
 class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.

plugins/3MFReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "3MF Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for reading 3MF files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/3MFWriter/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "3MF Writer",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for writing 3MF files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/ChangeLogPlugin/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Changelog",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Shows changes since latest checked version.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/CuraEngineBackend/plugin.json

@@ -2,7 +2,7 @@
     "name": "CuraEngine Backend",
     "author": "Ultimaker B.V.",
     "description": "Provides the link to the CuraEngine slicing backend.",
-    "api": 5,
+    "api": "6.0",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "i18n-catalog": "cura"
 }

plugins/CuraProfileReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Cura Profile Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for importing Cura profiles.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/CuraProfileWriter/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Cura Profile Writer",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for exporting Cura profiles.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog":"cura"
 }

plugins/FirmwareUpdateChecker/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Firmware Update Checker",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Checks for firmware updates.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/FirmwareUpdater/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Firmware Updater",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a machine actions for updating firmware.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/GCodeGzReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Compressed G-code Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Reads g-code from a compressed archive.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/GCodeGzWriter/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Compressed G-code Writer",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Writes g-code to a compressed archive.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/GCodeProfileReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "G-code Profile Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for importing profiles from g-code files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/GCodeReader/FlavorParser.py

@@ -364,6 +364,8 @@ class FlavorParser:
                     self._layer_type = LayerPolygon.SupportType
                 elif type == "FILL":
                     self._layer_type = LayerPolygon.InfillType
+                elif type == "SUPPORT-INTERFACE":
+                    self._layer_type = LayerPolygon.SupportInterfaceType
                 else:
                     Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)
 

plugins/GCodeReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "G-code Reader",
-    "author": "Victor Larchenko",
+    "author": "Victor Larchenko, Ultimaker",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Allows loading and displaying G-code files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/GCodeWriter/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "G-code Writer",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Writes g-code to a file.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/ImageReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Image Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Enables ability to generate printable geometry from 2D image files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/LegacyProfileReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Legacy Cura Profile Reader",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for importing profiles from legacy Cura versions.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/MachineSettingsAction/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Machine Settings action",
     "author": "fieldOfView",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/ModelChecker/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Model Checker",
     "author": "Ultimaker B.V.",
-    "version": "0.1",
+    "version": "1.0.1",
-    "api": 5,
+    "api": "6.0",
     "description": "Checks models and print configuration for possible printing issues and give suggestions.",
     "i18n-catalog": "cura"
 }

plugins/MonitorStage/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Monitor Stage",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a monitor stage in Cura.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/PerObjectSettingsTool/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Per Model Settings Tool",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides the Per Model Settings.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/PostProcessingPlugin/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Post Processing",
     "author": "Ultimaker",
-    "version": "2.2",
+    "version": "2.2.1",
-    "api": 5,
+    "api": "6.0",
     "description": "Extension that allows for user created scripts for post processing",
     "catalog": "cura"
 }

plugins/PrepareStage/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Prepare Stage",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a prepare stage in Cura.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/PreviewStage/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Preview Stage",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a preview stage in Cura.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/RemovableDriveOutputDevice/plugin.json

@@ -2,7 +2,7 @@
     "name": "Removable Drive Output Device Plugin",
     "author": "Ultimaker B.V.",
     "description": "Provides removable drive hotplugging and writing support.",
-    "version": "1.0.0",
+    "version": "1.0.1",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/SimulationView/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Simulation View",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides the Simulation view.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/SliceInfoPlugin/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Slice info",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Submits anonymous slice info. Can be disabled through preferences.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/SolidView/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Solid View",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides a normal solid mesh view.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/SupportEraser/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Support Eraser",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Creates an eraser mesh to block the printing of support in certain places",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/Toolbox/plugin.json

@@ -1,7 +1,7 @@
 {
     "name": "Toolbox",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
-    "api": 5,
+    "api": "6.0",
     "description": "Find, manage and install new Cura packages."
 }

plugins/Toolbox/resources/qml/RatingWidget.qml

@@ -75,6 +75,8 @@ Item
                     background: UM.RecolorImage
                     {
                         source: UM.Theme.getIcon(control.isStarFilled ? "star_filled" : "star_empty")
+                        sourceSize.width: width
+                        sourceSize.height: height
 
                         // Unfilled stars should always have the default color. Only filled stars should change on hover
                         color:

plugins/Toolbox/resources/qml/SmallRatingWidget.qml

@@ -17,6 +17,8 @@ Row
         color: model.user_rating == 0  ? UM.Theme.getColor("rating_star") : UM.Theme.getColor("primary")
         height: UM.Theme.getSize("rating_star").height
         width: UM.Theme.getSize("rating_star").width
+        sourceSize.height: height
+        sourceSize.width: width
     }
 
     Label

plugins/Toolbox/resources/qml/ToolboxDetailPage.qml

@@ -88,7 +88,7 @@ Item
             height: childrenRect.height
             Label
             {
-                text: catalog.i18nc("@label", "Rating") + ":"
+                text: catalog.i18nc("@label", "Your rating") + ":"
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text_medium")
                 renderType: Text.NativeRendering

plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml

@@ -47,6 +47,7 @@ Rectangle
         height: UM.Theme.getSize("toolbox_heading_label").height
         width: parent.width - UM.Theme.getSize("default_margin").width
         wrapMode: Text.WordWrap
+        elide: Text.ElideRight
         font: UM.Theme.getFont("medium_bold")
     }
     UM.RecolorImage

plugins/UFPWriter/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "UFP Writer",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides support for writing Ultimaker Format Packages.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/UM3NetworkPrinting/plugin.json

@@ -2,7 +2,7 @@
     "name": "UM3 Network Connection",
     "author": "Ultimaker B.V.",
     "description": "Manages network connections to Ultimaker 3 printers.",
-    "version": "1.0.0",
+    "version": "1.0.1",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml

@@ -8,11 +8,13 @@ import UM 1.3 as UM
 import Cura 1.0 as Cura
 
 Rectangle {
+    id: base
     property var iconSource: null;
     color: "#0a0850" // TODO: Theme!
     height: width;
     radius: Math.round(0.5 * width);
     width: 24 * screenScaleFactor;
+    property var enabled: true
 
     UM.RecolorImage {
         id: icon;
@@ -29,12 +31,18 @@ Rectangle {
     MouseArea {
         id: clickArea;
         anchors.fill: parent;
-        hoverEnabled: true;
+        hoverEnabled: base.enabled
         onClicked: {
-            if (OutputDevice.activeCameraUrl != "") {
+            if (base.enabled)
-                OutputDevice.setActiveCameraUrl("");
+            {
-            } else {
+                if (OutputDevice.activeCameraUrl != "")
-                OutputDevice.setActiveCameraUrl(modelData.cameraUrl);
+                {
+                    OutputDevice.setActiveCameraUrl("")
+                }
+                else
+                {
+                    OutputDevice.setActiveCameraUrl(modelData.cameraUrl)
+                }
             }
         }
     }

plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml

@@ -16,9 +16,9 @@ Item
 
     property bool expanded: false
     property var borderWidth: 1
-    property color borderColor: "#EAEAEC"
+    property color borderColor: "#CCCCCC"
     property color headerBackgroundColor: "white"
-    property color headerHoverColor: "#f5f5f5"
+    property color headerHoverColor: "#e8f2fc"
     property color drawerBackgroundColor: "white"
     property alias headerItem: header.children
     property alias drawerItem: drawer.children

plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml

@@ -0,0 +1,251 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.3
+import QtQuick.Controls 2.0
+import QtGraphicalEffects 1.0
+import UM 1.3 as UM
+
+Item
+{
+    id: base
+
+    property var currentIndex: 0
+    property var tileWidth: 834 * screenScaleFactor // TODO: Theme!
+    property var tileHeight: 216 * screenScaleFactor // TODO: Theme!
+    property var tileSpacing: 60 * screenScaleFactor // TODO: Theme!
+    property var maxOffset: (OutputDevice.printers.length - 1) * (tileWidth + tileSpacing)
+
+    height: centerSection.height
+    width: maximumWidth
+
+    Item
+    {
+        id: leftHint
+        anchors
+        {
+            right: leftButton.left
+            rightMargin: 12 * screenScaleFactor // TODO: Theme!
+            left: parent.left
+        }
+        height: parent.height
+        z: 10
+        LinearGradient
+        {
+            anchors.fill: parent
+            start: Qt.point(0, 0)
+            end: Qt.point(leftHint.width, 0)
+            gradient: Gradient
+            {
+                GradientStop
+                {
+                    position: 0.0
+                    color: "#fff6f6f6" // TODO: Theme!
+                }
+                GradientStop
+                {
+                    position: 1.0
+                    color: "#66f6f6f6" // TODO: Theme!
+                }
+            }
+        }
+        MouseArea
+        {
+            anchors.fill: parent
+            onClicked: navigateTo(currentIndex - 1)
+        }
+    }
+
+    Button
+    {
+        id: leftButton
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+            right: centerSection.left
+            rightMargin: 12 * screenScaleFactor // TODO: Theme!
+        }
+        width: 36 * screenScaleFactor // TODO: Theme!
+        height: 72 * screenScaleFactor // TODO: Theme!
+        visible: currentIndex > 0
+        hoverEnabled: true
+        z: 10
+        onClicked: navigateTo(currentIndex - 1)
+        background: Rectangle
+        {
+            color: leftButton.hovered ? "#e8f2fc" : "#ffffff" // TODO: Theme!
+            border.width: 1 * screenScaleFactor // TODO: Theme!
+            border.color: "#cccccc" // TODO: Theme!
+            radius: 2 * screenScaleFactor // TODO: Theme!
+        }
+        contentItem: Item
+        {
+            anchors.fill: parent
+            UM.RecolorImage
+            {
+                anchors.centerIn: parent
+                width: 18 // TODO: Theme!
+                height: width // TODO: Theme!
+                sourceSize.width: width // TODO: Theme!
+                sourceSize.height: width // TODO: Theme!
+                color: "#152950" // TODO: Theme!
+                source: UM.Theme.getIcon("arrow_left")
+            }
+        }
+    }
+
+    Item
+    {
+        id: centerSection
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: tileWidth
+        height: tiles.height
+        z: 1
+
+        Row
+        {
+            id: tiles
+            height: childrenRect.height
+            width: 5 * tileWidth + 4 * tileSpacing // TODO: Theme!
+            x: 0
+            z: 0
+            Behavior on x
+            {
+                NumberAnimation
+                {
+                    duration: 200
+                    easing.type: Easing.InOutCubic
+                }
+            }
+            spacing: 60 * screenScaleFactor // TODO: Theme!
+            
+            Repeater
+            {
+                model: OutputDevice.printers
+                MonitorPrinterCard
+                {
+                    printer: modelData
+                    enabled: model.index == currentIndex
+                }
+            }
+        }
+    }
+
+    Button
+    {
+        id: rightButton
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+            left: centerSection.right
+            leftMargin: 12 * screenScaleFactor // TODO: Theme!
+        }
+        width: 36 * screenScaleFactor // TODO: Theme!
+        height: 72 * screenScaleFactor // TODO: Theme!
+        z: 10
+        visible: currentIndex < OutputDevice.printers.length - 1
+        onClicked: navigateTo(currentIndex + 1)
+        hoverEnabled: true
+        background: Rectangle
+        {
+            color: rightButton.hovered ? "#e8f2fc" : "#ffffff" // TODO: Theme!
+            border.width: 1 * screenScaleFactor // TODO: Theme!
+            border.color: "#cccccc" // TODO: Theme!
+            radius: 2 * screenScaleFactor // TODO: Theme!
+        }
+        contentItem: Item
+        {
+            anchors.fill: parent
+            UM.RecolorImage
+            {
+                anchors.centerIn: parent
+                width: 18 // TODO: Theme!
+                height: width // TODO: Theme!
+                sourceSize.width: width // TODO: Theme!
+                sourceSize.height: width // TODO: Theme!
+                color: "#152950" // TODO: Theme!
+                source: UM.Theme.getIcon("arrow_right")
+            }
+        }
+    }
+
+    Item
+    {
+        id: rightHint
+        anchors
+        {
+            left: rightButton.right
+            leftMargin: 12 * screenScaleFactor // TODO: Theme!
+            right: parent.right
+        }
+        height: centerSection.height
+        z: 10
+
+        LinearGradient
+        {
+            anchors.fill: parent
+            start: Qt.point(0, 0)
+            end: Qt.point(rightHint.width, 0)
+            gradient: Gradient
+            {
+                GradientStop
+                {
+                    position: 0.0
+                    color: "#66f6f6f6" // TODO: Theme!
+                }
+                GradientStop
+                {
+                    position: 1.0
+                    color: "#fff6f6f6" // TODO: Theme!
+                }
+            }
+        }
+        MouseArea
+        {
+            anchors.fill: parent
+            onClicked: navigateTo(currentIndex + 1)
+        }
+    }
+
+    Item
+    {
+        id: navigationDots
+        anchors
+        {
+            horizontalCenter: centerSection.horizontalCenter
+            top: centerSection.bottom
+            topMargin: 36 * screenScaleFactor // TODO: Theme!
+        }
+        Row
+        {
+            spacing: 8 * screenScaleFactor // TODO: Theme!
+            Repeater
+            {
+                model: OutputDevice.printers
+                Button
+                {
+                    background: Rectangle
+                    {
+                        color: model.index == currentIndex ? "#777777" : "#d8d8d8" // TODO: Theme!
+                        radius: Math.floor(width / 2)
+                        width: 12 * screenScaleFactor // TODO: Theme!
+                        height: width // TODO: Theme!
+                    }
+                    onClicked: navigateTo(model.index)
+                }
+            }
+        }
+    }
+
+    function navigateTo( i ) {
+        if (i >= 0 && i < OutputDevice.printers.length)
+        {
+            tiles.x = -1 * i * (tileWidth + tileSpacing)
+            currentIndex = i
+        }
+    }
+}

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -26,7 +26,7 @@ Item
 
     ExpandableCard
     {
-        borderColor: printJob.configurationChanges.length !== 0 ? "#f5a623" : "#EAEAEC" // TODO: Theme!
+        borderColor: printJob.configurationChanges.length !== 0 ? "#f5a623" : "#CCCCCC" // TODO: Theme!
         headerItem: Row
         {
             height: 48 * screenScaleFactor // TODO: Theme!

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -25,8 +25,13 @@ Item
 
     property var borderSize: 1 * screenScaleFactor // TODO: Theme, and remove from here
 
+    // If the printer card's controls are enabled. This is used by the carousel
+    // to prevent opening the context menu or camera while the printer card is not
+    // "in focus"
+    property var enabled: true
+
     width: 834 * screenScaleFactor // TODO: Theme!
-    height: 216 * screenScaleFactor // TODO: Theme!
+    height: childrenRect.height
 
     // Printer portion
     Rectangle
@@ -34,7 +39,7 @@ Item
         id: printerInfo
         border
         {
-            color: "#EAEAEC" // TODO: Theme!
+            color: "#CCCCCC" // TODO: Theme!
             width: borderSize // TODO: Remove once themed
         }
         color: "white" // TODO: Theme!
@@ -124,6 +129,7 @@ Item
             printJob: printer.activePrintJob
             width: 36 * screenScaleFactor // TODO: Theme!
             height: 36 * screenScaleFactor // TODO: Theme!
+            enabled: base.enabled
         }
         CameraButton
         {
@@ -136,6 +142,7 @@ Item
                 bottomMargin: 20 * screenScaleFactor // TODO: Theme!
             }
             iconSource: "../svg/icons/camera.svg"
+            enabled: base.enabled
         }
     }
 
@@ -151,7 +158,7 @@ Item
         }
         border
         {
-            color: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 ? "#f5a623" : "#EAEAEC" // TODO: Theme!
+            color: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 ? "#f5a623" : "#CCCCCC" // TODO: Theme!
             width: borderSize // TODO: Remove once themed
         }
         color: "white" // TODO: Theme!
@@ -320,7 +327,7 @@ Item
             implicitHeight: 32 * screenScaleFactor // TODO: Theme!
             implicitWidth: 96 * screenScaleFactor // TODO: Theme!
             visible: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0
-            onClicked: overrideConfirmationDialog.open()
+            onClicked: base.enabled ? overrideConfirmationDialog.open() : {}
         }
     }
 

plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -0,0 +1,167 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.2
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import UM 1.3 as UM
+import Cura 1.0 as Cura
+
+/**
+ * This component contains the print job queue, extracted from the primary
+ * MonitorStage.qml file not for reusability but simply to keep it lean and more
+ * readable.
+ */
+Item
+{
+    Label
+    {
+        id: queuedLabel
+        anchors
+        {
+            left: queuedPrintJobs.left
+            top: parent.top
+        }
+        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("large_nonbold")
+        text: catalog.i18nc("@label", "Queued")
+    }
+
+    Item
+    {
+        id: manageQueueLabel
+        anchors
+        {
+            right: queuedPrintJobs.right
+            verticalCenter: queuedLabel.verticalCenter
+        }
+        height: 18 * screenScaleFactor // TODO: Theme!
+        width: childrenRect.width
+
+        UM.RecolorImage
+        {
+            id: externalLinkIcon
+            anchors.verticalCenter: manageQueueLabel.verticalCenter
+            color: UM.Theme.getColor("primary")
+            source: "../svg/icons/external_link.svg"
+            width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
+            height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
+        }
+        Label
+        {
+            id: manageQueueText
+            anchors
+            {
+                left: externalLinkIcon.right
+                leftMargin: 6 * screenScaleFactor // TODO: Theme!
+                verticalCenter: externalLinkIcon.verticalCenter
+            }
+            color: UM.Theme.getColor("primary")
+            font: UM.Theme.getFont("default") // 12pt, regular
+            linkColor: UM.Theme.getColor("primary")
+            text: catalog.i18nc("@label link to connect manager", "Manage queue in Cura Connect")
+        }
+    }
+
+    MouseArea
+    {
+        anchors.fill: manageQueueLabel
+        hoverEnabled: true
+        onClicked: Cura.MachineManager.printerOutputDevices[0].openPrintJobControlPanel()
+        onEntered:
+        {
+            manageQueueText.font.underline = true
+        }
+        onExited:
+        {
+            manageQueueText.font.underline = false
+        }
+    }
+
+    Row
+    {
+        id: printJobQueueHeadings
+        anchors
+        {
+            left: queuedPrintJobs.left
+            leftMargin: 6 * screenScaleFactor // TODO: Theme!
+            top: queuedLabel.bottom
+            topMargin: 24 * screenScaleFactor // TODO: Theme!
+        }
+        spacing: 18 * screenScaleFactor // TODO: Theme!
+
+        Label
+        {
+            text: catalog.i18nc("@label", "Print jobs")
+            color: "#666666"
+            elide: Text.ElideRight
+            font: UM.Theme.getFont("medium") // 14pt, regular
+            anchors.verticalCenter: parent.verticalCenter
+            width: 284 * screenScaleFactor // TODO: Theme! (Should match column size)
+
+            // FIXED-LINE-HEIGHT:
+            height: 18 * screenScaleFactor // TODO: Theme!
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Label
+        {
+            text: catalog.i18nc("@label", "Total print time")
+            color: "#666666"
+            elide: Text.ElideRight
+            font: UM.Theme.getFont("medium") // 14pt, regular
+            anchors.verticalCenter: parent.verticalCenter
+            width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
+
+            // FIXED-LINE-HEIGHT:
+            height: 18 * screenScaleFactor // TODO: Theme!
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Label
+        {
+            text: catalog.i18nc("@label", "Waiting for")
+            color: "#666666"
+            elide: Text.ElideRight
+            font: UM.Theme.getFont("medium") // 14pt, regular
+            anchors.verticalCenter: parent.verticalCenter
+            width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
+
+            // FIXED-LINE-HEIGHT:
+            height: 18 * screenScaleFactor // TODO: Theme!
+            verticalAlignment: Text.AlignVCenter
+        }
+    }
+
+    ScrollView
+    {
+        id: queuedPrintJobs
+        anchors
+        {
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+            top: printJobQueueHeadings.bottom
+            topMargin: 12 * screenScaleFactor // TODO: Theme!
+        }
+        style: UM.Theme.styles.scrollview
+        visible: OutputDevice.receivedPrintJobs
+        width: parent.width
+
+        ListView
+        {
+            id: printJobList
+            anchors.fill: parent
+            delegate: MonitorPrintJobCard
+            {
+                anchors
+                {
+                    left: parent.left
+                    right: parent.right
+                }
+                printJob: modelData
+            }
+            model: OutputDevice.queuedPrintJobs
+            spacing: 6  // TODO: Theme!
+        }
+    }
+}

plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -8,16 +8,13 @@ import UM 1.3 as UM
 import Cura 1.0 as Cura
 import QtGraphicalEffects 1.0
 
-// Root component for the monitor tab (stage)
+// This is the root component for the monitor stage.
 Component
 {
     Item
     {
         id: monitorFrame
 
-        property var emphasisColor: UM.Theme.getColor("setting_control_border_highlight")
-        property var cornerRadius: UM.Theme.getSize("monitor_corner_radius").width
-
         height: maximumHeight
         onVisibleChanged:
         {
@@ -52,39 +49,23 @@ Component
             }
         }
 
-        ScrollView
+        Item
         {
             id: printers
             anchors
             {
-                left: queue.left
-                right: queue.right
                 top: parent.top
                 topMargin: 48 * screenScaleFactor // TODO: Theme!
             }
+            width: parent.width
             height: 264 * screenScaleFactor // TODO: Theme!
-
+            MonitorCarousel {}
-            Row
-            {
-                spacing: 60 * screenScaleFactor // TODO: Theme!
-                
-                Repeater
-                {
-                    model: OutputDevice.printers
-
-                    MonitorPrinterCard
-                    {
-                        printer: modelData
-                    }
-                }
-            }
         }
 
-        Item
+        MonitorQueue
         {
             id: queue
             width: Math.min(834 * screenScaleFactor, maximumWidth)
-
             anchors
             {
                 bottom: parent.bottom
@@ -92,157 +73,6 @@ Component
                 top: printers.bottom
                 topMargin: 48 * screenScaleFactor // TODO: Theme!
             }
-
-            Label
-            {
-                id: queuedLabel
-                anchors
-                {
-                    left: queuedPrintJobs.left
-                    top: parent.top
-                }
-                color: UM.Theme.getColor("text")
-                font: UM.Theme.getFont("large_nonbold")
-                text: catalog.i18nc("@label", "Queued")
-            }
-
-            Item
-            {
-                id: manageQueueLabel
-                anchors
-                {
-                    right: queuedPrintJobs.right
-                    verticalCenter: queuedLabel.verticalCenter
-                }
-                height: 18 * screenScaleFactor // TODO: Theme!
-                width: childrenRect.width
-
-                UM.RecolorImage
-                {
-                    id: externalLinkIcon
-                    anchors.verticalCenter: manageQueueLabel.verticalCenter
-                    color: UM.Theme.getColor("primary")
-                    source: "../svg/icons/external_link.svg"
-                    width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
-                    height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
-                }
-                Label
-                {
-                    id: manageQueueText
-                    anchors
-                    {
-                        left: externalLinkIcon.right
-                        leftMargin: 6 * screenScaleFactor // TODO: Theme!
-                        verticalCenter: externalLinkIcon.verticalCenter
-                    }
-                    color: UM.Theme.getColor("primary")
-                    font: UM.Theme.getFont("default") // 12pt, regular
-                    linkColor: UM.Theme.getColor("primary")
-                    text: catalog.i18nc("@label link to connect manager", "Manage queue in Cura Connect")
-                }
-            }
-
-            MouseArea
-            {
-                anchors.fill: manageQueueLabel
-                hoverEnabled: true
-                onClicked: Cura.MachineManager.printerOutputDevices[0].openPrintJobControlPanel()
-                onEntered:
-                {
-                    manageQueueText.font.underline = true
-                }
-                onExited:
-                {
-                    manageQueueText.font.underline = false
-                }
-            }
-
-            Row
-            {
-                id: printJobQueueHeadings
-                anchors
-                {
-                    left: queuedPrintJobs.left
-                    leftMargin: 6 * screenScaleFactor // TODO: Theme!
-                    top: queuedLabel.bottom
-                    topMargin: 24 * screenScaleFactor // TODO: Theme!
-                }
-                spacing: 18 * screenScaleFactor // TODO: Theme!
-
-                Label
-                {
-                    text: catalog.i18nc("@label", "Print jobs")
-                    color: "#666666"
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("medium") // 14pt, regular
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 284 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-                    // FIXED-LINE-HEIGHT:
-                    height: 18 * screenScaleFactor // TODO: Theme!
-                    verticalAlignment: Text.AlignVCenter
-                }
-
-                Label
-                {
-                    text: catalog.i18nc("@label", "Total print time")
-                    color: "#666666"
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("medium") // 14pt, regular
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-                    // FIXED-LINE-HEIGHT:
-                    height: 18 * screenScaleFactor // TODO: Theme!
-                    verticalAlignment: Text.AlignVCenter
-                }
-
-                Label
-                {
-                    text: catalog.i18nc("@label", "Waiting for")
-                    color: "#666666"
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("medium") // 14pt, regular
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-                    // FIXED-LINE-HEIGHT:
-                    height: 18 * screenScaleFactor // TODO: Theme!
-                    verticalAlignment: Text.AlignVCenter
-                }
-            }
-
-            ScrollView
-            {
-                id: queuedPrintJobs
-                anchors
-                {
-                    bottom: parent.bottom
-                    horizontalCenter: parent.horizontalCenter
-                    top: printJobQueueHeadings.bottom
-                    topMargin: 12 * screenScaleFactor // TODO: Theme!
-                }
-                style: UM.Theme.styles.scrollview
-                visible: OutputDevice.receivedPrintJobs
-                width: parent.width
-
-                ListView
-                {
-                    id: printJobList
-                    anchors.fill: parent
-                    delegate: MonitorPrintJobCard
-                    {
-                        anchors
-                        {
-                            left: parent.left
-                            right: parent.right
-                        }
-                        printJob: modelData
-                    }
-                    model: OutputDevice.queuedPrintJobs
-                    spacing: 6
-                }
-            }
         }
 
         PrinterVideoStream

plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml

@@ -13,6 +13,7 @@ Item {
     property var printJob: null;
     property var started: isStarted(printJob);
     property var assigned: isAssigned(printJob);
+    property var enabled: true
 
     Button {
         id: button;
@@ -31,8 +32,8 @@ Item {
             verticalAlignment: Text.AlignVCenter;
         }
         height: width;
-        hoverEnabled: true;
+        hoverEnabled: base.enabled
-        onClicked: parent.switchPopupState();
+        onClicked: base.enabled ? parent.switchPopupState() : {}
         text: "\u22EE"; //Unicode; Three stacked points.
         visible: {
             if (!printJob) {

plugins/USBPrinting/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "USB printing",
     "author": "Ultimaker B.V.",
-    "version": "1.0.1",
+    "version": "1.0.2",
-    "api": 5,
+    "api": "6.0",
     "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
     "i18n-catalog": "cura"
 }

plugins/UltimakerMachineActions/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Ultimaker machine actions",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/UserAgreement/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "UserAgreement",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Ask the user once if he/she agrees with our license.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Version Upgrade 2.1 to 2.2",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Version Upgrade 2.2 to 2.4",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 2.5 to 2.6",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 2.6 to 2.7",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 2.7 to 3.0",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 3.0 to 3.1",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 3.2 to 3.3",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 3.3 to 3.4",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json

@@ -1,8 +1,8 @@
  {
     "name": "Version Upgrade 3.4 to 3.5",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/X3DReader/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "X3D Reader",
     "author": "Seva Alekseyev",
-    "version": "0.5.0",
+    "version": "1.0.1",
     "description": "Provides support for reading X3D files.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/XRayView/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "X-Ray View",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides the X-Ray view.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

plugins/XmlMaterialProfile/plugin.json

@@ -1,8 +1,8 @@
 {
     "name": "Material Profiles",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Provides capabilities to read and write XML-based material profiles.",
-    "api": 5,
+    "api": "6.0",
     "i18n-catalog": "cura"
 }

resources/bundled_packages/cura.json

@@ -5,8 +5,8 @@
             "package_type": "plugin",
             "display_name": "3MF Reader",
             "description": "Provides support for reading 3MF files.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -22,8 +22,8 @@
             "package_type": "plugin",
             "display_name": "3MF Writer",
             "description": "Provides support for writing 3MF files.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -39,8 +39,8 @@
             "package_type": "plugin",
             "display_name": "Change Log",
             "description": "Shows changes since latest checked version.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -73,8 +73,8 @@
             "package_type": "plugin",
             "display_name": "CuraEngine Backend",
             "description": "Provides the link to the CuraEngine slicing backend.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -90,8 +90,8 @@
             "package_type": "plugin",
             "display_name": "Cura Profile Reader",
             "description": "Provides support for importing Cura profiles.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -107,8 +107,8 @@
             "package_type": "plugin",
             "display_name": "Cura Profile Writer",
             "description": "Provides support for exporting Cura profiles.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -124,8 +124,8 @@
             "package_type": "plugin",
             "display_name": "Firmware Update Checker",
             "description": "Checks for firmware updates.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -141,8 +141,8 @@
             "package_type": "plugin",
             "display_name": "Firmware Updater",
             "description": "Provides a machine actions for updating firmware.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -158,8 +158,8 @@
             "package_type": "plugin",
             "display_name": "Compressed G-code Reader",
             "description": "Reads g-code from a compressed archive.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -175,8 +175,8 @@
             "package_type": "plugin",
             "display_name": "Compressed G-code Writer",
             "description": "Writes g-code to a compressed archive.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -192,8 +192,8 @@
             "package_type": "plugin",
             "display_name": "G-Code Profile Reader",
             "description": "Provides support for importing profiles from g-code files.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -209,8 +209,8 @@
             "package_type": "plugin",
             "display_name": "G-Code Reader",
             "description": "Allows loading and displaying G-code files.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "VictorLarchenko",
@@ -226,8 +226,8 @@
             "package_type": "plugin",
             "display_name": "G-Code Writer",
             "description": "Writes g-code to a file.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -243,8 +243,8 @@
             "package_type": "plugin",
             "display_name": "Image Reader",
             "description": "Enables ability to generate printable geometry from 2D image files.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -260,8 +260,8 @@
             "package_type": "plugin",
             "display_name": "Legacy Cura Profile Reader",
             "description": "Provides support for importing profiles from legacy Cura versions.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -277,8 +277,8 @@
             "package_type": "plugin",
             "display_name": "Machine Settings Action",
             "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "fieldOfView",
@@ -294,8 +294,8 @@
             "package_type": "plugin",
             "display_name": "Model Checker",
             "description": "Checks models and print configuration for possible printing issues and give suggestions.",
-            "package_version": "0.1.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -311,8 +311,8 @@
             "package_type": "plugin",
             "display_name": "Monitor Stage",
             "description": "Provides a monitor stage in Cura.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -328,8 +328,8 @@
             "package_type": "plugin",
             "display_name": "Per-Object Settings Tool",
             "description": "Provides the per-model settings.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -345,8 +345,8 @@
             "package_type": "plugin",
             "display_name": "Post Processing",
             "description": "Extension that allows for user created scripts for post processing.",
-            "package_version": "2.2.0",
+            "package_version": "2.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -362,8 +362,8 @@
             "package_type": "plugin",
             "display_name": "Prepare Stage",
             "description": "Provides a prepare stage in Cura.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -379,8 +379,8 @@
             "package_type": "plugin",
             "display_name": "Preview Stage",
             "description": "Provides a preview stage in Cura.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -396,8 +396,8 @@
             "package_type": "plugin",
             "display_name": "Removable Drive Output Device",
             "description": "Provides removable drive hotplugging and writing support.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -413,8 +413,8 @@
             "package_type": "plugin",
             "display_name": "Simulation View",
             "description": "Provides the Simulation view.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -430,8 +430,8 @@
             "package_type": "plugin",
             "display_name": "Slice Info",
             "description": "Submits anonymous slice info. Can be disabled through preferences.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -447,8 +447,8 @@
             "package_type": "plugin",
             "display_name": "Solid View",
             "description": "Provides a normal solid mesh view.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -464,8 +464,8 @@
             "package_type": "plugin",
             "display_name": "Support Eraser Tool",
             "description": "Creates an eraser mesh to block the printing of support in certain places.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -481,8 +481,8 @@
             "package_type": "plugin",
             "display_name": "Toolbox",
             "description": "Find, manage and install new Cura packages.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -498,8 +498,8 @@
             "package_type": "plugin",
             "display_name": "UFP Writer",
             "description": "Provides support for writing Ultimaker Format Packages.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -515,8 +515,8 @@
             "package_type": "plugin",
             "display_name": "Ultimaker Machine Actions",
             "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -532,8 +532,8 @@
             "package_type": "plugin",
             "display_name": "UM3 Network Printing",
             "description": "Manages network connections to Ultimaker 3 printers.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -549,8 +549,8 @@
             "package_type": "plugin",
             "display_name": "USB Printing",
             "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
-            "package_version": "1.0.1",
+            "package_version": "1.0.2",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -566,8 +566,8 @@
             "package_type": "plugin",
             "display_name": "User Agreement",
             "description": "Ask the user once if he/she agrees with our license.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -583,8 +583,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 2.1 to 2.2",
             "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -600,8 +600,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 2.2 to 2.4",
             "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -617,8 +617,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 2.5 to 2.6",
             "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -634,8 +634,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 2.6 to 2.7",
             "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -651,8 +651,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 2.7 to 3.0",
             "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -668,8 +668,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 3.0 to 3.1",
             "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -685,8 +685,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 3.2 to 3.3",
             "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -702,8 +702,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 3.3 to 3.4",
             "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -719,8 +719,8 @@
             "package_type": "plugin",
             "display_name": "Version Upgrade 3.4 to 3.5",
             "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -736,8 +736,8 @@
             "package_type": "plugin",
             "display_name": "X3D Reader",
             "description": "Provides support for reading X3D files.",
-            "package_version": "0.5.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "SevaAlekseyev",
@@ -753,8 +753,8 @@
             "package_type": "plugin",
             "display_name": "XML Material Profiles",
             "description": "Provides capabilities to read and write XML-based material profiles.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -770,8 +770,8 @@
             "package_type": "plugin",
             "display_name": "X-Ray View",
             "description": "Provides the X-Ray view.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -787,8 +787,8 @@
             "package_type": "material",
             "display_name": "Generic ABS",
             "description": "The generic ABS profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -805,8 +805,8 @@
             "package_type": "material",
             "display_name": "Generic BAM",
             "description": "The generic BAM profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -823,8 +823,8 @@
             "package_type": "material",
             "display_name": "Generic CFF CPE",
             "description": "The generic CFF CPE profile which other profiles can be based upon.",
-            "package_version": "1.1.0",
+            "package_version": "1.1.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -841,8 +841,8 @@
             "package_type": "material",
             "display_name": "Generic CFF PA",
             "description": "The generic CFF PA profile which other profiles can be based upon.",
-            "package_version": "1.1.0",
+            "package_version": "1.1.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -859,8 +859,8 @@
             "package_type": "material",
             "display_name": "Generic CPE",
             "description": "The generic CPE profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -877,8 +877,8 @@
             "package_type": "material",
             "display_name": "Generic CPE+",
             "description": "The generic CPE+ profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -895,8 +895,8 @@
             "package_type": "material",
             "display_name": "Generic GFF CPE",
             "description": "The generic GFF CPE profile which other profiles can be based upon.",
-            "package_version": "1.1.0",
+            "package_version": "1.1.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -913,8 +913,8 @@
             "package_type": "material",
             "display_name": "Generic GFF PA",
             "description": "The generic GFF PA profile which other profiles can be based upon.",
-            "package_version": "1.1.0",
+            "package_version": "1.1.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -931,8 +931,8 @@
             "package_type": "material",
             "display_name": "Generic HIPS",
             "description": "The generic HIPS profile which other profiles can be based upon.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -949,8 +949,8 @@
             "package_type": "material",
             "display_name": "Generic Nylon",
             "description": "The generic Nylon profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -967,8 +967,8 @@
             "package_type": "material",
             "display_name": "Generic PC",
             "description": "The generic PC profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -985,8 +985,8 @@
             "package_type": "material",
             "display_name": "Generic PETG",
             "description": "The generic PETG profile which other profiles can be based upon.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1003,8 +1003,8 @@
             "package_type": "material",
             "display_name": "Generic PLA",
             "description": "The generic PLA profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1021,8 +1021,8 @@
             "package_type": "material",
             "display_name": "Generic PP",
             "description": "The generic PP profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1039,8 +1039,8 @@
             "package_type": "material",
             "display_name": "Generic PVA",
             "description": "The generic PVA profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1057,8 +1057,8 @@
             "package_type": "material",
             "display_name": "Generic Tough PLA",
             "description": "The generic Tough PLA profile which other profiles can be based upon.",
-            "package_version": "1.0.1",
+            "package_version": "1.0.2",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1075,8 +1075,8 @@
             "package_type": "material",
             "display_name": "Generic TPU",
             "description": "The generic TPU profile which other profiles can be based upon.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1093,8 +1093,8 @@
             "package_type": "material",
             "display_name": "Dagoma Chromatik PLA",
             "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://dagoma.fr/boutique/filaments.html",
             "author": {
                 "author_id": "Dagoma",
@@ -1110,8 +1110,8 @@
             "package_type": "material",
             "display_name": "FABtotum ABS",
             "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40",
             "author": {
                 "author_id": "FABtotum",
@@ -1127,8 +1127,8 @@
             "package_type": "material",
             "display_name": "FABtotum Nylon",
             "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53",
             "author": {
                 "author_id": "FABtotum",
@@ -1144,8 +1144,8 @@
             "package_type": "material",
             "display_name": "FABtotum PLA",
             "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39",
             "author": {
                 "author_id": "FABtotum",
@@ -1161,8 +1161,8 @@
             "package_type": "material",
             "display_name": "FABtotum TPU Shore 98A",
             "description": "",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66",
             "author": {
                 "author_id": "FABtotum",
@@ -1178,8 +1178,8 @@
             "package_type": "material",
             "display_name": "Fiberlogy HD PLA",
             "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/",
             "author": {
                 "author_id": "Fiberlogy",
@@ -1195,8 +1195,8 @@
             "package_type": "material",
             "display_name": "Filo3D PLA",
             "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://dagoma.fr",
             "author": {
                 "author_id": "Dagoma",
@@ -1212,8 +1212,8 @@
             "package_type": "material",
             "display_name": "IMADE3D JellyBOX PETG",
             "description": "",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://shop.imade3d.com/filament.html",
             "author": {
                 "author_id": "IMADE3D",
@@ -1229,8 +1229,8 @@
             "package_type": "material",
             "display_name": "IMADE3D JellyBOX PLA",
             "description": "",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://shop.imade3d.com/filament.html",
             "author": {
                 "author_id": "IMADE3D",
@@ -1246,8 +1246,8 @@
             "package_type": "material",
             "display_name": "Octofiber PLA",
             "description": "PLA material from Octofiber.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://nl.octofiber.com/3d-printing-filament/pla.html",
             "author": {
                 "author_id": "Octofiber",
@@ -1263,8 +1263,8 @@
             "package_type": "material",
             "display_name": "PolyFlex™ PLA",
             "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://www.polymaker.com/shop/polyflex/",
             "author": {
                 "author_id": "Polymaker",
@@ -1280,8 +1280,8 @@
             "package_type": "material",
             "display_name": "PolyMax™ PLA",
             "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://www.polymaker.com/shop/polymax/",
             "author": {
                 "author_id": "Polymaker",
@@ -1297,8 +1297,8 @@
             "package_type": "material",
             "display_name": "PolyPlus™ PLA True Colour",
             "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://www.polymaker.com/shop/polyplus-true-colour/",
             "author": {
                 "author_id": "Polymaker",
@@ -1314,8 +1314,8 @@
             "package_type": "material",
             "display_name": "PolyWood™ PLA",
             "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "http://www.polymaker.com/shop/polywood/",
             "author": {
                 "author_id": "Polymaker",
@@ -1331,8 +1331,8 @@
             "package_type": "material",
             "display_name": "Ultimaker ABS",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1350,8 +1350,8 @@
             "package_type": "material",
             "display_name": "Ultimaker Breakaway",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/breakaway",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1369,8 +1369,8 @@
             "package_type": "material",
             "display_name": "Ultimaker CPE",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1388,8 +1388,8 @@
             "package_type": "material",
             "display_name": "Ultimaker CPE+",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/cpe",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1407,8 +1407,8 @@
             "package_type": "material",
             "display_name": "Ultimaker Nylon",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1426,8 +1426,8 @@
             "package_type": "material",
             "display_name": "Ultimaker PC",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/pc",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1445,8 +1445,8 @@
             "package_type": "material",
             "display_name": "Ultimaker PLA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1464,8 +1464,8 @@
             "package_type": "material",
             "display_name": "Ultimaker PP",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/pp",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1483,8 +1483,8 @@
             "package_type": "material",
             "display_name": "Ultimaker PVA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1502,8 +1502,8 @@
             "package_type": "material",
             "display_name": "Ultimaker TPU 95A",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.2.0",
+            "package_version": "1.2.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/tpu-95a",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1521,8 +1521,8 @@
             "package_type": "material",
             "display_name": "Ultimaker Tough PLA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
-            "package_version": "1.0.2",
+            "package_version": "1.0.3",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://ultimaker.com/products/materials/tough-pla",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1540,8 +1540,8 @@
             "package_type": "material",
             "display_name": "Vertex Delta ABS",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1557,8 +1557,8 @@
             "package_type": "material",
             "display_name": "Vertex Delta PET",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1574,8 +1574,8 @@
             "package_type": "material",
             "display_name": "Vertex Delta PLA",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1591,8 +1591,8 @@
             "package_type": "material",
             "display_name": "Vertex Delta TPU",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
-            "sdk_version": 5,
+            "sdk_version": "6.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",

resources/themes/cura-dark/theme.json

@@ -40,6 +40,8 @@
         "text_scene": [255, 255, 255, 162],
         "text_scene_hover": [255, 255, 255, 204],
 
+        "printer_type_label_background": [95, 95, 95, 255],
+
         "error": [212, 31, 53, 255],
         "disabled": [32, 32, 32, 255],
 

resources/themes/cura-light/theme.json

@@ -495,7 +495,7 @@
         "toolbox_back_button": [4.0, 2.0],
         "toolbox_installed_tile": [1.0, 8.0],
         "toolbox_property_label": [1.0, 2.0],
-        "toolbox_heading_label": [1.0, 4.0],
+        "toolbox_heading_label": [1.0, 3.8],
         "toolbox_header": [1.0, 4.0],
         "toolbox_header_highlight": [0.25, 0.25],
         "toolbox_progress_bar": [8.0, 0.5],