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	Removed unneeded application reference in construction of meshreaders	2018-06-29 09:25:38 +02:00
ConfigUI.qml	Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.	2022-03-03 15:53:30 +01:00
ImageReader.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
ImageReaderUI.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00