Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-07-24 17:18:56 +02:00
commit 24f89e3714
2 changed files with 6 additions and 0 deletions

View file

@ -104,6 +104,11 @@ class VersionUpgrade26to27(VersionUpgrade):
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "2"
#Renamed setting value for g-code flavour.
if "values" in parser and "machine_gcode_flavor" in parser["values"]:
if parser["values"]["machine_gcode_flavor"] == "RepRap (Volumatric)":
parser["values"]["machine_gcode_flavor"] = "RepRap (Volumetric)"
# Re-serialise the file.
output = io.StringIO()
parser.write(output)

View file

@ -833,6 +833,7 @@
"unit": "%",
"default_value": 100.0,
"minimum_value": "0.001",
"maximum_value_warning": "150",
"settable_per_mesh": false,
"settable_per_extruder": true
}