Cura/plugins
Ghostkeeper 6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
2019-08-13 14:59:05 +02:00
..
2019-04-30 11:39:45 +02:00
2019-08-01 11:06:22 +02:00
2019-04-23 10:31:13 +02:00
2019-04-17 09:18:08 +02:00
2019-07-22 09:34:00 +02:00