Cura/resources/qml/Settings
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
..
SettingCategory.qml Move CategoryButton to cura repo 2022-03-11 13:11:36 +01:00
SettingCheckBox.qml Remove enable:false assignment that was used for testing 2022-03-04 13:02:21 +01:00
SettingComboBox.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
SettingExtruder.qml New designs use dark mode border_main for dark theme. 2022-03-04 13:22:55 +01:00
SettingItem.qml Merge branch 'master' into CURA-8640_PyQt6 2022-03-24 11:53:44 +01:00
SettingOptionalExtruder.qml New designs use dark mode border_main for dark theme. 2022-03-04 13:22:55 +01:00
SettingTextField.qml Update validation colors to match new designs 2022-03-04 15:05:30 +01:00
SettingUnknown.qml Replace usage of controls label with our custom label 2021-11-10 16:37:26 +01:00
SettingView.qml Merge pull request #11674 from Ultimaker/CURA-9039_combobox_open_out_of_window 2022-03-17 07:46:56 +00:00