3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
Cura/cura/API
History
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
..
Interface Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
__init__.py Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
Account.py Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
Backups.py Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
ConnectionStatus.py Change connection status checking interval to 10s 2020-05-28 09:56:41 +02:00