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
..
avr_isp	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
__init__.py	Fix code style and unused imports	2018-10-03 23:07:37 +02:00
AutoDetectBaudJob.py	Merge pull request #8463 from rrrlasse/rrrlasse/fix_usb_connection	2021-06-16 15:14:38 +02:00
AvrFirmwareUpdater.py	Fix various typos	2021-09-07 11:33:54 -04:00
MonitorItem.qml	Add scroll bar to print monitor if content is overflowing	2022-03-21 11:27:47 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00
USBPrinterOutputDevice.py	Fix various typos	2021-09-07 11:33:54 -04:00
USBPrinterOutputDeviceManager.py	Qt5->Qt6: Fix cause of stack-overflow errors for newer Python/Qt.	2021-12-29 09:23:11 +01:00