3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into feature_zhop_over_other_material

Browse source
This commit is contained in:
Tim Kuipers 2016-06-24 13:30:59 +02:00
commit 3e67291e41
59 changed files with 1739 additions and 1414 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,8 @@
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"platform_offset": [9, 0, 0]
"platform_offset": [9, 0, 0],
"supported_actions":["UpgradeFirmware"]
},
"overrides": {
"machine_start_gcode" : {

3
resources/definitions/ultimaker2_extended.def.json
View file

@ -10,7 +10,8 @@
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Extendedbackplate.png"
"platform_texture": "Ultimaker2Extendedbackplate.png",
"supported_actions": ["UpgradeFirmware"]
},
"overrides": {

3
resources/definitions/ultimaker2_extended_plus.def.json
View file

@ -9,7 +9,8 @@
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png"
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"supported_actions":["UpgradeFirmware"]
},
"overrides": {

3
resources/definitions/ultimaker2_go.def.json
View file

@ -11,7 +11,8 @@
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2go_platform.obj",
"platform_texture": "Ultimaker2Gobackplate.png",
"platform_offset": [0, 0, 0]
"platform_offset": [0, 0, 0],
"supported_actions":["UpgradeFirmware"]
},
"overrides": {

3
resources/definitions/ultimaker2_plus.def.json
View file

@ -16,7 +16,8 @@
"has_variants": true,
"has_materials": true,
"has_machine_materials": true,
"has_machine_quality": true
"has_machine_quality": true,
"supported_actions":["UpgradeFirmware"]
},
"overrides": {

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

@ -14,12 +14,7 @@
"has_materials": true,
"preferred_material": "*pla*",
"preferred_quality": "*normal*",
"pages": [
"SelectUpgradedParts",
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
]
"supported_actions":["UMOCheckup", "UpgradeFirmware", "BedLevel"]
},
"overrides": {

6
resources/definitions/ultimaker_original_plus.def.json
View file

@ -11,11 +11,7 @@
"icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "UltimakerPlusbackplate.png",
"pages": [
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
]
"supported_actions":["UMOCheckup", "UpgradeFirmware", "BedLevel"]
},
"overrides": {