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

This commit is contained in:
Jaime van Kessel 2016-03-31 13:51:19 +02:00
commit f3d600b72e

View File

@ -1206,7 +1206,7 @@
"unit": "mm",
"type": "float",
"min_value": "0",
"max_value_warning": "30",
"max_value_warning": "9999",
"default": 0,
"inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0",
"visible": false,