Ghostkeeper ee81326d6a Fix remaining merge conflicts ... - When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed. - There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket. Contributes to issue CURA-8684.		2022-01-31 17:08:56 +01:00
..
__init__.py	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00
PerObjectCategory.qml	Update PerObjectCategory to QtQuick.Controls 2.1	2022-01-20 22:15:22 +01:00
PerObjectItem.qml	Remove unneded styles import	2022-01-04 09:48:02 +01:00
PerObjectSettingsPanel.qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +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	Reduce nesting complexity with some pre-checks	2021-06-16 12:58:09 +02:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00
SettingPickDialog.qml	Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'	2022-01-31 16:53:45 +01:00