Ghostkeeper fdfdb2e428 Remove Cura 4 settings ... These settings have been removed and should no longer be in the profiles. They were added during a merge, since they were updated recently for Cura 4.13. The merge 'resolved' the conflict automatically without informing me. And resolved it wrongly.		2021-12-15 10:09:42 +01:00
..
bundled_packages	Merge branch 'master' into CURA-8510_version_upgrade	2021-09-23 17:01:00 +02:00
definitions	Remove Cura 4 settings	2021-12-15 10:09:42 +01:00
extruders	Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master	2021-12-14 18:46:22 +01:00
i18n	Update version number in header files	2021-12-10 16:15:34 +01:00
images	Update image	2021-11-26 10:37:19 +01:00
intent	Remove Cura 4 settings	2021-12-15 10:09:42 +01:00
meshes	Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master	2021-12-14 18:46:22 +01:00
qml	Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c	2021-12-06 09:48:18 +01:00
quality	Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master	2021-12-14 18:46:22 +01:00
setting_visibility	Merge branch 'master' into merge_main_20211019	2021-10-20 08:38:01 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
themes	Use badge icons	2021-11-18 10:53:35 +01:00
variants	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00
README_resources.txt	Fix various typos	2021-09-07 11:33:54 -04:00