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
..
2019-05-28 07:57:29 +02:00
2019-08-23 17:03:39 +02:00
2019-08-13 16:20:21 +02:00
2019-07-19 13:55:16 +02:00
2019-10-01 11:30:54 +02:00
2019-08-02 16:49:07 +02:00
2019-08-15 09:23:05 +02:00