Cura/resources/intent
Ghostkeeper b02354b209
Merge branch '4.6'
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.
2020-05-08 09:10:02 +02:00
..
ultimaker_s3 Up the setting version to 14 in all the resourses 2020-05-04 13:13:07 +02:00
ultimaker_s5 Up the setting version to 14 in all the resourses 2020-05-04 13:13:07 +02:00
uni_base UNI3D setting_version 13 2020-04-28 16:26:25 +03:00