Cura/cura/Machines
Ghostkeeper 88d08b27d1
Merge branch 'master' into CURA-8609_sync_materials_to_printer
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> On Master we had temporarily reverted the action of this button because it became apparent that the sync wasn't going to be in 4.12. That revert is no longer necessary if this is merged.
2021-10-27 14:21:05 +02:00
..
Models Merge branch 'master' into CURA-8609_sync_materials_to_printer 2021-10-27 14:21:05 +02:00
__init__.py WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
ContainerNode.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
ContainerTree.py Add bit more logging around MachineNode loading 2020-07-20 16:03:06 +02:00
IntentNode.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
MachineErrorChecker.py Fix various typos 2021-09-07 11:33:54 -04:00
MachineNode.py Fix some quality_changes being incorrectly shown for some configurations 2020-08-06 16:59:30 +02:00
MaterialGroup.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
MaterialNode.py Convert list of all base_files into set 2020-11-09 15:28:13 +01:00
QualityChangesGroup.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
QualityGroup.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
QualityNode.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
VariantNode.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
VariantType.py Move VariantType to VariantType.py 2018-08-02 16:11:55 +02:00