Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-10-04 14:08:10 +02:00
commit e4c6b58611
2 changed files with 6 additions and 5 deletions

View file

@ -177,7 +177,8 @@
"minimum_value_warning": "machine_nozzle_offset_x",
"maximum_value": "machine_width",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
},
"extruder_prime_pos_y":
{
@ -189,7 +190,8 @@
"minimum_value_warning": "machine_nozzle_offset_y",
"maximum_value_warning": "machine_depth",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
}
}
}