Jelle Spijker 12ee57e4ad

Merge branch 'master' into CURA-8640_PyQt6 ...

# Conflicts:
#	cura/UI/CuraSplashScreen.py

2022-03-28 15:02:18 +02: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 errors in workspace dialog

2022-03-25 10:29:36 +01:00