Cura/cura
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
..
API Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
Arranging Merge branch 'master' into doxygen_to_restructuredtext_comments 2020-05-08 15:31:23 +02:00
Backups Updated comments in Backup 2020-05-08 15:39:16 +02:00
Machines Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
OAuth2 Merge remote-tracking branch 'origin/doxygen_to_restructuredtext_comments' into doxygen_to_restructuredtext_comments 2020-05-15 13:40:22 +02:00
Operations Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
PrinterOutput Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
ReaderWriters Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Scene Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
Settings Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
Stages Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
TaskManagement Move HttpRequestManager to Uranium 2020-01-03 08:59:29 +01:00
UI Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
UltimakerCloud Move UltimakerCloudAuthentication and UltimakerCloudScope 2020-03-12 17:48:54 +01:00
Utils Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
__init__.py T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
ApplicationMetadata.py Update sdk version to 7.2.0 2020-04-21 11:00:06 +02:00
AutoSave.py Add some missing typing 2020-01-10 14:58:53 +01:00
BuildVolume.py Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
CameraAnimation.py Merge pull request #905 from Ultimaker/snappier_camera_animation 2017-10-24 10:36:55 +02:00
CrashHandler.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
CuraActions.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
CuraApplication.py Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-15 13:38:37 +02:00
CuraPackageManager.py Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 2020-05-28 17:31:24 +02:00
CuraVersion.py.in Make Marketplace link configurable from the build system 2020-01-28 11:52:46 +01:00
CuraView.py Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
Layer.py Add some missing typing 2020-01-10 14:58:53 +01:00
LayerData.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
LayerDataBuilder.py Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
LayerDataDecorator.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
LayerPolygon.py Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
MachineAction.py Applied requested changes proposed by @ninovanhooff 2020-04-27 20:09:00 +02:00
MultiplyObjectsJob.py Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
OneAtATimeIterator.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
PickingPass.py Merge branch 'master' into doxygen_to_restructuredtext_comments 2020-05-08 15:31:23 +02:00
PlatformPhysics.py Don't crash on moving empty groups down to build plate 2020-04-07 13:16:48 +02:00
PreviewPass.py Merge branch 'master' into doxygen_to_restructuredtext_comments 2020-05-08 15:31:23 +02:00
PrinterOutputDevice.py Fix typo in a log warning message 2019-05-16 12:04:26 +02:00
PrintJobPreviewImageProvider.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
SingleInstance.py Consider user preference when opening project files from cli. 2019-10-01 11:54:53 +02:00
Snapshot.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
XRayPass.py show xray errors in solid view 2020-02-27 16:41:13 +01:00