Merge branch '2.1'

This commit is contained in:
Tim Kuipers 2016-01-28 15:25:18 +01:00
commit 8a48791a0b
83 changed files with 14784 additions and 9510 deletions

View file

@ -33,7 +33,7 @@
"default": "RepRap"
},
"machine_platform_offset": {
"default": [-6, 1320, 0]
"default": [6, 1320, 0]
}
"material_print_temperature": { "default": 210.0, "visible": true },
"material_bed_temperature": { "default": 0 },