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
..
resources	Swap buttons in MonitorConfigOverrideDialog for cura buttons	2022-03-09 12:23:21 +01:00
src	Qt5->Qt6: More renamed stuff.	2021-12-29 11:18:49 +01:00
__init__.py	Add legacy 'Connect over Network' button back	2019-08-12 01:19:41 +02:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00