mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Conflicts: cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading. cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between. Contributes to issue CURA-6793. |
||
|---|---|---|
| .. | ||
| Models | ||
| TestContainerTree.py | ||
| TestMachineNode.py | ||
| TestMaterialNode.py | ||
| TestQualityNode.py | ||
| TestVariantNode.py | ||