Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework

This commit is contained in:
Tim Kuipers 2016-06-10 12:29:06 +02:00
commit 149af8af28
119 changed files with 3484 additions and 1784 deletions

View file

@ -5,10 +5,7 @@
"inherits": "fdmprinter",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"manufacturer": "Ultimaker"
"visible": false,
"preferred_profile": "Normal Quality",
"preferred_nozzle": "0.4 mm",
"preferred_material": "PLA"
}
}