mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-07-11 03:21:59 +08:00
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
This commit is contained in:
commit
b0befb6309
BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png
Normal file
BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 15 KiB |
BIN
resources/images/Ultimaker2Plusbackplate.png
Normal file
BIN
resources/images/Ultimaker2Plusbackplate.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB |
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
"visible": false,
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2plus.json",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2_extended_plus.json",
|
||||
"variant": "0.25 mm",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2_extended_plus.json",
|
||||
"variant": "0.4 mm",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2_extended_plus.json",
|
||||
"variant": "0.6 mm",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2_extended_plus.json",
|
||||
"variant": "0.8 mm",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"visible": false,
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2.json",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2plus.json",
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2plus.json",
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2plus.json",
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
"manufacturer": "Ultimaker",
|
||||
"author": "Ultimaker",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "ultimaker2plus_backplate.png",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"file_formats": "text/x-gcode",
|
||||
"inherits": "ultimaker2plus.json",
|
||||
|
||||
|
@ -81,6 +81,7 @@ Rectangle {
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.right: deviceSelectionMenu.left;
|
||||
anchors.rightMargin: -3 * UM.Theme.getSize("default_lining").width;
|
||||
|
||||
text: UM.OutputDeviceManager.activeDeviceShortDescription
|
||||
onClicked:
|
||||
|
Loading…
x
Reference in New Issue
Block a user