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

This commit is contained in:
Jaime van Kessel 2016-03-23 12:04:19 +01:00
commit 5b04787106
13 changed files with 237 additions and 998 deletions

View file

@ -260,7 +260,7 @@
"visible": false
},
"wall_line_width_x": {
"label": "Other Walls Line Width",
"label": "Inner Wall(s) Line Width",
"description": "Width of a single shell line for all shell lines except the outermost one.",
"unit": "mm",
"min_value": "0.0001",
@ -458,7 +458,7 @@
"enabled": "False"
},
"remove_overlapping_walls_x_enabled": {
"label": "Remove Overlapping Other Wall Parts",
"label": "Remove Overlapping Inner Wall Parts",
"description": "Remove parts of an inner wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.",
"type": "boolean",
"default": true,