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

This commit is contained in:
Jaime van Kessel 2016-03-31 17:37:02 +02:00
commit f1a5de50e8

View file

@ -67,7 +67,7 @@
]
},
"machine_center_is_zero": { "default": false },
"machine_nozzle_size": { "default": 0.4, "min_value": "0.001", "description": "The inner diameter of the nozzle. If you are using an Olsson Block with a non-standard nozzle diameter, set this field to the diameter you are using." },
"machine_nozzle_size": { "default": 0.4, "min_value": "0.001"},
"machine_nozzle_heat_up_speed": { "default": 2.0 },
"machine_nozzle_cool_down_speed": { "default": 2.0 },
"gantry_height": { "default": 55 },