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
..
__init__.py	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00
ThreeMFReader.py	Change imported namespace pySavitar to Savitar	2022-02-28 10:44:16 +01:00
ThreeMFWorkspaceReader.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
UpdatableMachinesModel.py	Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership	2021-12-28 14:54:56 +01:00
WorkspaceDialog.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
WorkspaceDialog.qml	Fix darkmode issues in the Workspace dialog	2022-02-28 15:59:56 +01:00