2 Commits

Author SHA1 Message Date
Diego Prado Gesto
5704a7b184 Merge branch 'master' into WIP_improve_initialization
Conflicts:
	cura/AutoSave.py
	cura/BuildVolume.py
	cura/CuraApplication.py

Contributes to CURA-5164
2018-05-25 09:40:42 +02:00
Lipu Fei
cfd1b7b813 Fix AutoSave conflicts with BackupManager
- Move AutoSave out of the plugins. It's a built-in module now.
 - Add enable/disable saving data on CuraApplication.
 - Avoid saving data in backup restore
2018-05-23 11:25:47 +02:00