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
..
MaterialsBrandSection.qml	Use correct font and line height for the category btn in materials list	2022-03-21 13:50:10 +01:00
MaterialsDetailsPanel.qml	Fix various QML warnings	2022-03-15 10:32:44 +01:00
MaterialsList.qml	boy scouting	2022-03-09 15:59:21 +01:00
MaterialsPage.qml	Fix "double"/non-functional scrollbars on ScrollViews	2022-03-22 14:46:14 +01:00
MaterialsSlot.qml	Don't check on type equality to check if material is set	2022-03-22 13:46:31 +01:00
MaterialsSyncDialog.qml	Merge branch 'master' into CURA-8640_PyQt6	2022-03-24 11:53:44 +01:00
MaterialsTypeSection.qml	Fix sizing of materialBrandSelection	2022-03-15 10:25:56 +01:00
MaterialsView.qml	Fix "double"/non-functional scrollbars on ScrollViews	2022-03-22 14:46:14 +01:00