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	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
PerObjectCategory.qml	Add missing UM import	2022-03-15 09:05:38 +01:00
PerObjectItem.qml	Remove redundant reference to spacer	2022-03-07 13:26:50 +01:00
PerObjectSettingsPanel.qml	Apply suggestions from code review	2022-03-11 09:59:20 +01:00
PerObjectSettingsTool.py	Override all settings that might influence infill mesh shells to 0	2021-07-15 18:46:20 +02:00
PerObjectSettingVisibilityHandler.py	Merge branch 'master' into PyQt6_upgrade	2022-02-21 11:52:28 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00
SettingPickDialog.qml	Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap.	2022-03-07 13:20:05 +01:00