7263 Commits

Author	SHA1	Message	Date
Kostas Karmas	7b464e5550	Close welcome wizard when user has cloud printers ... If the user signs in during the welcome process, if he/she has cloud printers connected to his/her account, then the welcome wizard will close so that the user will not be asked to add local printers. CURA-7019	2020-04-20 15:06:31 +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
Jaime van Kessel	14f9228a1d	Merge branch '4.6' of github.com:Ultimaker/Cura into 4.6	2020-04-16 13:17:30 +02:00
Ghostkeeper	9f38374960	Also track Z coordinates and retract extra for the distance travelled then ... Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way. Fixes #7458.	2020-04-15 18:37:13 +02:00
Nino van Hooff	db758a7e19	Add None-checks to CloudPackageChecker ... Might help prevent the sync message to show multiple times CURA-7364	2020-04-15 17:16:38 +02:00
Jaime van Kessel	7d312f2f24	Merge branch 'master' of github.com:Ultimaker/Cura	2020-04-15 12:25:19 +02:00
Jaime van Kessel	d49cca3b8b	Add warning for when libsavitar is not up to date	2020-04-15 12:25:00 +02:00
Kostas Karmas	ea2eb2ce41	Merge branch '4.6'	2020-04-14 18:14:39 +02:00
konskarm	6241ca736e	Merge pull request #7498 from Ultimaker/CURA-7343_network_troubleshooting_link ... CURA-7343_network_troubleshooting_link	2020-04-14 18:12:22 +02:00
Nino van Hooff	214e41f983	Use a more specific link for the network troubleshooting guide ... CURA-7434	2020-04-14 16:55:36 +02:00
Jaime van Kessel	2e9dca71ce	Remove a number of unused imports	2020-04-10 13:58:10 +02:00
Jaime van Kessel	fe27da5e8a	Remove a number of unused variables	2020-04-10 13:46:19 +02:00
Jaime van Kessel	6a6ad6e815	Remove unneeded semicolons	2020-04-10 13:34:57 +02:00
Ghostkeeper	96003c1335	Fix unassigned variable 'theme' ... Contributes to issue CURA-7357.	2020-04-10 11:53:54 +02:00
Ghostkeeper	2f4a702606	Merge branch '4.6'	2020-04-10 11:25:17 +02:00
Ghostkeeper	9c55ae5ac5	Allow print job actions from 5.2.12 ... This feature was backported to 5.2 so that UM3 can actually do this as well.	2020-04-10 10:39:18 +02:00
Ghostkeeper	1047cdd76c	Catch OSError when actually writing the UFP stream ... This includes getting an error message when we don't have write access any more or when the file was deleted or connection lost while we were writing to it. Fixes Sentry issue CURA-GX.	2020-04-09 14:55:14 +02:00
Ghostkeeper	c79d7d89b3	Merge branch '4.6'	2020-04-09 11:29:27 +02:00
Ghostkeeper	d5166030d7	Don't detect retractions if E is almost equal, but rounding errors ... Contributes to issue CURA-7351.	2020-04-09 11:27:40 +02:00
Ghostkeeper	9b997d421b	Keep current_e updated even if not finding retractions ... Otherwise the new E is never going to be lower than the current E. I don't know how this ever worked then. Contributes to issue CURA-7351.	2020-04-09 11:22:05 +02:00
Ghostkeeper	d9649dc3dd	Reduce indentation and complexity by using a pre-check ... Contributes to issue CURA-7351.	2020-04-09 11:03:10 +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
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
Remco Burema	b7e6b2888a	Actually remove xray error image (because colors). ... part of CURA-7262	2020-04-07 12:57:07 +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
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
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
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
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
Ghostkeeper	4f50f42796	Merge branch '4.6'	2020-04-02 17:21:03 +02:00
Jaime van Kessel	6df2f84c07	Prevent crash when releasing released lock ... CURA-C2	2020-04-02 16:51:32 +02:00
Jaime van Kessel	8ba71fde44	Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura	2020-04-02 14:34:17 +02:00
Remco Burema	8d6cbdf673	Fix long materials title causes misalign. ... CURA-7240	2020-04-01 17:57:33 +02:00
Remco Burema	07569c6b88	Fix extra line after plugin/materials list. ... CURA-7240	2020-04-01 17:54:56 +02:00
Ghostkeeper	4edef85346	Code style: Space around binary operators ... Contributes to issue CURA-7240.	2020-04-01 17:35:40 +02:00
Ghostkeeper	869f26a5ba	Fix crash when entering nonsense numbers like '-' ... We shouldn't accept those in the input field at all in my opinion but that is for another time. Fixes Sentry issue CURA-F5.	2020-04-01 16:34:49 +02:00
Ghostkeeper	2aeca3ef8c	Add version upgrade for 4.6 to 4.7 to halve the maximum deviation ... Contributes to issue CURA-7282.	2020-04-01 15:05:18 +02:00
Ghostkeeper	81df313f3a	Fix documentation for upgrade functions ... There are no settings to rename. That documentation was outdated.	2020-04-01 14:58:30 +02:00
Remco Burema	90ffa2a772	Explain empty installed materials/plugins brackets. ... part of CURA-7240	2020-03-31 16:56:45 +02:00
Jaime van Kessel	c764326c25	Fix marketplace installed plugins/materials empty rectangle ... CURA-7240	2020-03-31 15:57:08 +02:00
konskarm	cbccb08103	Merge pull request #7370 from Ultimaker/CURA-7328_remove_unused_machine_settings ... Remove unused machine settings	2020-03-31 14:41:41 +02:00
Remco Burema	d89fce6240	Order bundled/installed packages/materials section. ... And other finishing touches. part of CURA-7240	2020-03-31 12:02:46 +02:00
Remco Burema	85490dc58a	[Marketplace] De-emphasize pre-installed packages. ... Tried to do it the elegant way, couldn't get that to work within timebox. part of CURA-7240	2020-03-31 11:52:55 +02:00
fieldOfView	ccc0589495	Remove the checkbox option to set the preference to hide the messagebox	2020-03-31 11:50:16 +02:00
Kostas Karmas	189c734145	Changed wrapMode to WordWrap, similar to master ... CURA-7332	2020-03-31 11:41:03 +02:00
fieldOfView	b7898b5a97	Change preference to only hide the xray message, not the visualization	2020-03-31 11:39:05 +02:00
fieldOfView	a2f9eac23b	Remove unused import	2020-03-31 11:29:34 +02:00
Kostas Karmas	6b6446e201	Wrap the restart prompt text in Marketplace ... CURA-7332	2020-03-31 11:22:07 +02:00
Jaime van Kessel	329c5c5c11	Rename pause duration to disarm timeout and set default to give same behavior as before ... The name wasn't really covering what it was doing. It wasn't setting the duration of the pause, it was setting the timeout for the stepper disarm. Also, ive set the defaults so that the behavior remains the same, unlesss a user explicitly enables this CURA-7331	2020-03-30 17:20:59 +02:00