Ghostkeeper 88d08b27d1 Merge branch 'master' into CURA-8609_sync_materials_to_printer ... Conflicts: cura/Machines/Models/MaterialManagementModel.py -> On Master we had temporarily reverted the action of this button because it became apparent that the sync wasn't going to be in 4.12. That revert is no longer necessary if this is merged.		2021-10-27 14:21:05 +02:00
..
bundled_packages	Merge branch 'master' into CURA-8510_version_upgrade	2021-09-23 17:01:00 +02:00
definitions	Simplify description of lightning infill angle settings	2021-10-25 15:22:29 +02:00
extruders	Merge branch 'patch-1' of https://github.com/Hogan-Polaris/Cura into Hogan-Polaris-patch-1	2021-10-22 16:47:09 +02:00
i18n	Update header of translated files for Cura 4.12	2021-10-20 16:52:50 +02: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 'master' into CURA-8609_sync_materials_to_printer	2021-10-27 14:21:05 +02:00
quality	Remove non-default roofing layer count from some UM TPLA profiles.	2021-10-21 16:40:19 +02: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 page for when the user has no cloud printers	2021-10-06 16:42:56 +02:00
variants	Update setting_version to 19	2021-10-15 16:12:27 +02: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