Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Ghostkeeper 2017-05-12 16:34:19 +02:00
commit 0cc4f90920
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
9 changed files with 325 additions and 396 deletions

View file

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