3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Tim Kuipers 2016-03-03 17:11:12 +01:00
commit b0befb6309
15 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
resources/images/Ultimaker2Extendedbackplate.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
resources/images/Ultimaker2Plusbackplate.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
resources/images/ultimaker2plus_backplate.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

2
resources/machines/ultimaker2_extended_plus.json
View file

@ -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",

2
resources/machines/ultimaker2_extended_plus_025.json
View file

@ -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",

2
resources/machines/ultimaker2_extended_plus_040.json
View file

@ -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",

2
resources/machines/ultimaker2_extended_plus_060.json
View file

@ -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",

2
resources/machines/ultimaker2_extended_plus_080.json
View file

@ -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",

2
resources/machines/ultimaker2plus.json
View file

@ -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",

2
resources/machines/ultimaker2plus_025.json
View file

@ -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",

2
resources/machines/ultimaker2plus_040.json
View file

@ -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",

2
resources/machines/ultimaker2plus_060.json
View file

@ -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",

2
resources/machines/ultimaker2plus_080.json
View file

@ -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",

1
resources/qml/SaveButton.qml
View file

@ -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: