Ghostkeeper 94eb76a844
Merge branch 'master' into CURA-6793_performance
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.
2019-10-23 09:58:08 +02:00
..
2017-09-28 13:00:43 +02:00
2017-09-28 13:00:43 +02:00
2019-10-07 21:11:40 +02:00