Ghostkeeper 7f1e61b7b8 Fix merge conflict ... Oopsie.		2021-05-04 17:08:44 +02:00
..
bundled_packages	Initial commit for the DL	2021-04-20 11:30:49 +02:00
definitions	Merge branch '4.9'	2021-05-04 11:58:50 +02:00
extruders	Merge branch 'SyndaverAXI2_MachineProfile' of https://github.com/SynDaverCO/Cura	2021-05-03 15:28:04 +02:00
i18n	Update DE translation	2021-05-03 10:58:53 +02:00
images	Update change log and whats new pages	2021-04-20 11:26:31 +02:00
intent	Revert "Bump setting_version to 17" for instances	2021-04-02 10:43:24 +02:00
meshes	Merge branch 'master' of https://github.com/lowkeyjoe/Cura into lowkeyjoe-master	2021-04-29 14:24:41 +02:00
qml	Use detail_level to describe the icons (instead of size)	2021-04-28 18:53:32 +02:00
quality	Merge branch '4.9'	2021-05-04 11:58:50 +02:00
setting_visibility	Add current version to setting_visibility	2021-04-01 16:17:01 +02:00
shaders	Actually show 'on buildplate' color when z=0.	2021-01-22 18:47:45 +01:00
texts	Update change log	2021-04-20 12:34:41 +02:00
themes	Fix merge conflict	2021-05-04 17:08:44 +02:00
variants	Merge branch 'master' of https://github.com/lowkeyjoe/Cura into lowkeyjoe-master	2021-04-29 14:24:41 +02:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00