mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-06-29 22:05:10 +08: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.