23119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	e2e69f6646	Increment setting version to 13 ... Contributes to issue CURA-7282.	2020-04-01 15:14:01 +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
Kostas Karmas	b118a46630	Remove TODO message from 3mf reload function ... CURA-7333	2020-03-31 18:02:13 +02:00
Kostas Karmas	134541ee6e	Fix reloading multiple objects from 3mf file ... CURA-7333	2020-03-31 17:57:23 +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
Kostas Karmas	07e6cfa693	Merge branch '4.6'	2020-03-31 14:48:26 +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
Kostas Karmas	189c734145	Changed wrapMode to WordWrap, similar to master ... CURA-7332	2020-03-31 11:41:03 +02:00
Kostas Karmas	5581705a0f	Revert "Wrap the restart prompt text in Marketplace" ... This reverts commit 2978b09e26b30b3ce007db04fdb8ce05026f35fa.	2020-03-31 11:32:34 +02:00
Kostas Karmas	2978b09e26	Wrap the restart prompt text in Marketplace ... CURA-7332	2020-03-31 11:24:23 +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	da4bb127df	Add wordWrap to restart required message ... In some languages (and on some operating systems) the text would be cut off by the button	2020-03-31 10:56:03 +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
Jaime van Kessel	4682b9c4ae	Merge branch 'pp-plugin_pause-a-h_disarm' of https://github.com/ilyko96/Cura	2020-03-30 17:12:54 +02:00
konskarm	95cefbe895	Merge pull request #7368 from maukcc/master ... HMS434 update	2020-03-30 15:53:09 +02:00
konskarm	bba6a5cc39	Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder ... CURA-7162/Replace the default logobot.svg with a new placeholder	2020-03-30 15:05:37 +02:00
Ghostkeeper	2ee3e5b386	Don't remove machines that don't exist ... Fixes Sentry issue CURA-EM.	2020-03-30 14:10:59 +02:00
Ghostkeeper	f34edd6bec	Show error when we don't have permission to write workspace ... Fixes several Sentry issues, among which Cura-EG.	2020-03-30 14:00:36 +02:00
Ghostkeeper	6063307a31	Remove overrides of unused machine setting ... Contributes to issue CURA-7328.	2020-03-30 12:10:35 +02:00
Ghostkeeper	40fc064e98	Don't remove Nozzle Length ... Turns out this one was used: As default for the wire printing height. Contributes to issue CURA-7328.	2020-03-30 12:10:01 +02:00
Ghostkeeper	b5dfcdd482	Remove Nozzle Length and Filament Park Distance from the settings list ... Implements CURA-7328.	2020-03-30 12:00:59 +02:00
Ghostkeeper	8422172000	Increment setting version to 12 ... This is necessary for the version upgrade to run. Contributes to issue CURA-7328.	2020-03-30 11:54:18 +02:00
Ghostkeeper	bdb3c4bcad	Add version upgrade plug-in to remove settings ... Contributes to issue CURA-7328.	2020-03-30 11:48:38 +02:00
Ghostkeeper	be85e6d75e	Merge branch 'fieldOfView-feature_object_name'	2020-03-30 09:32:27 +02:00
maukcc	b92d0a83ac	HMS434 update	2020-03-29 14:21:57 +02:00
Jaime van Kessel	c1de3d49bb	Merge branch 'CURA-7325_fix_config_error_on_restore_backup' of github.com:Ultimaker/Cura	2020-03-27 14:44:03 +01:00
konskarm	cc365c23e1	Merge pull request #6994 from Ultimaker/ppscript_pre_secure ... Prepare PostProcessingPlugin for security.	2020-03-27 13:31:08 +01:00
Remco Burema	380e377cf3	Scout some documentation to docstring. ... part of CURA-7325	2020-03-26 18:26:14 +01:00
Remco Burema	3c50b78e68	Fix: Definitions could be partly saved between backup restore and quit. ... part of CURA-7325	2020-03-26 18:19:47 +01:00
Ghostkeeper	afea4a76e7	Merge branch 'feature_object_name' of https://github.com/fieldOfView/Cura into fieldOfView-feature_object_name	2020-03-26 17:39:25 +01:00
Nino van Hooff	0841124389	Merge pull request #7344 from Ultimaker/CURA-7310_Template_export_inkection_call_custom_openUrl ... Cura 7310 template export injection call custom open url	2020-03-26 15:40:39 +01:00
Ghostkeeper	92691f68b6	Reduce retraction at the end of all Anet g-code ... Multiple people have found this to work better. Fixes #7275.	2020-03-26 14:47:41 +01:00
Ghostkeeper	fd8c29ebbf	Merge branch 'master' of github.com:Ultimaker/Cura	2020-03-26 14:15:51 +01:00
Ghostkeeper	ae9f2b4ba9	Catch TopologicalError when calculating convex hull intersection ... Apparently this can happen. I don't know what shapes this happens with though. I'm guessing it's got something to do with degenerate shapes. Fixes Sentry issue CURA-DZ.	2020-03-26 14:15:38 +01:00
Remco Burema	e664eccb8d	Merge pull request #7299 from Ultimaker/CURA-7173_validate_uploads ... CURA-7173_validate_uploads	2020-03-26 12:05:19 +01:00
Deltacomb	f61051e4e7	New Machines Fixes (3)	2020-03-26 10:28:05 +01:00
Deltacomb	f81889a3bc	New Machines Fixes (2)	2020-03-26 10:04:33 +01:00
Nino van Hooff	ddd7d15287	Attempt to appease mypy	2020-03-26 09:45:26 +01:00
Deltacomb	9012dd7c52	Fixed IDs in extruders	2020-03-26 00:53:09 +01:00
Deltacomb	16bd9f4f1d	New Deltacomb Models and updates	2020-03-26 00:28:31 +01:00
Gabriele Rossetti	d196e77f72	Merge pull request #2 from Ultimaker/master ... Merge to master	2020-03-26 00:18:48 +01:00
Nino van Hooff	3bb3b69082	Attempt to appease mypy	2020-03-25 17:32:41 +01:00
Nino van Hooff	92f278acc8	Change trusted scripts path from resources to plugin/scripts ... CURA-7319	2020-03-25 16:54:43 +01:00
Nino van Hooff	6bf00d7ea1	Merge branch 'master' into ppscript_pre_secure	2020-03-25 16:25:44 +01:00
Ghostkeeper	433c9a9f60	Add SVGToolpathReader to gitignore ... I like to have no untracked files in my list. This is not going to get into our source repository anyway!	2020-03-25 16:08:26 +01:00
Jaime van Kessel	dec68002bc	Use patch.object to temporarily replace mock a function call ... CURA-7319	2020-03-25 12:35:15 +01:00