Merge branch '4.1'

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -13,7 +13,6 @@
         "has_machine_materials": false,
         "has_machine_quality": false,
         "has_variant_materials": false,
-        "weight": 2,
         "file_formats": "text/x-gcode",
         "icon": "icon_ultimaker.png",
         "platform": "ultimaker2_platform.obj",

resources/definitions/fdmprinter.def.json

@@ -2064,7 +2064,7 @@
                     "unit": "°C",
                     "type": "float",
                     "default_value": 35,
-                    "resolve": "max(extruderValues('build_volume_temperature'))",
+                    "resolve": "min(extruderValues('build_volume_temperature'))",
                     "minimum_value": "-273.15",
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "285",

resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json

@@ -6,7 +6,6 @@
         "author": "Andrew Finkle, CTO",
         "manufacturer": "Structur3d.io",
         "visible": true,
-        "weight": 1,
         "file_formats": "text/x-gcode",
         "platform": "ultimaker2_platform.obj",
         "platform_texture": "Ultimaker2Plusbackplate.png",

resources/qml/WelcomePages/AddLocalPrinterScrollView.qml

@@ -14,8 +14,6 @@ import Cura 1.0 as Cura
 //
 Item
 {
-    UM.I18nCatalog { id: catalog; name: "cura" }
-
     id: base
     height: childrenRect.height
 
@@ -85,7 +83,7 @@ Item
             {
                 id: machineList
 
-                cacheBuffer: 0  // Workaround for https://bugreports.qt.io/browse/QTBUG-49224
+                cacheBuffer: 1000000   // Set a large cache to effectively just cache every list item.
 
                 model: UM.DefinitionContainersModel
                 {

resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml

@@ -72,7 +72,7 @@ Item
                 section.criteria: ViewSection.FullString
                 section.delegate: sectionHeading
 
-                cacheBuffer: 0  // Workaround for https://bugreports.qt.io/browse/QTBUG-49224
+                cacheBuffer: 1000000   // Set a large cache to effectively just cache every list item.
 
                 Component.onCompleted:
                 {