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

This commit is contained in:
fieldOfView 2016-03-01 17:24:06 +01:00
commit bec897843d
3 changed files with 33 additions and 3 deletions

View file

@ -1305,7 +1305,7 @@
"description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.",
"type": "boolean",
"default": false,
"visible": false,
"visible": true,
"enabled": "support_enable"
},
"support_conical_angle": {

View file

@ -15,6 +15,27 @@
"machine_depth": { "default": 225 },
"machine_height": { "default": 200 },
"machine_show_variants": { "default": true },
"gantry_height": { "default": 50 }
"gantry_height": { "default": 50 },
"machine_head_with_fans_polygon":
{
"default": [
[
-44,
14
],
[
-44,
-34
],
[
64,
14
],
[
64,
-34
]
]
}
}
}