Jelle Spijker 12ee57e4ad

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

# Conflicts:
#	cura/UI/CuraSplashScreen.py

2022-03-28 15:02:18 +02:00

..

Models

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

__init__.py

Added first stubs for printer output models

2017-11-17 15:05:08 +01:00

FirmwareUpdater.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

GenericOutputController.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

NetworkedPrinterOutputDevice.py

Qt5->Qt6: More renamed stuff.

2021-12-29 11:18:49 +01:00

NetworkMJPGImage.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

Peripheral.py

Remove trailing whitespace from Python files

2020-05-29 14:30:33 +02:00

PrinterOutputController.py

Move models around again

2019-03-26 08:29:22 +01:00

PrinterOutputDevice.py

Don't change metadata if there is no global stack

2022-01-05 17:15:38 +01:00

PrintJobOutputModel.py

Fix typo in a log warning message

2019-05-16 12:04:26 +02:00

UploadMaterialsJob.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00