Browse Source

Change the setting version to 19

Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
Konstantinos Karmas 3 years ago
parent
commit
3e143a012a

+ 1 - 1
cura/CuraApplication.py

@@ -129,7 +129,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
     # changes of the settings.
-    SettingVersion = 18
+    SettingVersion = 19
 
 
     Created = False
     Created = False
 
 

+ 3 - 3
plugins/VersionUpgrade/VersionUpgrade411to412/VersionUpgrade411to412.py

@@ -36,7 +36,7 @@ class VersionUpgrade411to412(VersionUpgrade):
         parser.read_string(serialized)
         parser.read_string(serialized)
 
 
         # Update version number.
         # Update version number.
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
 
         result = io.StringIO()
         result = io.StringIO()
         parser.write(result)
         parser.write(result)
@@ -57,7 +57,7 @@ class VersionUpgrade411to412(VersionUpgrade):
         # Update setting version number.
         # Update setting version number.
         if "metadata" not in parser:
         if "metadata" not in parser:
             parser["metadata"] = {}
             parser["metadata"] = {}
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
 
         result = io.StringIO()
         result = io.StringIO()
         parser.write(result)
         parser.write(result)
@@ -78,7 +78,7 @@ class VersionUpgrade411to412(VersionUpgrade):
         # Update setting version number.
         # Update setting version number.
         if "metadata" not in parser:
         if "metadata" not in parser:
             parser["metadata"] = {}
             parser["metadata"] = {}
-        parser["metadata"]["setting_version"] = "18"
+        parser["metadata"]["setting_version"] = "19"
 
 
         # Change renamed profiles.
         # Change renamed profiles.
         if "containers" in parser:
         if "containers" in parser:

+ 7 - 7
plugins/VersionUpgrade/VersionUpgrade411to412/__init__.py

@@ -15,13 +15,13 @@ def getMetaData() -> Dict[str, Any]:
     return {
     return {
         "version_upgrade": {
         "version_upgrade": {
             # From                            To                                Upgrade function
             # From                            To                                Upgrade function
-            ("machine_stack",      5000017):  ("machine_stack",      5000018,   upgrade.upgradeStack),
-            ("extruder_train",     5000017):  ("extruder_train",     5000018,   upgrade.upgradeStack),
-            ("definition_changes", 4000017):  ("definition_changes", 4000018,   upgrade.upgradeInstanceContainer),
-            ("quality_changes",    4000017):  ("quality_changes",    4000018,   upgrade.upgradeInstanceContainer),
-            ("quality",            4000017):  ("quality",            4000018,   upgrade.upgradeInstanceContainer),
-            ("user",               4000017):  ("user",               4000018,   upgrade.upgradeInstanceContainer),
-            ("preferences",        7000017):  ("preferences",        7000018,   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),
+            ("preferences",        7000017):  ("preferences",        7000019,   upgrade.upgradePreferences),
         },
         },
         "sources": {
         "sources": {
             "machine_stack": {
             "machine_stack": {

+ 1 - 1
resources/definitions/fdmextruder.def.json

@@ -6,7 +6,7 @@
         "type": "extruder",
         "type": "extruder",
         "author": "Ultimaker",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
         "manufacturer": "Unknown",
-        "setting_version": 18,
+        "setting_version": 19,
         "visible": false,
         "visible": false,
         "position": "0"
         "position": "0"
     },
     },

+ 1 - 1
resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "type": "machine",
         "author": "Ultimaker",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
         "manufacturer": "Unknown",
-        "setting_version": 18,
+        "setting_version": 19,
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "visible": false,
         "has_materials": true,
         "has_materials": true,

+ 1 - 1
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = deltacomb_base
 definition = deltacomb_base
 
 
 [metadata]
 [metadata]
-setting_version = 18
+setting_version = 19
 type = intent
 type = intent
 quality_type = D010
 quality_type = D010
 intent_category = engineering
 intent_category = engineering

+ 1 - 1
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = deltacomb_base
 definition = deltacomb_base
 
 
 [metadata]
 [metadata]
-setting_version = 18
+setting_version = 19
 type = intent
 type = intent
 quality_type = D015
 quality_type = D015
 intent_category = engineering
 intent_category = engineering

+ 1 - 1
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = deltacomb_base
 definition = deltacomb_base
 
 
 [metadata]
 [metadata]
-setting_version = 18
+setting_version = 19
 type = intent
 type = intent
 quality_type = D020
 quality_type = D020
 intent_category = engineering
 intent_category = engineering

+ 1 - 1
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = deltacomb_base
 definition = deltacomb_base
 
 
 [metadata]
 [metadata]
-setting_version = 18
+setting_version = 19
 type = intent
 type = intent
 quality_type = D020
 quality_type = D020
 intent_category = quick
 intent_category = quick

+ 1 - 1
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = deltacomb_base
 definition = deltacomb_base
 
 
 [metadata]
 [metadata]
-setting_version = 18
+setting_version = 19
 type = intent
 type = intent
 quality_type = D030
 quality_type = D030
 intent_category = quick
 intent_category = quick

Some files were not shown because too many files changed in this diff