Cura/cura/Machines
Jelle Spijker 3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
..
Models Merge branch 'master' into CURA-8640_PyQt6 2022-03-24 11:53:44 +01: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 Search/replace Qt5->Qt6. 2021-12-28 14:46:02 +01:00
MachineNode.py Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01: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 Search/replace Qt5->Qt6. 2021-12-28 14:46:02 +01: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