3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '4.6'

Browse source 
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.
This commit is contained in:
Ghostkeeper 2020-05-08 09:10:02 +02:00
commit b02354b209
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1574 changed files with 1610 additions and 1603 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
View file

@ -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)