GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 13:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diego Prado Gesto 2019-05-16 12:04:50 +02:00
commit cdcb1c15f6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/definitions/fdmprinter.def.json
View File

@ -5249,7 +5249,7 @@
"type": "bool", "type": "bool",
"enabled": "extruders_enabled_count > 1", "enabled": "extruders_enabled_count > 1",
"default_value": false, "default_value": false,
"resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable')) or (adhesion_type in ('none', 'skirt'))", "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },
@ -5352,6 +5352,7 @@
"description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.", "description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.",
"type": "bool", "type": "bool",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')",
"resolve": "resolveOrValue('prime_tower_enable') and (adhesion_type in ('none', 'skirt'))",
"default_value": false, "default_value": false,
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false