Jelle Spijker 3f8907d02a Merge branch 'master' into CURA-8640_PyQt6 ... # Conflicts: # cura/CuraApplication.py # resources/qml/Preferences/Materials/MaterialsSyncDialog.qml # resources/qml/Preferences/Materials/MaterialsView.qml		2022-03-24 11:53:44 +01:00
..
qml	Replace UM.MessageDialog with newly added Cura.MessageDialog	2022-02-23 14:09:38 +01:00
__init__.py	Added CuraDirve plugin to Cura build	2018-12-10 14:18:10 +01:00
CreateBackupJob.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
DriveApiService.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
DrivePluginExtension.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
RestoreBackupJob.py	Qt5->Qt6: More renamed stuff.	2021-12-29 11:18:49 +01:00
Settings.py	Process Review feedback for CURA-7438	2020-06-09 13:41:30 +02:00