Ghostkeeper 20201c65e6 Merge branch 'master' into feature_intent ... Conflicts: resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously tests/TestMachineManager.py -> Due to changes in conftest.py tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties		2019-08-13 14:43:28 +02:00
..
Models	Merge branch 'master' into feature_intent	2019-08-13 14:43:28 +02:00
__init__.py	WIP: Create VariantManager	2018-02-16 14:20:02 +01:00
ContainerNode.py	Clean up more code	2018-09-27 16:07:18 +02:00
MachineErrorChecker.py	Fix incorect error checking	2019-07-31 10:24:31 +02:00
MaterialGroup.py	Added typing for various setting classes	2018-09-10 15:24:11 +02:00
MaterialManager.py	Fix typing issues	2019-07-23 12:58:46 +02:00
MaterialNode.py	Added typing for various setting classes	2018-09-10 15:24:11 +02:00
QualityChangesGroup.py	Clean up more code	2018-09-27 16:07:18 +02:00
QualityGroup.py	Add is_experimental to Qt models and QMLs	2018-11-27 15:50:03 +01:00
QualityManager.py	Implement complete code for currentAvailableIntents	2019-06-20 14:48:18 +02:00
QualityNode.py	Clean up more code	2018-09-27 16:07:18 +02:00
VariantManager.py	Add more info in exceptions	2019-08-02 11:12:16 +02:00
VariantType.py	Move VariantType to VariantType.py	2018-08-02 16:11:55 +02:00