3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

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

4
resources/machines/ultimaker2_extended_plus_025.json
View file

@ -1,11 +1,11 @@
{
"id": "ultimaker2_extended_plus",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended+",
"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",

4
resources/machines/ultimaker2_extended_plus_040.json
View file

@ -1,11 +1,11 @@
{
"id": "ultimaker2_extended_plus",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended+",
"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",

4
resources/machines/ultimaker2_extended_plus_060.json
View file

@ -1,11 +1,11 @@
{
"id": "ultimaker2_extended_plus",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended+",
"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",

4
resources/machines/ultimaker2_extended_plus_080.json
View file

@ -1,11 +1,11 @@
{
"id": "ultimaker2_extended_plus",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended+",
"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",