Ghostkeeper 20201c65e6 Merge branch 'master' into feature_intent ... Conflicts: resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously tests/TestMachineManager.py -> Due to changes in conftest.py tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties		2019-08-13 14:43:28 +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	Rename output device to prevent inheritance naming confusion	2019-08-02 15:16:08 +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
IntentCategoryModel.py	Update through self.setItems rather than super().update	2019-07-04 12:36:14 +02:00
IntentModel.py	Fix typing	2019-07-09 13:02:01 +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