Cura/cura/Machines
Nino van Hooff 58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
..
Models Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
__init__.py WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
ContainerNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
ContainerTree.py Updated comments in Models 2020-05-08 18:59:38 +02:00
IntentNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
MachineErrorChecker.py Updated comments in Models 2020-05-08 18:59:38 +02:00
MachineNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
MaterialGroup.py Updated comments in Models 2020-05-08 18:59:38 +02:00
MaterialNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
QualityChangesGroup.py Updated comments in Models 2020-05-08 18:59:38 +02:00
QualityGroup.py Updated comments in Models 2020-05-08 18:59:38 +02:00
QualityNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
VariantNode.py Updated comments in Models 2020-05-08 18:59:38 +02:00
VariantType.py Move VariantType to VariantType.py 2018-08-02 16:11:55 +02:00