Ghostkeeper 611208368c Merge branch 'master' into libArachne_rebased ... Conflicts: cura/CuraApplication.py: Setting version fdmprinter and fdmextruder: Setting version intents, qualities and variants: Setting version Changelog: 4.9.1 was added, should be below Arachne changes		2021-06-16 18:04:54 +02: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	Allow renaming groups to something other than "Group #n"	2021-04-19 22:14:14 +02:00
PrintInformation.py	Remove unused import	2021-03-01 14:32:42 +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	Transfer the "What's new" and "Changelog" pages at the end of wizard	2021-03-25 13:29:17 +01:00
WhatsNewPagesModel.py	... and fix typing as a result of the last commit.	2021-03-24 16:29:38 +01:00