Nino van Hooff 58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments ... # Conflicts: # cura/API/__init__.py # cura/Settings/CuraContainerRegistry.py # cura/Settings/ExtruderManager.py # plugins/PostProcessingPlugin/scripts/PauseAtHeight.py # plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py # plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py # plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py		2020-05-28 17:31:24 +02:00
..
__init__.py	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
PerObjectCategory.qml	Rename SettingsDefinitionModel.collapse to -Recursive for consistency	2019-12-30 15:05:52 +01:00
PerObjectItem.qml	Update when a setting is removed from the list	2019-08-02 14:34:14 +02:00
PerObjectSettingsPanel.qml	Fix i18n catalog for per-object settings panel	2020-04-21 11:39:49 +02:00
PerObjectSettingsTool.py	Convert doxygen to rst for POS, MonitorStage, PostProcessing	2020-05-08 16:28:07 +02:00
PerObjectSettingVisibilityHandler.py	Convert doxygen to rst for POS, MonitorStage, PostProcessing	2020-05-08 16:28:07 +02:00
plugin.json	Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6	2020-04-21 11:46:12 +02:00
SettingPickDialog.qml	While searching, search through all settings rather than just visible	2020-05-15 13:11:28 +02:00
tool_icon.svg	Update the per-object-settings icon	2019-09-10 13:37:05 +02:00