3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.3'

Browse source
This commit is contained in:
Ghostkeeper 2018-04-23 14:15:38 +02:00
commit acd38b365a
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
9 changed files with 136 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/ultimaker2.def.json
View file

@ -14,6 +14,7 @@
"platform_offset": [9, 0, 0],
"has_materials": false,
"has_machine_quality": true,
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
"first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"]
},

2
resources/definitions/ultimaker3.def.json
View file

@ -6,7 +6,7 @@
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"visible": true,
"file_formats": "application/gzip;text/x-gcode",
"file_formats": "text/x-gcode;application/gzip",
"platform": "ultimaker3_platform.obj",
"platform_texture": "Ultimaker3backplate.png",
"platform_offset": [0, 0, 0],

1
resources/definitions/ultimaker_original.def.json
View file

@ -11,6 +11,7 @@
"icon": "icon_ultimaker.png",
"platform": "ultimaker_platform.stl",
"has_materials": true,
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
"first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
"supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
},

1
resources/definitions/ultimaker_original_dual.def.json
View file

@ -11,6 +11,7 @@
"icon": "icon_ultimaker.png",
"platform": "ultimaker_platform.stl",
"has_materials": true,
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
"machine_extruder_trains":
{
"0": "ultimaker_original_dual_1st",