Merge branch 'master' into qt6_beyond_the_splash

# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
This commit is contained in:
j.delarago 2022-04-06 15:24:30 +02:00
commit b2b1961b57
4332 changed files with 4436 additions and 4446 deletions

View file

@ -127,7 +127,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 = 19
SettingVersion = 20
Created = False