Merge branch 'master' into libArachne_rebased

Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.

21 files changed, 21 insertions, 21 deletions

diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json
index 55673d849a..7f9b57c6e5 100644
--- a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json
index 80a3c28628..e179fdc051 100644
--- a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json
index d64096b899..efee6fb666 100644
--- a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json
index 86b6e89793..03e19bb61e 100644
--- a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json
index edb9e0933d..f2984809ac 100644
--- a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
index cc10cd3cf2..2404b3e474 100644
--- a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json
index 991b985f76..6326ea2657 100644
--- a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json
index 4bc3309156..a25bd36f5a 100644
--- a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
index 887e6287c2..345578ff11 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json
index 8cdfecaf9b..4ac9de08c5 100644
--- a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json
index 426de00e01..1b0ee2b162 100644
--- a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json
index 9801fef742..e8b3e3c846 100644
--- a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json
index 847b1ead04..ce0a7aee60 100644
--- a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json
index 6a8db66e3f..bd6658ff3c 100644
--- a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json
index 4463274b42..a0ea2b1f1e 100644
--- a/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json b/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json
index 8d3a6db9d7..8a82a74487 100644
--- a/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json b/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json
index 16c6d15406..39947ee226 100644
--- a/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json b/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json
index e7f0fed761..5168912651 100644
--- a/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json b/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json
index 9674eb0ad2..908db388b9 100644
--- a/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.7 to Cura 4.8.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json b/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json
index 8d677f7577..19de9f1e03 100644
--- a/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.8 to Cura 4.9.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json b/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json
index 1466e62b6f..9a36c5989c 100644
--- a/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json
@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Upgrades configurations from Cura 4.9 to Cura 4.10.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }