Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master

This commit is contained in:
Ghostkeeper 2016-11-30 11:09:56 +01:00
commit db2ee920ce
4 changed files with 13724 additions and 26324 deletions

View File

@ -5,10 +5,10 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Samsector", "author": "samsector",
"manufacturer": "PrintrBot", "manufacturer": "PrintrBot",
"category": "Other", "category": "Other",
"platform": "printrbot_simple_metal_platform_extend.stl", "platform": "printrbot_simple_metal_upgrade.stl",
"file_formats": "text/x-gcode" "file_formats": "text/x-gcode"
}, },

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff