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	Fix version upgrade	2019-01-14 11:25:02 +01:00
plugin.json	Update plugin versions to match package versions	2018-12-17 13:03:21 +01:00
product_to_id.json	Fix serialising materials with Ultimaker S5 in it	2019-02-14 17:45:25 +01:00
XmlMaterialProfile.py	Merge branch 'feature_intent' into feature_intent_container_tree	2019-08-13 14:59:05 +02:00
XmlMaterialUpgrader.py	Remove unused import	2019-02-14 13:54:03 +01:00
XmlMaterialValidator.py	Add documentation	2018-06-07 15:49:23 +02:00