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
..
__init__.py	remove .curaproject from the extensions and just use .3mf	2018-08-29 13:42:26 +02:00
plugin.json	Update plugin versions to match package versions	2018-12-17 13:03:21 +01:00
ThreeMFReader.py	Add typing	2019-04-26 15:42:22 +02:00
ThreeMFWorkspaceReader.py	Merge branch 'feature_intent' into feature_intent_container_tree	2019-08-13 14:59:05 +02:00
WorkspaceDialog.py	Fix typo	2019-04-05 10:49:36 +02:00
WorkspaceDialog.qml	Show printer group and which machine to update in project loading	2018-03-20 16:23:23 +01:00