Upgrade correct setting_versions

Also removed this mistake from Arachne Beta 1. Cura 4.13 already had stack version 5, so it's no longer necessary to have both.

Contributes to issue CURA-8466.

2 files changed, 11 insertions, 13 deletions

diff --git a/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py b/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py
index 3278f6813f..02e1162898 100644
--- a/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py
+++ b/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py
@@ -34,7 +34,7 @@ class VersionUpgrade413to50(VersionUpgrade):
         parser.read_string(serialized)
 
         # Update version number.
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
         # Remove deleted settings from the visible settings list.
         if "general" in parser and "visible_settings" in parser["general"]:
@@ -71,7 +71,7 @@ class VersionUpgrade413to50(VersionUpgrade):
         parser.read_string(serialized)
 
         # Update version number.
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
         if "values" in parser:
             # Remove deleted settings from the instance containers.
@@ -111,7 +111,7 @@ class VersionUpgrade413to50(VersionUpgrade):
             parser["metadata"] = {}
 
         parser["general"]["version"] = "5"
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
         result = io.StringIO()
         parser.write(result)
diff --git a/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py b/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py
index cf58afd26a..bbe4133540 100644
--- a/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py
@@ -11,18 +11,16 @@ if TYPE_CHECKING:
 upgrade = VersionUpgrade413to50.VersionUpgrade413to50()
 
 def getMetaData() -> Dict[str, Any]:
-    return {  # Since there is no VersionUpgrade from 48 to 49 yet, upgrade the 48 profiles to 50.
+    return {
         "version_upgrade": {
             # From                           To                              Upgrade function
-            ("preferences", 6000016):        ("preferences", 6000018,        upgrade.upgradePreferences),
-            ("machine_stack", 5000016):      ("machine_stack", 5000018,      upgrade.upgradeStack),
-            ("extruder_train", 5000016):     ("extruder_train", 5000018,     upgrade.upgradeStack),
-            ("machine_stack", 4000018):      ("machine_stack", 5000018,      upgrade.upgradeStack),  # We made a mistake in the arachne beta 1
-            ("extruder_train", 4000018):     ("extruder_train", 5000018,     upgrade.upgradeStack),  # We made a mistake in the arachne beta 1
-            ("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer),
-            ("quality_changes", 4000016):    ("quality_changes", 4000018,    upgrade.upgradeInstanceContainer),
-            ("quality", 4000016):            ("quality", 4000018,            upgrade.upgradeInstanceContainer),
-            ("user", 4000016):               ("user", 4000018,               upgrade.upgradeInstanceContainer),
+            ("preferences", 6000017):        ("preferences", 6000019,        upgrade.upgradePreferences),
+            ("machine_stack", 5000017):      ("machine_stack", 5000019,      upgrade.upgradeStack),
+            ("extruder_train", 5000017):     ("extruder_train", 5000019,     upgrade.upgradeStack),
+            ("definition_changes", 4000017): ("definition_changes", 4000019, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000017):    ("quality_changes", 4000019,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000017):            ("quality", 4000019,            upgrade.upgradeInstanceContainer),
+            ("user", 4000017):               ("user", 4000019,               upgrade.upgradeInstanceContainer),
         },
         "sources": {
             "preferences": {