casper 2f8f56d762 Merge branch 'master' into CURA-8979_Materials_Preference_Page ... # Conflicts: # resources/qml/Preferences/ProfilesPage.qml		2022-03-11 13:57:30 +01:00
..
Materials	Update materials slot	2022-03-11 13:22:45 +01:00
GeneralPage.qml	Color icon in preference page according to theme color	2022-02-28 16:13:36 +01:00
MachinesPage.qml	Move details plane caption to management page	2022-03-10 10:15:31 +01:00
ProfilesPage.qml	Merge branch 'master' into CURA-8979_Materials_Preference_Page	2022-03-11 13:57:30 +01:00
ReadOnlyTextArea.qml	Simpify Readonly textarea	2022-02-15 15:18:04 +01:00
RenameDialog.qml	Dialogs inheriting from incorrect Component, causing the buttons to be styled incorrectly	2022-03-01 14:53:51 +01:00
SettingVisibilityPage.qml	Merge pull request #11535 from Ultimaker/CURA-8688_qt6_cleanup	2022-03-02 16:49:53 +01:00