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

This commit is contained in:
alekseisasin 2017-09-13 13:58:39 +02:00
commit d0997f7f7e
313 changed files with 461 additions and 363 deletions

View file

@ -104,7 +104,7 @@ class CuraApplication(QtApplication):
# 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
# changes of the settings.
SettingVersion = 2
SettingVersion = 3
class ResourceTypes:
QmlFiles = Resources.UserType + 1