Merge branch '4.6'

Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.

2 files changed, 17 insertions, 10 deletions

diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py b/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
index a399c79535..a74c15c552 100644
--- a/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
+++ b/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
@@ -26,7 +26,7 @@ class VersionUpgrade45to46(VersionUpgrade):
         parser.read_string(serialized)
 
         # Update version number.
-        parser["metadata"]["setting_version"] = "12"
+        parser["metadata"]["setting_version"] = "13"
 
         # Remove deleted settings from the visible settings list.
         if "general" in parser and "visible_settings" in parser["general"]:
@@ -54,13 +54,20 @@ class VersionUpgrade45to46(VersionUpgrade):
         parser.read_string(serialized)
 
         # Update version number.
-        parser["metadata"]["setting_version"] = "12"
+        parser["metadata"]["setting_version"] = "13"
 
         if "values" in parser:
             for removed in _removed_settings:
                 if removed in parser["values"]:
                     del parser["values"][removed]
 
+            if "meshfix_maximum_deviation" in parser["values"]:
+                maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
+                if maximum_deviation.startswith("="):
+                    maximum_deviation = maximum_deviation[1:]
+                maximum_deviation = "=(" + maximum_deviation + ") / 2"
+                parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
+
         result = io.StringIO()
         parser.write(result)
         return [filename], [result.getvalue()]
@@ -79,7 +86,7 @@ class VersionUpgrade45to46(VersionUpgrade):
         # Update version number.
         if "metadata" not in parser:
             parser["metadata"] = {}
-        parser["metadata"]["setting_version"] = "12"
+        parser["metadata"]["setting_version"] = "13"
 
         result = io.StringIO()
         parser.write(result)
diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py b/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py
index e44a02f704..090f8a109c 100644
--- a/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py
@@ -14,13 +14,13 @@ def getMetaData() -> Dict[str, Any]:
     return {
         "version_upgrade": {
             # From                           To                              Upgrade function
-            ("preferences", 6000011):        ("preferences", 6000012,        upgrade.upgradePreferences),
-            ("machine_stack", 4000011):      ("machine_stack", 4000012,      upgrade.upgradeStack),
-            ("extruder_train", 4000011):     ("extruder_train", 4000012,     upgrade.upgradeStack),
-            ("definition_changes", 4000011): ("definition_changes", 4000012, upgrade.upgradeInstanceContainer),
-            ("quality_changes", 4000011):    ("quality_changes", 4000012,    upgrade.upgradeInstanceContainer),
-            ("quality", 4000011):            ("quality", 4000012,            upgrade.upgradeInstanceContainer),
-            ("user", 4000011):               ("user", 4000012,               upgrade.upgradeInstanceContainer),
+            ("preferences", 6000011):        ("preferences", 6000013,        upgrade.upgradePreferences),
+            ("machine_stack", 4000011):      ("machine_stack", 4000013,      upgrade.upgradeStack),
+            ("extruder_train", 4000011):     ("extruder_train", 4000013,     upgrade.upgradeStack),
+            ("definition_changes", 4000011): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000011):    ("quality_changes", 4000013,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000011):            ("quality", 4000013,            upgrade.upgradeInstanceContainer),
+            ("user", 4000011):               ("user", 4000013,               upgrade.upgradeInstanceContainer),
         },
         "sources": {
             "preferences": {