Cura/cura/UI
Ghostkeeper c781391b9b
Merge branch 'master' into libArachne_rebased
To my surprise, it seems fdmprinter has merged perfectly. Nice.

Conflicts:
	resources/setting_visibility/advanced.cfg -> Settings moved to a different category while we added new settings in the same place.
2021-02-10 11:55:37 +01:00
..
__init__.py WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
AddPrinterPagesModel.py Add extra "AddPrinterPagesModel" without the cancel button 2020-06-09 15:20:15 +02:00
CuraSplashScreen.py Possible alternate non-numbered versions. 2020-12-20 21:55:13 +01:00
MachineActionManager.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
MachineSettingsManager.py Remove use of deprecated extruders property 2020-06-02 11:54:10 +02:00
ObjectsModel.py Speed up the objects model 2020-06-23 10:32:42 +02:00
PrintInformation.py Reset scene metadata if the buildplate was cleared 2020-12-23 14:08:59 +01:00
RecommendedMode.py Change import 2019-05-21 15:17:04 +02:00
TextManager.py Possible alternate non-numbered versions. 2020-12-20 21:55:13 +01:00
WelcomePagesModel.py Add is_final_page attribute and mark the "Add Cloud Printers" page as final 2020-04-29 11:37:42 +02:00
WhatsNewPagesModel.py Remove hack in WelcomePagesModel and add WhatsNewPagesModel 2019-04-12 12:11:09 +02:00