casper 5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars ...

# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml

2022-02-18 09:07:25 +01:00

..

__init__.py

Unrevert new icon set for all of Cura's interface

2021-06-28 17:16:56 +02:00

PerObjectCategory.qml

Ensure that settingPickDialog uses the themed controls

2022-02-15 15:38:08 +01:00

PerObjectItem.qml

Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars

2022-02-18 09:07:25 +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

Clarify some documentation in the PerObjectSettingVisibilityHandler

2022-02-11 13:40:21 +01: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-8685-replace_text_and_progress_bars

2022-02-18 09:07:25 +01:00