Cura/resources/quality/imade3d_jellybox
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
..
PETG Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
PLA Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
imade3d_jellybox_coarse.inst.cfg Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
imade3d_jellybox_fine.inst.cfg Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
imade3d_jellybox_normal.inst.cfg Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
imade3d_jellybox_ultrafine.inst.cfg Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00