Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura

This commit is contained in:
Jaime van Kessel 2017-05-08 14:35:37 +02:00
commit 293f1ac029
9 changed files with 175 additions and 2 deletions

View file

@ -15,7 +15,8 @@
"platform_texture": "Ultimaker2backplate.png",
"platform_offset": [9, 0, 0],
"has_materials": false,
"supported_actions":["UpgradeFirmware"]
"first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"]
},
"overrides": {
"machine_name": { "default_value": "Ultimaker 2" },

View file

@ -16,6 +16,7 @@
"has_materials": true,
"has_machine_materials": true,
"has_machine_quality": true,
"first_start_actions": [],
"supported_actions":["UpgradeFirmware"]
},