3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
Cura/cura
History
Ghostkeeper b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
2018-10-15 16:52:22 +02:00
..
API Ensure that CuraAPI can be called in the same way as before 2018-10-02 10:42:15 +02:00
Arranging Fix code-style 2018-07-03 12:06:06 +02:00
Backups Fix getting cura application instance 2018-10-01 15:37:28 +02:00
Machines Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
OAuth2 Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth 2018-09-28 14:32:16 +02:00
Operations Add missing super init call - CURA-4525 2018-01-04 10:59:44 +01:00
PrinterOutput Merge branch 'master' into fieldOfView-feature_firmware_updater 2018-10-15 16:52:22 +02:00
ReaderWriters Create module cura.ReaderWriters 2018-04-05 15:14:15 +02:00
Scene Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Settings Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-11 16:42:11 +02:00
Stages Code cleanup 2018-05-16 19:25:19 +02:00
TaskManagement Fix code style 2018-07-13 09:21:35 +02:00
Utils CURA-5035 Remove uncessary VersionTools 2018-04-26 13:17:00 +02:00
__init__.py T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
AutoSave.py Merge branch 'master' into WIP_improve_initialization 2018-05-25 09:40:42 +02:00
BuildVolume.py Don't show prime tower shadow if only one extruder is enabled 2018-10-04 11:36:02 +02:00
CameraAnimation.py Merge pull request #905 from Ultimaker/snappier_camera_animation 2017-10-24 10:36:55 +02:00
CameraImageProvider.py Document CameraImageProvider 2018-10-13 16:40:26 +02:00
CrashHandler.py Move factory reset to Uranium 2018-03-28 08:43:46 +02:00
CuraActions.py Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
CuraApplication.py Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +02:00
CuraPackageManager.py Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
CuraSplashScreen.py Fix size of "beta" classifier on splash screen for HiDPI (windows) screens 2017-10-16 14:51:59 +02:00
CuraVersion.py.in Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt 2018-05-30 09:18:45 +02:00
Layer.py CURA-4526 Delete LayerView plugin because it will be replaced with the 2017-11-21 10:47:29 +01:00
LayerData.py Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
LayerDataBuilder.py CURA-4526 Delete LayerView plugin because it will be replaced with the 2017-11-21 10:47:29 +01:00
LayerDataDecorator.py T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
LayerPolygon.py Remove trailing whitespace 2018-08-24 15:24:00 +02:00
MachineAction.py Fix generating view for machine action - CURA-4568 2017-11-28 15:18:05 +01:00
MachineActionManager.py WIP: Make application initialization and start up more clear 2018-05-04 09:57:02 +02:00
MultiplyObjectsJob.py FindNodePlacement should find a placement for the node, but not creating 2018-06-13 11:28:20 +02:00
ObjectsModel.py Convert name check to defaultdict 2018-08-29 17:43:22 -04:00
OneAtATimeIterator.py Fix code style. 2018-08-15 09:14:37 +02:00
PickingPass.py Fix some more code-style 2018-07-03 13:09:05 +02:00
PlatformPhysics.py Do not move locked nodes 2018-06-11 14:45:46 +02:00
PreviewPass.py Add types for ShaderPrograms 2018-06-15 11:34:35 +02:00
PrinterOutputDevice.py Remove unused imports 2018-10-09 17:06:20 +02:00
PrintInformation.py Added unittest for PrintInformation class 2018-09-28 10:46:14 +02:00
PrintJobPreviewImageProvider.py Add typings and fix code style 2018-09-06 16:57:45 +02:00
SingleInstance.py Fix code-styling 2018-07-03 17:57:30 +02:00
Snapshot.py Add non-thumbnail-visible flag for creating previews 2018-05-23 16:32:38 +02:00