Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Tim Kuipers 2016-02-23 15:20:48 +01:00
commit 88ddf714c4
29 changed files with 493 additions and 494 deletions

View file

@ -1221,7 +1221,7 @@
"buildplate": "Touching Buildplate",
"everywhere": "Everywhere"
},
"default": "everywhere",
"default": "buildplate",
"enabled": "support_enable"
},
"support_angle": {
@ -1231,7 +1231,7 @@
"type": "float",
"min_value": "0",
"max_value": "90",
"default": 60,
"default": 50,
"visible": false,
"enabled": "support_enable"
},