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	Fix textfield height for entering project name in DL	2022-03-24 10:31:10 +01:00
src	Qt5->Qt6: Register QML enums as (uncreatable) meta object not type.	2021-12-29 11:37:18 +01:00
tests	Update tests to test filter too	2021-07-13 16:24:21 +02:00
__init__.py	Initial commit for the DL	2021-04-20 11:30:49 +02:00
plugin.json	Increment version number of Digital Library plug-in to 1.1	2021-09-10 16:49:14 +02:00