Merge 3.2 into master

This commit is contained in:
Lipu Fei 2018-02-07 13:20:24 +01:00
commit ffa4df6a06
12 changed files with 277 additions and 55 deletions

View file

@ -51,7 +51,7 @@
"machine_height": { "default_value": 120 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"material_diameter": { "value": 1.75 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_size": {
"default_value": 0.4,
"minimum_value": 0.15