Lipu Fei a85f2ce156 Fix merge conflicts		2019-03-26 09:01:01 +01:00
..
__init__.py	WIP: Add Welcome Page and use CTRL+Alt+D to trigger	2019-02-27 12:45:28 +01:00
CuraSplashScreen.py	Move CuraSplashScreen into cura.UI module	2019-03-20 09:08:14 +01:00
CuraStage.py	Move CuraStage into cura.UI module	2019-03-20 09:07:15 +01:00
MachineActionManager.py	Merge WIP_onboarding	2019-03-20 11:28:30 +01:00
MachineSettingsManager.py	WIP: Add first-start machine actions	2019-03-19 14:24:57 +01:00
MaterialOutputModel.py	Fix typing	2019-03-21 09:13:00 +01:00
ObjectsModel.py	Fix code styles	2019-03-21 09:06:41 +01:00
PrintInformation.py	Move PrintInformation into cura.UI module	2019-03-20 09:13:38 +01:00
WelcomePagesModel.py	Rename to AddNetworkOrLocalPrinterContent	2019-03-22 10:43:01 +01:00