GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 07:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ghostkeeper 2020-07-20 13:27:41 +02:00
commit e6c305de40
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
View File

@ -14,6 +14,7 @@ def getMetaData() -> Dict[str, Any]:
return { return {
"version_upgrade": { "version_upgrade": {
# From To Upgrade function # From To Upgrade function
("preferences", 6000000): ("preferences", 6000005, upgrade.upgradePreferences),
("preferences", 6000004): ("preferences", 6000005, upgrade.upgradePreferences), ("preferences", 6000004): ("preferences", 6000005, upgrade.upgradePreferences),
("definition_changes", 4000004): ("definition_changes", 4000005, upgrade.upgradeInstanceContainer), ("definition_changes", 4000004): ("definition_changes", 4000005, upgrade.upgradeInstanceContainer),

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

@ -4172,6 +4172,20 @@
} }
} }
}, },
"support_structure":
{
"label": "Support Structure",
"description": "Generate a tree-like support ",
"type": "enum",
"options":
{
"normal": "Normal",
"tree": "Tree"
},
"default_value": "normal",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"support_type": "support_type":
{ {
"label": "Support Placement", "label": "Support Placement",
@ -6207,20 +6221,6 @@
"description": "Features that haven't completely been fleshed out yet.", "description": "Features that haven't completely been fleshed out yet.",
"children": "children":
{ {
"support_structure":
{
"label": "Support Structure",
"description": "Generate a tree-like support ",
"type": "enum",
"options":
{
"normal": "Normal",
"tree": "Tree"
},
"default_value": "normal",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"support_tree_angle": "support_tree_angle":
{ {
"label": "Tree Support Branch Angle", "label": "Tree Support Branch Angle",

1
resources/setting_visibility/advanced.cfg
View File

@ -99,6 +99,7 @@ support_extruder_nr
support_infill_extruder_nr support_infill_extruder_nr
support_extruder_nr_layer_0 support_extruder_nr_layer_0
support_interface_extruder_nr support_interface_extruder_nr
support_structure
support_type support_type
support_angle support_angle
support_pattern support_pattern

1
resources/setting_visibility/expert.cfg
View File

@ -237,6 +237,7 @@ support_extruder_nr_layer_0
support_interface_extruder_nr support_interface_extruder_nr
support_roof_extruder_nr support_roof_extruder_nr
support_bottom_extruder_nr support_bottom_extruder_nr
support_structure
support_type support_type
support_angle support_angle
support_pattern support_pattern