Ghostkeeper dcf78b4885 Merge branch '4.12' ... Conflicts: resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.		2021-11-08 13:55:09 +01:00
..
bundled_packages	Merge branch 'master' into CURA-8510_version_upgrade	2021-09-23 17:01:00 +02:00
definitions	Undo PP-29: apply zigzag pattern to top/bottom layers. These layer lead to more sagging of bridging patterns. We will undo the chance (for the 4.12 release).	2021-11-04 16:32:41 +01:00
extruders	Fix file extension	2021-11-03 17:27:49 +01:00
i18n	Merge branch '4.12'	2021-11-08 13:55:09 +01:00
images	Change log and whats new pages	2021-10-22 10:15:58 +02:00
intent	- Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00	2021-10-11 11:35:38 +02:00
meshes	Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master	2021-10-15 16:07:59 +02:00
qml	Merge branch '4.12'	2021-11-08 13:55:09 +01:00
quality	Fix global level profiles for XYZPrinting printers	2021-11-03 17:13:15 +01:00
setting_visibility	Added lightning infill description and sub-settings level.	2021-10-12 09:17:58 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Update change_log.txt	2021-10-23 02:04:58 +02:00
themes	add dark themed images to the dark theme	2021-10-28 14:12:15 +02:00
variants	Merge branch 'master' of https://github.com/heed818/Cura into heed818-master	2021-11-03 15:39:24 +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