Cura/resources/quality/twotrees
Ghostkeeper 611208368c
Merge branch 'master' into libArachne_rebased
Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes
2021-06-16 18:04:54 +02:00
..
abs Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
petg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
pla Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
tpu Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_adaptive.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_draft.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_low.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_standard.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_super.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00
two_trees_global_ultra.inst.cfg Merge branch 'master' into libArachne_rebased 2021-06-16 18:04:54 +02:00