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

This commit is contained in:
Tim Kuipers 2016-01-07 19:08:37 +01:00
commit f3322d06b0
3 changed files with 11 additions and 18 deletions

View file

@ -605,7 +605,7 @@
},
"material_flow_temp_graph": {
"label": "Flow Temperature Graph",
"description": "Data linking material flow (in mm/s) to temperature (degrees Celsius).",
"description": "Data linking material flow (in mm³/s) to temperature (°C).",
"unit": "",
"type": "string",
"default": "[[3.5,200],[7.0,240]]",
@ -1806,7 +1806,7 @@
},
"magic_spiralize": {
"label": "Spiralize Outer Contour",
"description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid object into a single walled print with a solid bottom. This feature used to be called Joris in older versions.",
"description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid object into a single walled print with a solid bottom. This feature used to be called Joris in older versions.",
"type": "boolean",
"default": false,
"visible": false