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	Fix code style and unused imports	2018-10-03 23:07:37 +02:00
FirmwareUpdaterMachineAction.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
FirmwareUpdaterMachineAction.qml	Remove comments	2022-02-22 09:16:50 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00