23284 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	75aafa1e5c	Don't crash if rendering without any window ... Probably it'll still crash somewhere else then, but we'll rely on Sentry to find that for us. Fixes Sentry issue CURA-KW.	2020-04-23 13:41:06 +02:00
Ghostkeeper	29d2e5c921	Don't crash if USB device is taken over by other applications or breaks ... If it happens at just the wrong moment, Cura could crash. Hopefully no longer, though I fear that now it would maybe crash somewhere else with the same error then. We'll find out through new error reports, I hope. Fixes Sentry issue CURA-K8.	2020-04-23 13:07:48 +02:00
Nino van Hooff	971d8cd8e2	Remove leftover debug code from ChangeAtZ.py ... CURA-7146	2020-04-23 11:48:50 +02:00
Jaime van Kessel	0bf862f9a9	Merge branch 'master' of github.com:Ultimaker/Cura	2020-04-23 11:39:04 +02:00
Jaime van Kessel	45dc8bcc68	Fix warnings about output device not being detected ... CURA-7055	2020-04-23 11:38:34 +02:00
Ghostkeeper	add9be387b	Fix crash when creating a socket before the plug-in is fully registered ... The plug-in ID is set once the register function is completed, so after initialisation. If the _createSocket function is called in between, Cura would crash. I don't know why the _createSocket function would be called in between, but possibly another plug-in causes an event that calls it since it's being called on many events (everything that would initiate a reslice). Fixes Sentry issue CURA-K4.	2020-04-23 11:38:27 +02:00
Ghostkeeper	d9cdea9496	Don't crash when material file is missing ... This could happen because a material is deleted right at that moment, since the SendMaterialJob is done on a separate thread. Fixes Sentry issue CURA-JZ.	2020-04-23 11:10:52 +02:00
Jaime van Kessel	be43383474	Merge branch 'master' of github.com:Ultimaker/Cura	2020-04-23 11:08:09 +02:00
Jaime van Kessel	6746106608	Also connect with cloudOutput device if it was added ... CURA-7055	2020-04-23 11:07:21 +02:00
Jaime van Kessel	7c7c1ad96c	Fix remote_clusters not being added in second boot ... CURA-7055	2020-04-23 10:58:16 +02:00
Strahler85	83adb98a5f	Add nozzle profiles for Ender 3 pro ... These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name. Fixes #7550.	2020-04-23 00:30:01 +02:00
Ghostkeeper	a0dc78cb39	Merge branch 'master' of https://github.com/dpodhola/Cura into dpodhola-master	2020-04-22 19:04:53 +02:00
Jaime van Kessel	13105cfbd7	Merge branch 'master' of github.com:Ultimaker/Cura	2020-04-22 17:20:59 +02:00
Nino van Hooff	ec334e0891	Merge pull request #6778 from novamxd/master ... ChangeAtZ 5.2.0	2020-04-22 16:18:27 +02:00
Nino van Hooff	6bbfd14d00	Merge pull request #7443 from Ultimaker/CURA-7055_auto_add_cloud_printers ... CURA-7055_auto_add_cloud_printers	2020-04-22 16:05:40 +02:00
Jaime van Kessel	967488095b	Fix weird wording. ... Whoops. It's only been there for a year...	2020-04-22 15:43:38 +02:00
Remco Burema	d078c465ee	Reduce branches in shader. ... part of the further fallout of CURA-7147	2020-04-22 11:51:21 +02:00
Remco Burema	7ed59503d6	Round doesn't work for OpenGL 2.1 because it was only added in glsl 130. ... So mad at myself right now >:-( Part of the further fallout of CURA-7147	2020-04-22 11:49:27 +02:00
Ghostkeeper	888937d03b	Use initial layer bed/print temperatures ... These are more likely what the user wants the printer to start up to. Fixes #7505.	2020-04-22 11:39:10 +02:00
konskarm	cf604c0f20	Merge pull request #7497 from maukcc/master ... HMS434 update	2020-04-21 16:50:22 +02:00
Kostas Karmas	ad6f837f44	Force reloading the VariantNode if it exists ... When the MachineNode is updated through _loadAll, it was not updating its VariantNodes when they already existed. This caused an issue to UM2+Olsson block printers, where changing the G-Code flavor to Marlin was not updating the VariantNodes to search for materials (since the variants already existed). This commit fixes that by forcing an update to the existing Variant nodes. CURA-7354	2020-04-21 14:41:17 +02:00
Ghostkeeper	29b0bd1b23	Merge branch '4.6'	2020-04-21 12:04:01 +02:00
Ghostkeeper	c73082616c	Merge branch 'CURA-7383_sdk_ver_7_2_0' into 4.6	2020-04-21 12:03:47 +02:00
Ghostkeeper	085462667e	Merge branch 'CURA-7383_sdk_ver_7_2_0'	2020-04-21 12:03:28 +02:00
Nino van Hooff	7302e8ba7f	Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 ... CURA-7383	2020-04-21 11:46:12 +02:00
Ghostkeeper	e1308f0768	Merge branch '4.6'	2020-04-21 11:42:23 +02:00
Ghostkeeper	f38ae5bb96	Fix i18n catalog for per-object settings panel ... Turns out that all of these had not been working properly for a while. Contributes to issue CURA-7344.	2020-04-21 11:39:49 +02:00
Nino van Hooff	8e5d331e6b	Merge pull request #7536 from Ultimaker/mahtDFR-patch-1 ... Updated change log CURA-7380	2020-04-21 11:05:59 +02:00
Nino van Hooff	e3bc304d5d	Update sdk version to 7.2.0 ... CURA-7383	2020-04-21 11:00:06 +02:00
maukcc	59f105c1b9	HMS434 update ... wipe codes changed	2020-04-20 15:50:11 +02:00
Jaime van Kessel	020f66b245	Add option to overhang shader to make rendering model errors optional ... CURA-7147	2020-04-20 15:11:28 +02:00
maht	aa224dc673	Update change_log.txt	2020-04-20 15:00:32 +02:00
Jaime van Kessel	9a2d2d32bf	Remove code that prevents Cura from starting on MAC ... The renderer isn't active when the view is activated. As such, no opengl context *ever* exists. In some cases this might cause it to get stuck in an indefinate loop. The comments around it are explaining a situation that can't occur. The activateView event of SolidView isn't triggered when switching to another view...	2020-04-20 13:52:40 +02:00
maht	b190870897	Updated change log CURA-7380	2020-04-20 12:50:00 +02:00
Nino van Hooff	40bc3e247f	Merge remote-tracking branch 'origin/4.6' into 4.6	2020-04-20 11:58:12 +02:00
Nino van Hooff	e9cff28c5a	Add Taiwanese translations for 4.6 ... CURA-7344	2020-04-20 11:27:12 +02:00
Jaime van Kessel	3af44cb634	Ensure consistant spacing	2020-04-20 11:05:33 +02:00
Jaime van Kessel	ecdaecf1db	Merge branch 'patch-1' of https://github.com/skriDude/Cura	2020-04-20 11:03:08 +02:00
Jaime van Kessel	94f8b7dcd7	Merge branch 'optimise_obj_meshes' of github.com:Ultimaker/Cura	2020-04-20 10:46:36 +02:00
novamxd	096198ec9a	Revamped ChangeAtZ ... Removed some derpug code	2020-04-19 04:47:54 -05:00
Dan Podhola	0bf6b457dd	Changed M420 to G29 to stop the machine from auto-homing and inadvertantly drawing a triangle	2020-04-18 13:20:07 -07:00
Ghostkeeper	fb4aec96a8	Decimate mesh models that were oversized ... We have a guideline for 1MB. I thought we had a unit test for that that makes the tests fail if the models were oversized. But apparently not.	2020-04-18 21:23:13 +02:00
skriDude	933c44374d	Removed unnecessary parameters.	2020-04-17 17:17:39 +02:00
maukcc	f3093d6bc8	HMS434 update ... roofing layers disabled	2020-04-17 12:08:21 +02:00
Kostas Karmas	e49d5f9156	Fix trailing slash in wanhao printers ... CURA-7358	2020-04-16 18:00:57 +02:00
Nino van Hooff	0dda9df420	Merge pull request #7519 from Ultimaker/CURA-7329_Decrease_error_calculation_per_object_stack ... Only check changed settings (and whatever it affects) for errors in POS	2020-04-16 17:01:50 +02:00
Jaime van Kessel	2da965e46e	Merge branch 'CURA-7147_preview_img_for_cloud' of github.com:Ultimaker/Cura into 4.6	2020-04-16 15:11:20 +02:00
Nino van Hooff	073a7fdce6	Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" ... This reverts commit 4f55c8d8. Since there was a merge conflict, this commit will be left empty.	2020-04-16 14:49:33 +02:00
Jaime van Kessel	9ec606af5c	Merge branch '4.6' of github.com:Ultimaker/Cura	2020-04-16 13:25:04 +02:00
Jaime van Kessel	ab62ac6e01	Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6	2020-04-16 13:17:40 +02:00