diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 5a6e13d27e..0fab42cab0 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/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", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 213e214854..4feee241ce 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/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", diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 2d54555c15..b4f91d68d1 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/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", diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index cb0bad67ea..3dd9e86ee9 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/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 { diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 6d8f75c3f5..95eff0465a 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/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: {