Merge remote-tracking branch 'origin/4.1'

This commit is contained in:
Lipu Fei 2019-05-09 09:40:41 +02:00
commit 153c9a5277

View file

@ -5249,7 +5249,7 @@
"type": "bool",
"enabled": "extruders_enabled_count > 1",
"default_value": false,
"resolve": "any(extruderValues('prime_tower_enable')) or (adhesion_type in ('none', 'skirt'))",
"resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable')) or (adhesion_type in ('none', 'skirt'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},