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

plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py

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

resources/definitions/fdmprinter.def.json

@@ -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":
                 {
                     "label": "Support Placement",
@@ -6207,20 +6221,6 @@
             "description": "Features that haven't completely been fleshed out yet.",
             "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":
                 {
                     "label": "Tree Support Branch Angle",

resources/setting_visibility/advanced.cfg

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

resources/setting_visibility/expert.cfg

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