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-05-28 07:57:29 +02:00
2019-08-12 15:11:59 +02:00
2019-03-26 08:29:22 +01:00
2019-07-19 13:55:16 +02:00
2019-08-12 14:52:05 +02:00
2019-08-02 16:49:07 +02:00
2019-05-28 08:09:07 +02:00