Cura/resources
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
..
bundled_packages Update sdk version to 7.2.0 2020-04-21 11:00:06 +02:00
definitions Merge branch '4.6' 2020-05-08 09:10:02 +02:00
extruders Merge branch 'anycubic_mega_zero' of https://github.com/kad/Cura into kad-anycubic_mega_zero 2020-05-07 13:55:43 +02:00
i18n Improve translation of 'tree support' in German 2020-04-29 02:08:09 +02:00
images Merge pull request #7418 from Evg33/UNI_3D_profiles 2020-04-29 17:24:24 +02:00
intent Merge branch '4.6' 2020-05-08 09:10:02 +02:00
meshes Adding profile for Anycubic Mega Zero 2020-05-02 21:49:48 +03:00
qml Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-05-06 11:13:27 +02:00
quality Merge branch '4.6' 2020-05-08 09:10:02 +02:00
setting_visibility Merge pull request #7010 from smartavionics/mb-hole-offset 2020-02-13 09:05:18 +01:00
shaders Fix x-ray error color. 2020-04-29 12:06:20 +02:00
texts Updated change log for 4.6.1 2020-04-29 10:58:11 +02:00
themes Size the Welcome Wizard using the theme 2020-04-28 17:44:35 +02:00
variants Merge branch '4.6' 2020-05-08 09:10:02 +02:00
public_key.pem Move the package signature pem file to the Resources folder 2020-03-19 15:14:21 +01:00