From 242caca0de668cc2ab6d2e5192cf8965a50ec769 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Fri, 17 Jul 2020 09:55:44 +0200
Subject: [PATCH 1/3] Move support structure (normal, tree) out of experimental

CURA-6711
---
 resources/definitions/fdmprinter.def.json | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 03f1d4d7b2..4ae5971dd1 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/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",

From 59df16cbad42901fff20cb8004965a5470c707b5 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Fri, 17 Jul 2020 09:56:20 +0200
Subject: [PATCH 2/3] Add support structure to advanced and expert visibility
 presets

CURA-6711
---
 resources/setting_visibility/advanced.cfg | 1 +
 resources/setting_visibility/expert.cfg   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg
index f26a67b3c1..d3ed1094a6 100644
--- a/resources/setting_visibility/advanced.cfg
+++ b/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
diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg
index 895137eacd..df35abaa55 100644
--- a/resources/setting_visibility/expert.cfg
+++ b/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

From 94d1e1d77b41fccc9b7e376fc5b706565f5ff736 Mon Sep 17 00:00:00 2001
From: Kostas Karmas <konskarm@gmail.com>
Date: Mon, 20 Jul 2020 12:23:52 +0200
Subject: [PATCH 3/3] Fix preferences.cfg not being updated in project files

Since the metadata/setting_version field was not written in project files from the 3MF writer,
the preferences were never really updated, because their preferences version was marked as 6000000
(basically omitting the setting_version). Now, if any project file is found without a metadata
setting_version tag, it will default to preference version 6000000 and thus it will start calling
the updatedPreferences() functions starting from VersionUpgrade34to35, properly updating the
preferences and adding the metadata/setting_version field in the preferences.cfg of the project
file.

CURA-6711
---
 plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
index 332bc827b9..ab55fa2577 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
+++ b/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),