Merge remote-tracking branch 'refs/remotes/Ultimaker/master' into master-using-platform

This commit is contained in:
Thomas Karl Pietrowski 2016-06-12 10:53:36 +02:00
commit c1cf78f662
10 changed files with 730 additions and 171 deletions

View file

@ -196,6 +196,10 @@ class CuraApplication(QtApplication):
speed
speed_print
speed_travel
acceleration_print
acceleration_travel
jerk_print
jerk_travel
travel
cooling
cool_fan_enabled
@ -280,7 +284,7 @@ class CuraApplication(QtApplication):
path = None
if not stack_type or stack_type == "machine":
path = Resources.getStoragePath(self.ResourceTypes.MachineStack, file_name)
elif stack_type == "extruder":
elif stack_type == "extruder_train":
path = Resources.getStoragePath(self.ResourceTypes.ExtruderStack, file_name)
if path:
with SaveFile(path, "wt", -1, "utf-8") as f: