Ghostkeeper bb20e3307f Revert "Fix merge conflict" ... This reverts commit 7f1e61b7b8. These icons were renamed, but the original icons are now restored so those changes need to be reverted. Contributes to issue CURA-8267.		2021-06-03 17:27:35 +02:00
..
bundled_packages	Initial commit for the DL	2021-04-20 11:30:49 +02:00
definitions	Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master	2021-06-02 15:24:23 +02:00
extruders	Merge pull request #5 from Ultimaker/master	2021-05-20 17:00:57 +02:00
i18n	Update DE translation	2021-05-03 10:58:53 +02:00
images	Update whats new pages	2021-05-07 13:10:47 +02:00
intent	Most recent updates	2021-05-20 22:20:46 +02:00
meshes	Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master	2021-06-01 15:58:09 +02:00
qml	Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura	2021-06-01 16:33:10 +02:00
quality	Most recent updates	2021-05-20 22:20:46 +02:00
setting_visibility	Add current version to setting_visibility	2021-04-01 16:17:01 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Update whats new pages	2021-05-07 13:10:47 +02:00
themes	Revert "Fix merge conflict"	2021-06-03 17:27:35 +02:00
variants	Merge pull request #5 from Ultimaker/master	2021-05-20 17:00:57 +02:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00