Ghostkeeper 9140b71b19 Merge branch 'libArachne_rebased' ... Conflicts: plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne. resources/definitions -> Bunch of conflicts with profile updates. resources/quality -> Bunch of conflicts with profile updates. resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.		2021-12-14 11:48:58 +01:00
..
bundled_packages	Merge branch 'master' into CURA-8510_version_upgrade	2021-09-23 17:01:00 +02:00
definitions	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
extruders	Update Eryone thinker and er20 3d printer profile (#10650)	2021-12-10 17:01:52 +01:00
i18n	Update version number in header files	2021-12-10 16:15:34 +01:00
images	Update image	2021-11-26 10:37:19 +01:00
intent	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
meshes	Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master	2021-10-15 16:07:59 +02:00
qml	Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c	2021-12-06 09:48:18 +01:00
quality	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
setting_visibility	Merge branch 'master' into merge_main_20211019	2021-10-20 08:38:01 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +01:00
themes	Use badge icons	2021-11-18 10:53:35 +01:00
variants	Merge branch 'libArachne_rebased'	2021-12-14 11:48:58 +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