Ghostkeeper 7df4c01814 Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: cura/Settings/MachineManager.py -> rowCount vs. count resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten. resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed. resources/qml/Toolbar.qml -> Git was wrong, not a conflict. resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.		2018-12-03 11:45:05 +01:00
..
SettingCategory.qml	Fix codestyle issues	2018-11-27 15:00:57 +01:00
SettingCheckBox.qml	Bumped the required version numbers down again, as they should specifcy a min version number.	2018-02-16 11:13:40 +01:00
SettingComboBox.qml	Set textFormat for the setting items to PlainText	2018-09-20 15:22:35 +02:00
SettingExtruder.qml	Set textFormat for the setting items to PlainText	2018-09-20 15:22:35 +02:00
SettingItem.qml	Remove all the entries in the theme that make reference to the sidebar,	2018-10-26 17:51:28 +02:00
SettingOptionalExtruder.qml	Use ListModel.count instead of rowCount	2018-12-03 11:13:26 +01:00
SettingTextField.qml	Reduce the maximum precision of floats in SettingTextField inputs	2018-09-29 08:16:11 +02:00
SettingUnknown.qml	Add the correct value to the setting viewer when the type is unknown.	2018-03-20 11:42:42 +01:00
SettingView.qml	Merge remote-tracking branch 'origin/master' into ui_rework_4_0	2018-11-29 08:54:22 +01:00