GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 16:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1'

Browse Source
This commit is contained in:
Ghostkeeper 2019-05-13 17:11:39 +02:00
commit 03d96f3fb5
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/definitions/Mark2_for_Ultimaker2.def.json
View File

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

2
resources/definitions/fdmprinter.def.json
View File

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

1
resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
View File

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

4
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View File

@ -14,8 +14,6 @@ import Cura 1.0 as Cura
// //
Item Item
{ {
UM.I18nCatalog { id: catalog; name: "cura" }
id: base id: base
height: childrenRect.height height: childrenRect.height
@ -85,7 +83,7 @@ Item
{ {
id: machineList 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 model: UM.DefinitionContainersModel
{ {

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View File

@ -72,7 +72,7 @@ Item
section.criteria: ViewSection.FullString section.criteria: ViewSection.FullString
section.delegate: sectionHeading 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: Component.onCompleted:
{ {