Cura/cura
Ghostkeeper b8ccb32836
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting.
	resources/definitions/ultimaker3.def.json
	resources/definitions/ultimaker_s3.def.json
	resources/definitions/ultimaker_s5.def.json
2021-11-12 15:08:29 +01:00
..
API Merge branch 'master' into CURA-8609_sync_materials_to_printer 2021-10-27 14:21:05 +02:00
Arranging Only show "can't find location message" when it couldn't find location 2021-10-28 13:53:52 +02:00
Backups Handle encoding errors in back-up zips 2021-09-21 14:20:59 +02:00
Machines Merge branch '4.12' of github.com:Ultimaker/Cura 2021-10-28 13:54:58 +02:00
OAuth2 Fix crash with login 2021-10-01 13:43:33 +02:00
Operations Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
PrinterOutput Fix binding printer_id to response callbacks 2021-10-27 14:06:04 +02:00
ReaderWriters Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Scene Merge pull request #9884 from Ultimaker/CURA-7873_fix_positioning_merged_meshes 2021-06-08 12:37:34 +02:00
Settings Don't use infinite lifetimes lightly 2021-11-09 14:45:40 +01:00
Stages Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
TaskManagement Fix various typos 2021-09-07 11:33:54 -04:00
UI Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
UltimakerCloud Remove message explaining what caused the error 2021-11-01 18:29:36 +01:00
Utils Remove trailing whitespace from Python files 2020-05-29 14:30:33 +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 Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
AutoSave.py Print how much time it took to autosave dirty profiles 2021-05-06 10:54:38 +02:00
BuildVolume.py Handle exception when adhesion extruder could not be found 2021-11-09 10:17:32 +01:00
CameraAnimation.py Merge pull request #905 from Ultimaker/snappier_camera_animation 2017-10-24 10:36:55 +02:00
CrashHandler.py Apply bitmask to user scope 2020-09-08 02:00:58 +02:00
CuraActions.py Add missing campaign tags 2021-08-09 12:59:29 +02:00
CuraApplication.py Merge branch 'master' into libArachne_rebased 2021-11-12 15:08:29 +01: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 Add the CURA_DIGITAL_FACTORY_URL variable 2020-09-14 21:15:32 +02:00
CuraView.py Fix various typos 2021-09-07 11:33:54 -04:00
Layer.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
LayerData.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
LayerDataBuilder.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
LayerDataDecorator.py Converted comments in dir Cura/cura to rst style 2020-04-21 16:58:45 +02:00
LayerPolygon.py Fix various typos 2021-09-07 11:33:54 -04:00
MachineAction.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
MultiplyObjectsJob.py Push the grouped operation instead of redoing it 2021-10-06 16:46:20 +02:00
OneAtATimeIterator.py Exclude objects outside buildplate from OneAtATimeIterator 2020-10-14 17:14:38 +02:00
PickingPass.py Fix various typos 2021-09-07 11:33:54 -04:00
PlatformPhysics.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
PreviewPass.py Part of fix for crash on context menu open + click on slice. 2021-07-30 19:50:18 +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 Merge branch 'feature_single_instance_clear_before_load' of https://github.com/fieldOfView/Cura 2021-09-15 16:18:54 +02:00
Snapshot.py Part of fix for crash on context menu open + click on slice. 2021-07-30 19:50:18 +02:00
XRayPass.py Pass the cached normal transformation to the rendere 2020-06-30 13:39:32 +02:00