Merge branch 'master' into feature_firmware_updater

This commit is contained in:
fieldOfView 2018-10-03 14:02:24 +02:00
commit c4919d65f4
85 changed files with 2978 additions and 1878 deletions

View file

@ -14,6 +14,7 @@
"platform_offset": [9, 0, 0],
"has_materials": false,
"has_machine_quality": true,
"preferred_variant_name": "0.4 mm",
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
"first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"],