21225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	ea7211f0f6	Fix spelling	2019-08-09 11:27:39 +02:00
ChrisTerBeke	669e64afdb	Move cloud flow message to correct folder	2019-08-09 10:09:54 +02:00
Ghostkeeper	7e033fa22f	Merge branch 'mb-fix-layer-polygon-bounds-error' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-layer-polygon-bounds-error	2019-08-09 09:55:15 +02:00
Remco Burema	bcaba58f40	Merge branch 'smartavionics-mb-small-features-slowdown'	2019-08-09 09:25:20 +02:00
ChrisTerBeke	11ef53905b	Fix refresh button functionality for network printing	2019-08-09 09:24:32 +02:00
ChrisTerBeke	5bdef34121	Merge pull request #6177 from Ultimaker/CS-251_add_manage_printer_link ... CS-251 Add manage printer link	2019-08-08 22:51:52 +02:00
ChrisTerBeke	a063c33d4c	Fix target URL for cloud links in monitor page	2019-08-08 22:47:07 +02:00
Ghostkeeper	81fce5d779	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2019-08-08 20:51:21 +02:00
Remco Burema	ff8a69712f	Add new settings (slow for small hole/feature) to expert-visibility. ... part of CURA-6464	2019-08-08 18:51:56 +02:00
Remco Burema	862cdf80a7	Constrain already warned users less. ... part of CURA-6464	2019-08-08 17:37:43 +02:00
Ghostkeeper	d710a58233	Don't require VariantManager any more from CuraStackBuilder ... We now use the new container tree structure there. Contributes to issue CURA-6600.	2019-08-08 17:31:26 +02:00
Ghostkeeper	e106692165	Make ContainerTree singleton but construct in run() of application ... We want to make sure that this tree is constructed during start-up after all containers have been registered, so we call getInstance() there once. If you need the tree before that, the tree will not yet have been filled and you won't get complete information, so you'd need to listen for updates. The singleton is there so you don't need to go via CuraApplication. Contributes to issue CURA-6600.	2019-08-08 17:30:24 +02:00
Ghostkeeper	65360c31ef	Let Quality/Material/Variant Managers be a proper singleton ... Rather than a singleton contained within the CuraApplication class. Contributes to issue CURA-6600.	2019-08-08 17:04:53 +02:00
Remco Burema	4c56205e61	Merge branch 'mb-small-features-slowdown' of https://github.com/smartavionics/Cura into smartavionics-mb-small-features-slowdown	2019-08-08 16:43:11 +02:00
Ghostkeeper	f31d7798ce	Add warning for adding local copies of metadata ... Contributes to issue CURA-6600.	2019-08-08 16:26:38 +02:00
Lipu Fei	00b5abda94	Merge pull request #5935 from trouch/feature/z-seam-position ... feat: "Z-Seam Position" presets to ease XY setting	2019-08-08 15:56:41 +02:00
Remco Burema	0b27119001	Fix encoding/decoding issues (Windows) for i18n import script. ... part of CURA-6663	2019-08-08 15:47:05 +02:00
Ian Paschal	9a29c77228	Remove debug property ... Contributes to CS-251	2019-08-08 15:23:29 +02:00
Ian Paschal	1aed8a1fa5	Add manage printer link ... Contributes to CS-251	2019-08-08 15:20:37 +02:00
Lipu Fei	606bc851a8	Simplify value formula	2019-08-08 15:18:11 +02:00
Lipu Fei	35e452d392	Set default to false	2019-08-08 15:16:45 +02:00
Jaime van Kessel	e2596e64ef	Add tests for quality node	2019-08-08 14:11:00 +02:00
Jaime van Kessel	c26d113002	Add test for the MaterialNode ... CURA-6600	2019-08-08 13:52:45 +02:00
Jaime van Kessel	a8fbb80b09	Add tests for the updating of MaterialNodes in the variant node ... CURA-6600	2019-08-08 10:46:24 +02:00
Ghostkeeper	648999e32b	Use regex literal instead of normal literal for regex ... Hopefully this fixes the deprecation warning in newer Python versions. Contributes to issue #6114.	2019-08-08 09:46:21 +02:00
Jaime van Kessel	476c7b683d	Extend variant node test to also test the material added case ... CURA-6600	2019-08-07 17:23:12 +02:00
Jaime van Kessel	2683c31975	Add initial tests for variantNode ... CURA-6600	2019-08-07 17:04:39 +02:00
Jaime van Kessel	6e5b0bb609	Fix the filtering of materials based on exclude_materials ... CURA-6600	2019-08-07 17:03:41 +02:00
Jaime van Kessel	fa077038fc	Add tests for the MachineNode	2019-08-07 16:17:46 +02:00
Jaime van Kessel	a241425aaf	Add test for ContainerTree ... CURA-6600	2019-08-07 15:35:22 +02:00
Jaime van Kessel	2d4fd5649d	Merge branch 'CURA-6686_fix_resize_autodrop' of github.com:Ultimaker/Cura	2019-08-07 11:41:27 +02:00
Diego Prado Gesto	f9014feb33	Change the default values of the retracted position ... It was a mistake not to change it when we decided to use negative values for those fields.	2019-08-07 11:03:00 +02:00
Jaime van Kessel	a3cc991706	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-07 10:47:19 +02:00
Jaime van Kessel	7a3f9d621a	Add save shortcut to save ... No idea why it wasn't there in the first place.	2019-08-07 10:46:51 +02:00
Lipu Fei	12e794fe50	Remove has_machine_materials and has_variant_materials ... They are not used.	2019-08-07 10:44:02 +02:00
Ghostkeeper	accc4ccd21	Only remove excluded materials that were added ... Contributes to issue CURA-6600.	2019-08-07 09:50:53 +02:00
ChrisTerBeke	70d7bcd412	Merge pull request #6170 from Ultimaker/CS-234_network_plugin_improvements_part_2 ... CS-234: Network plugin improvements	2019-08-07 09:23:20 +02:00
ChrisTerBeke	2ed033da7c	Add specific message when connecting to slave, prevent duplicate messages	2019-08-07 01:02:46 +02:00
ChrisTerBeke	8a2e394abc	Fix adding by manual IP, code improvements	2019-08-07 00:38:07 +02:00
ChrisTerBeke	ac177659e5	Fixes for add by IP	2019-08-06 21:46:37 +02:00
Remco Burema	3b1674200d	Drop down to buildplate after resize (fix). ... CURA-6686	2019-08-06 17:07:22 +02:00
Ghostkeeper	8e49991087	Resolve circular imports ... Some of these are only used for the type checks. Contributes to issue CURA-6600.	2019-08-06 17:04:29 +02:00
Ghostkeeper	b05784e607	Remove subprofiles from intent nodes ... As the documentation says, it has no subprofiles any more. Contributes to issue CURA-6600.	2019-08-06 16:49:06 +02:00
Ghostkeeper	a0d3cb6742	Make QualityNode part of our normal tree structure ... It now constructs itself and its contents automatically. No need for a QualityManager to keep it up to date any more. Contributes to issue CURA-6600.	2019-08-06 16:46:28 +02:00
Ghostkeeper	8ec1c31b58	Don't make parent a common property ... Instead we use properly-typed and appropriately-named variables in each of the sub classes. Contributes to issue CURA-6600.	2019-08-06 16:31:57 +02:00
Ghostkeeper	d3dc36c187	Find quality nodes as subnodes of material nodes ... Similar to the materials and variants. Contributes to issue CURA-6600.	2019-08-06 16:19:30 +02:00
Ghostkeeper	24346fc8e3	Don't add materials forbidden by the printer definition ... Contributes to issue CURA-6600.	2019-08-06 15:21:52 +02:00
Ghostkeeper	3ef0b4292d	Only add variants that fit on my machine ... Contributes to issue CURA-6600.	2019-08-06 15:15:02 +02:00
Ghostkeeper	bc3300baa8	Assume that the tree is always constructed after metadata has been loaded ... Safe assumption, since the tree can only start constructing after the stacks are loaded. Contributes to issue CURA-6600.	2019-08-06 15:13:29 +02:00
Ghostkeeper	b46d4eb2b5	Have variant nodes build their own children ... When a variant and a variant love each other... Contributes to issue CURA-6600.	2019-08-06 15:11:16 +02:00