3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 07:48:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch '4.6'

Browse source 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
This commit is contained in:
Ghostkeeper 2020-05-08 09:10:02 +02:00
commit b02354b209
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1574 changed files with 1610 additions and 1603 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -125,7 +125,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 = 13
SettingVersion = 14
Created = False