Lipu Fei 80dff49b8a Fix merge conflicts

2019-03-22 10:00:57 +01:00

..

__init__.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

BaseMaterialsModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

BuildPlateModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

CustomQualityProfilesDropDownMenuModel.py

Fix module renaming

2019-03-20 13:39:08 +01:00

DiscoveredPrintersModel.py

Add docs for createMachineFromDiscoveredPrinter

2019-03-22 09:47:13 +01:00

FavoriteMaterialsModel.py

Fix module renaming

2019-03-20 13:39:08 +01:00

FirstStartMachineActionsModel.py

Merge WIP_onboarding

2019-03-20 11:28:30 +01:00

GenericMaterialsModel.py

Fix module renaming

2019-03-20 13:39:08 +01:00

MaterialBrandsModel.py

Fix module renaming

2019-03-20 13:39:08 +01:00

MultiBuildPlateModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

NozzleModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

QualityManagementModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

QualityProfilesDropDownMenuModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

QualitySettingsModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00

SettingVisibilityPresetsModel.py

Move cura.Machine.Models to cura.UI.MachineModels

2019-03-20 09:56:11 +01:00