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
..
resources	Revised text from Enterprise marketplace pop-up screen	2020-04-22 15:20:39 +02:00
src	Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments	2020-05-28 17:31:24 +02:00
__init__.py	Fix Toolbox import error (continued)	2020-01-16 14:39:10 +01: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