Ghostkeeper df0a3143d2 Merge branch 'master' of https://github.com/Magicfirm/Cura into Magicfirm-master		2020-03-19 14:43:47 +01:00
..
bundled_packages	Bump SDK version number of Cura 4.5 to 7.1	2020-02-10 10:45:07 +01:00
definitions	Merge branch 'master' of https://github.com/Magicfirm/Cura into Magicfirm-master	2020-03-19 14:43:47 +01:00
extruders	Merge branch 'master' of https://github.com/Magicfirm/Cura into Magicfirm-master	2020-03-19 14:43:47 +01:00
i18n	Merge branch 'DenyCZ-4.5'	2020-03-09 16:57:09 +01:00
images	Add Flying Bear Ghost 4S Printer	2020-03-08 18:37:48 +03:00
intent	Also bump up the setting version of files changed since this branch was branched	2019-11-20 16:51:15 +01:00
meshes	Add Flying Bear Ghost 4S Printer	2020-03-08 18:37:48 +03:00
qml	Don't translate 'Language:' string	2020-03-10 11:19:32 +01:00
quality	Merge pull request #7243 from oducceu/master	2020-03-16 09:08:18 +01:00
setting_visibility	Merge pull request #7010 from smartavionics/mb-hole-offset	2020-02-13 09:05:18 +01:00
shaders	Older drivers can lie w.r.t. GLSL-version if it's forced lower.	2019-09-21 14:58:59 +02:00
texts	Fix layout of 4.5 change log	2020-02-25 16:16:45 +01:00
themes	Remove all duplicate entries from dark theme	2020-03-10 11:57:30 +01:00
variants	Reduce redundant variants	2020-03-13 13:45:35 +03:00