Merge branch 'mb-enable-gyroid-support' of https://github.com/smartavionics/Cura into smartavionics-mb-enable-gyroid-support

This commit is contained in:
Ghostkeeper 2019-02-18 11:30:49 +01:00
commit 8d263e11b1
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276

View file

@ -3811,7 +3811,8 @@
"triangles": "Triangles", "triangles": "Triangles",
"concentric": "Concentric", "concentric": "Concentric",
"zigzag": "Zig Zag", "zigzag": "Zig Zag",
"cross": "Cross" "cross": "Cross",
"gyroid": "Gyroid"
}, },
"default_value": "zigzag", "default_value": "zigzag",
"enabled": "support_enable or support_tree_enable", "enabled": "support_enable or support_tree_enable",
@ -3840,8 +3841,8 @@
"description": "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material.", "description": "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"value": "support_pattern == 'cross'", "value": "support_pattern == 'cross' or support_pattern == 'gyroid'",
"enabled": "support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross'", "enabled": "support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid'",
"limit_to_extruder": "support_infill_extruder_nr", "limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true