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
..
src	Merge branch 'master' into CURA-8640_PyQt6	2022-03-24 11:53:44 +01:00
__init__.py	Codestyle & typing	2019-01-04 11:50:02 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00