Ghostkeeper 5ab1881a21 Merge branch 'master' into feature_intent ... Conflicts: plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3. plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py		2019-06-19 13:10:36 +02:00
..
__init__.py	Move models around again	2019-03-26 08:29:22 +01:00
BaseMaterialsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
BuildPlateModel.py	Move models around again	2019-03-26 08:29:22 +01:00
CustomQualityProfilesDropDownMenuModel.py	Move models around again	2019-03-26 08:29:22 +01:00
DiscoveredPrintersModel.py	Also move _getMachineTypeNameFromId to DiscoveredPrintersModel	2019-06-07 15:04:19 +02:00
ExtrudersModel.py	Move models around again	2019-03-26 08:29:22 +01:00
FavoriteMaterialsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
FirstStartMachineActionsModel.py	Use loader for machine actions in dialog	2019-05-06 13:06:23 +02:00
GenericMaterialsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
GlobalStacksModel.py	Resolve merge conflicts	2019-05-02 07:45:43 +02:00
IntentModel.py	Add a selector for the intent profile	2019-06-05 11:13:32 +02:00
MaterialBrandsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
MultiBuildPlateModel.py	Move models around again	2019-03-26 08:29:22 +01:00
NozzleModel.py	Move models around again	2019-03-26 08:29:22 +01:00
QualityManagementModel.py	Move models around again	2019-03-26 08:29:22 +01:00
QualityProfilesDropDownMenuModel.py	Move models around again	2019-03-26 08:29:22 +01:00
QualitySettingsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
SettingVisibilityPresetsModel.py	Move models around again	2019-03-26 08:29:22 +01:00
UserChangesModel.py	Move models around again	2019-03-26 08:29:22 +01:00