23379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	cfc2cc3692	Fix crash when printer definition could not be found	2020-04-08 17:14:58 +02:00
Jaime van Kessel	7a11a183a8	Merge branch '4.6' of github.com:Ultimaker/Cura	2020-04-08 17:02:26 +02:00
Jaime van Kessel	caa348265d	Add check to prevent unknown materials from being active ... This should really resolve the key error for anycubics	2020-04-08 17:00:11 +02:00
Jaime van Kessel	e21262f0b3	Merge branch '4.6' of github.com:Ultimaker/Cura	2020-04-08 16:33:20 +02:00
Jaime van Kessel	f8326d2a6e	Fix setting of sentry_env for betas	2020-04-08 16:32:47 +02:00
Nino van Hooff	74253e420a	Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest ... CURA-7262 X-Ray in solid-view (colors instead)	2020-04-08 15:45:00 +02:00
Ghostkeeper	a2a77804cb	Correct Spanish translation ... It's not the temperature of the print layer. It's the temperature of the build plate. Fixes #7422.	2020-04-08 15:28:51 +02:00
Jaime van Kessel	849e012756	Gracefully handle binding erorr for local OAUTH2 Server ... CURA-7346	2020-04-08 13:08:12 +02:00
Nino van Hooff	e43768ebde	Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" ... This reverts commit 4f55c8d8	2020-04-08 11:06:31 +02:00
Ghostkeeper	be8f8a308e	Merge branch 'master' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-master	2020-04-07 18:07:39 +02:00
Jaime van Kessel	33b3bb77c3	Fix typing ... List wasn't added, so mypy borked. CURA-7055	2020-04-07 16:58:08 +02:00
Nino van Hooff	ff017e6a52	Remove unnecessary call to remove printer from qt model ... Since cloud printers are not added to that model anymore CURA-7055	2020-04-07 14:44:24 +02:00
Nino van Hooff	99b4b86052	Display max 3 printer names in the printer discover message ... CURA-7055	2020-04-07 14:43:26 +02:00
Nino van Hooff	22a06fca3b	Shorten new cloud printers message ... So the plural form also fits on one line CURA-7055	2020-04-07 13:50:24 +02:00
Ghostkeeper	3d399672d0	Select default extruder if a setting has an extruder nr that's not available ... Fixes Sentry issue CURA-G2.	2020-04-07 13:45:41 +02:00
Ghostkeeper	ea31d9d41b	Don't crash on moving empty groups down to build plate ... Empty groups don't have a bounding box. I don't know how an empty group could've gotten there but maybe there is something happening with a plug-in or something. Fixes Sentry issue CURA-FM.	2020-04-07 13:16:48 +02:00
Remco Burema	b7e6b2888a	Actually remove xray error image (because colors). ... part of CURA-7262	2020-04-07 12:57:07 +02:00
Remco Burema	5494a09eef	Make sure warning works for greyscale colors. ... part of CURA-7262	2020-04-07 12:46:32 +02:00
Remco Burema	b59d38e6c9	Replace warning image with triadic colors. ... part of CURA-7262	2020-04-07 12:06:13 +02:00
Nino van Hooff	0ec3e0972b	Add an image to the cloud printer sync message ... CURA-7055	2020-04-06 18:01:57 +02:00
Ghostkeeper	fc8cc3187d	Merge branch '4.6'	2020-04-06 17:20:34 +02:00
Ghostkeeper	95b5a176b8	Update translation file headers for Cura 4.6 ... Contributes to issue CURA-7344.	2020-04-06 17:19:59 +02:00
Ghostkeeper	e676308241	Update translation files with new strings in Cura 4.6 ... Contributes to issue CURA-7344.	2020-04-06 16:52:06 +02:00
Ghostkeeper	859adbf347	Update translation templates for Cura 4.6 ... These are the new translations for the next release of Cura. I generated them from my computer at home now, so all of the paths have changed... But they are just indications anyway.	2020-04-06 16:48:13 +02:00
Nino van Hooff	b141bb139e	Update documentation of _connectToActiveMachine ... CURA-7055	2020-04-06 15:04:39 +02:00
Nino van Hooff	52ef794c4d	Add a Message informing users of progress on cloud syncing printers. ... CURA-7055	2020-04-06 14:49:45 +02:00
Nino van Hooff	a80a5f36ff	Add a Message informing users of progress on cloud syncing printers. ... CURA-7055	2020-04-06 13:44:48 +02:00
Jaime van Kessel	02202328d8	Add Versionupgrader to bundled plugin list	2020-04-06 11:20:44 +02:00
Jaime van Kessel	82fa1823cc	Merge branch '4.6' of github.com:Ultimaker/Cura	2020-04-06 11:11:43 +02:00
Jaime van Kessel	ddc826af44	Add VersionUpgrade45 package to bundled list	2020-04-06 11:06:26 +02:00
Ghostkeeper	01ec607d40	Merge branch '4.6' ... Conflicts: resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.	2020-04-06 09:20:18 +02:00
Ghostkeeper	7be6412ef3	Correct heating up nozzle instead of build plate ... Otherwise this print won't work at all. It'll just keep waiting forever until the build plate has reached a temperature that is way out of spec. Applied at request of MaximeGL in #7280.	2020-04-06 09:19:08 +02:00
Ghostkeeper	de220a74bc	Don't update build volume when prime Z position is changed ... It doesn't affect the build volume, since we don't need to move the prime blob disallowed area. It is projected onto the build plate after all. Most likely this won't affect anyone since the prime Z position is a machine setting that can't normally be modified. But hey, it's a bit more precise anyway. Found during work on the Settings Guide.	2020-04-06 00:29:48 +02:00
Evg33	d3da609746	UNI3D Extruders	2020-04-05 19:00:51 +03:00
Evg33	293be8fdb9	UNI 3D Series printers	2020-04-05 18:44:34 +03:00
PurpleHullPeas	3cc6b0cb9a	Simplifying mp_mini_delta.def.json ... Removing minimum/maximum nozzle size, minimum layer_height, and minimum layer_height_0.	2020-04-04 23:22:17 -05:00
PurpleHullPeas	a1a7d48e46	Merge pull request #1 from Ultimaker/master ... Update to master	2020-04-04 22:42:50 -05:00
Remco Burema	60bd676b44	Shader: More use builtin rather than adhoc mix. ... part of CURA-7262	2020-04-03 21:24:35 +02:00
Matt Jani	20e58d7d54	Updated "What's New?"change log for 4.6 ... CURA-7299 4.6-beta	2020-04-03 16:02:00 +02:00
Nino van Hooff	4f55c8d832	Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects" ... This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.	2020-04-03 15:31:08 +02:00
Remco Burema	e23b9a94fa	Shader: Use builtin rather than mix ourselves. ... part of CURA-7262	2020-04-03 15:07:28 +02:00
Jaime van Kessel	ecd24cb446	Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura	2020-04-03 13:25:01 +02:00
Kostas Karmas	ef4921b72c	Merge branch '4.6'	2020-04-03 13:12:07 +02:00
maht	58d7eea7bb	Update change_log.txt	2020-04-03 12:45:09 +02:00
Nino van Hooff	3e46489b6b	Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects ... Cura 7333 fix reloading 3mf files with many objects	2020-04-03 12:41:22 +02:00
maht	48849a3ccd	Update change_log.txt	2020-04-03 12:41:09 +02:00
Nino van Hooff	4adf4dceb8	Automatically make discovered printers available to use. ... instead of the list of available printers to be connected CURA-7055	2020-04-03 12:02:27 +02:00
Kostas Karmas	4495cea8a4	Remove type of job to avoid type error ... If the type of the job is mentioned, the CI/CD system complains about reading the "private" variable _node of the job. CURA-7333	2020-04-03 11:20:09 +02:00
Remco Burema	9d19f4f2db	Merge pull request #7398 from Ultimaker/matt-staging ... Updated "What's New?"change log for 4.6	2020-04-03 11:07:44 +02:00
Kostas Karmas	8eb48672e1	Use the node id as identifier ... Now that libSavitar allows us to read the object id from the 3mf file, this id will be propagated as an id inside CuraSceneNodes and it will be used as an identifier to find the object that has to be refreshed. CURA-7333	2020-04-03 11:05:38 +02:00