Cura/cura/Machines
Ghostkeeper 5ab1881a21
Merge branch 'master' into feature_intent
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
2019-06-19 13:10:36 +02:00
..
Models Merge branch 'master' into feature_intent 2019-06-19 13:10:36 +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 Add handling for ValidatorState.Invalid 2019-05-09 12:07:16 +02:00
MaterialGroup.py Added typing for various setting classes 2018-09-10 15:24:11 +02:00
MaterialManager.py Don't crash when materials are not registered 2019-05-01 13:14:40 +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 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
QualityNode.py Clean up more code 2018-09-27 16:07:18 +02:00
VariantManager.py Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
VariantType.py Move VariantType to VariantType.py 2018-08-02 16:11:55 +02:00