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

..

__init__.py

Move models around again

2019-03-26 08:29:22 +01:00

BaseMaterialsModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-23 09:58:08 +02:00

BuildPlateModel.py

Don't get build plate variants from tree any more

2019-08-09 13:43:54 +02:00

CustomQualityProfilesDropDownMenuModel.py

Fix updating custom quality menu model

2019-09-25 14:36:46 +02:00

DiscoveredPrintersModel.py

Fix renaming mistake from 1fa5628cb2e35425d1b42f9dbb20a9bda45da032

2019-08-20 17:17:52 +02:00

ExtrudersModel.py

Move models around again

2019-03-26 08:29:22 +01:00

FavoriteMaterialsModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-23 09:58:08 +02:00

FirstStartMachineActionsModel.py

Use loader for machine actions in dialog

2019-05-06 13:06:23 +02:00

GenericMaterialsModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-23 09:58:08 +02:00

GlobalStacksModel.py

Resolve merge conflicts

2019-05-02 07:45:43 +02:00

IntentCategoryModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-23 09:58:08 +02:00

IntentModel.py

Fix recommended mode

2019-10-07 12:58:41 +02:00

MachineModelUtils.py

Fix code style

2019-10-07 08:12:54 +02:00

MaterialBrandsModel.py

Don't get whole container to just get metadata

2019-10-16 13:56:23 +02:00

MaterialManagementModel.py

Fix merge conflicts

2019-10-15 15:00:03 +02:00

MultiBuildPlateModel.py

Move models around again

2019-03-26 08:29:22 +01:00

NozzleModel.py

Don't cache machine manager and application

2019-10-08 14:16:19 +02:00

QualityManagementModel.py

Fix custom quality fetching

2019-10-21 09:06:07 +02:00

QualityProfilesDropDownMenuModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-16 15:47:41 +02:00

QualitySettingsModel.py

Fix case if containers are None

2019-08-28 16:50:14 +02:00

SettingVisibilityPresetsModel.py

Move models around again

2019-03-26 08:29:22 +01:00

UserChangesModel.py

Remove use of deprecated extruders property

2019-09-13 17:27:16 +02:00