7221 Commits

Author	SHA1	Message	Date
Ghostkeeper	519d28a142	Fix upgrading user containers, which list the printer definition rather than the extruder	2020-04-09 21:52:23 +02:00
Ghostkeeper	e38b79fe35	Filenames don't include an extension ... That makes this a lot easier actually.	2020-04-09 21:36:28 +02:00
Ghostkeeper	4bdea50fd5	Use deepcopies rather than copies to copy parsers ... Turns out that the parsers apparently refer to a lot of subobjects which are crucial here, and they don't implement the normal copy well. Deepcopy it is then.	2020-04-09 21:26:35 +02:00
Ghostkeeper	accf080fb6	Don't use default= kwarg for dictionary .get function ... It doesn't accept key word arguments.	2020-04-09 21:22:06 +02:00
Ghostkeeper	40cb3e37a9	Also actually update global stacks for Deltacomb ... Really hope that this works.	2020-04-09 01:48:15 +02:00
Ghostkeeper	18ebdfafb7	Upgrade other per-extruder instance containers too ... Global instance containers will also go through this function but won't get picked out by the if statement here.	2020-04-09 01:23:11 +02:00
Ghostkeeper	2410d05100	Upgrade extruder stacks ... Stupid stuff. All of these containers need to be copied. It's not possible to work this out for all materials properly, since we can't read into these materials what their GUIDs and material types are.	2020-04-09 01:04:53 +02:00
Ghostkeeper	a5b4b15ae4	Add theoretical upgrade for definition changes ... It's a LOT more work than I thought, because the new printer has 4 extruders instead of 2. That means that files have to be copied for the other two extruders. A big hassle.	2020-04-08 01:58:03 +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
Kostas Karmas	189c734145	Changed wrapMode to WordWrap, similar to master ... CURA-7332	2020-03-31 11:41:03 +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
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	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	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	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	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
konskarm	cc365c23e1	Merge pull request #6994 from Ultimaker/ppscript_pre_secure ... Prepare PostProcessingPlugin for security.	2020-03-27 13:31:08 +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
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
Nino van Hooff	ddd7d15287	Attempt to appease mypy	2020-03-26 09:45:26 +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
Jaime van Kessel	dec68002bc	Use patch.object to temporarily replace mock a function call ... CURA-7319	2020-03-25 12:35:15 +01:00
Jaime van Kessel	d5b58cf3b4	Add missing typing	2020-03-25 11:47:38 +01:00
Ghostkeeper	2b003c30dc	Catch PermissionError when writing workspaces ... We'll want to give a proper error message then. We have no mechanism right now to show a message on the screen particular to this error. Instead we'll let it fail (the user sees a message that writing fails) and put a message in the log why it failed. Fixes Sentry error CURA-DK.	2020-03-25 09:12:14 +01:00
Kostas Karmas	136fc90f48	Merge branch 'master' into CURA-7310_Template_export_inkection_call_custom_openUrl	2020-03-24 16:59:27 +01:00