Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI.

Cherry pick from master.
Conflicts:
	resources/machines/ultimaker2.json
	resources/machines/ultimaker_original.json

Contributes to issue CURA-276.
This commit is contained in:
Kurt Loeffler 2015-12-14 11:14:55 -08:00 committed by Ghostkeeper
parent 345775fc2a
commit 050bc91912
3 changed files with 10 additions and 10 deletions

View file

@ -13,9 +13,6 @@
"machine_extruder_trains": [
{
"machine_nozzle_size": {
"default": 0.4
},
"machine_nozzle_heat_up_speed": {
"default": 2.0
},
@ -66,7 +63,7 @@
]
},
"machine_center_is_zero": { "default": false },
"machine_nozzle_size": { "default": 0.4 },
"machine_nozzle_size": { "default": 0.4, "description": "The inner diameter of the hole in the nozzle. If you are using an Olsson Block with a non-standard nozzle then set this field to the nozzle size you are using." },
"machine_nozzle_heat_up_speed": { "default": 2.0 },
"machine_nozzle_cool_down_speed": { "default": 2.0 },
"gantry_height": { "default": 55 },