Cura/resources/qml/Preferences
Ghostkeeper e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
..
Materials Remove styles 2022-01-04 10:36:55 +01:00
GeneralPage.qml Merge branch 'master' into replace_controls_1_for_controls_2 2022-01-18 17:17:10 +01:00
MachinesPage.qml Replace more instances of label with UM.Label 2021-11-10 17:42:23 +01:00
ProfilesPage.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ProfileTab.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlySpinBox.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextArea.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextField.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
SettingVisibilityPage.qml Also search on description when using search in visibility page 2021-07-19 15:47:38 +02:00