Merge branch 'master' into mypy_fixes

This commit is contained in:
Lipu Fei 2018-06-29 13:45:55 +02:00 committed by GitHub
commit dc8d9e0f96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
647 changed files with 271695 additions and 116029 deletions

View file

@ -123,7 +123,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 = 4
SettingVersion = 5
Created = False
@ -669,6 +669,7 @@ class CuraApplication(QtApplication):
self._plugins_loaded = True
def run(self):
super().run()
container_registry = self._container_registry
Logger.log("i", "Initializing variant manager")