Lipu Fei 71e32d94f7 Resolve merge conflicts ...

CURA-6483

2019-05-02 07:45:43 +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

Better naming for hasMachineTypeName()

2019-04-29 13:28:18 +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

Fix local printer selection update

2019-04-03 15:14:06 +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

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