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

This commit is contained in:
Jaime van Kessel 2016-09-21 13:08:11 +02:00
commit e934b2eb74

View File

@ -2838,7 +2838,9 @@
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "10", "maximum_value_warning": "10",
"enabled": "adhesion_type == \"raft\"", "enabled": "adhesion_type == \"raft\"",
"limit_to_extruder": "adhesion_extruder_nr" "limit_to_extruder": "adhesion_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
}, },
"raft_airgap": "raft_airgap":
{ {