6464 Commits

Author	SHA1	Message	Date
Ghostkeeper	b2cee850c9	Use container tree to find current available quality groups ... Contributes to issue CURA-6600.	2019-08-28 08:58:03 +02:00
Ghostkeeper	cb344f9dec	Fix serialising materials without nozzle profile again ... Oops. This is simpler anyway. Contributes to issue CURA-6600.	2019-08-27 17:21:21 +02:00
Ghostkeeper	924d4cc13b	Remove unused container_tree variable ... Contributes to issue CURA-6600.	2019-08-27 17:21:20 +02:00
Ghostkeeper	20be7fd8a1	Don't add to variant-specific mapping if it's not variant-specific ... Otherwise we'll encounter that the variant name is None when serialising that subprofile. Contributes to issue CURA-6600.	2019-08-27 16:06:09 +02:00
Remco Burema	c333e980dc	Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree	2019-08-27 15:50:21 +02:00
Ghostkeeper	dabd905853	Fix serialising materials with submaterials in not loaded container trees ... Material profiles need to serialise subprofiles that belong to different printers as well. Some of these materials may not be loaded in the ContainerTree structure. To prevent having to load that as well, we're just not going to use the container tree any more. It turns out that the only reason it was using the container tree was to get the hardware_type metadata from the node in the tree. So just get that from the container itself and we're fine. Contributes to issue CURA-6600.	2019-08-27 15:47:42 +02:00
Ghostkeeper	b60b13e5bf	Use container tree to check for variants when serialising ... Not the variant manager, because it's deprecated. Contributes to issue CURA-6600.	2019-08-27 15:47:41 +02:00
Remco Burema	d5a8b2640f	Fix 'getQualityChangesGroups' now gives a list issues. ... part of CURA-6600	2019-08-27 15:46:47 +02:00
Jaime van Kessel	d1a8ce54a1	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-08-27 14:18:41 +02:00
Jaime van Kessel	1d9d411732	Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent	2019-08-27 14:17:57 +02:00
Jaime van Kessel	e8cd5723c9	Speedup the layerview ... We were doing a lot of re-calculations that served no purpose (and even slowed down the rest of the application)	2019-08-27 13:26:55 +02:00
Jaime van Kessel	ea11187eaf	Don't reset the data when the root updates ... Resolves #6258	2019-08-27 13:18:11 +02:00
Jaime van Kessel	511eba28b6	Ensure that min/max feedrate & thickness gets defined in init	2019-08-27 13:06:33 +02:00
Jaime van Kessel	9c2f8a94d5	Greatly simplify the SimulationViewProxy	2019-08-27 13:03:23 +02:00
Jaime van Kessel	ced14c7daf	Merge branch 'CURA-6388_restore_missing_metadata' of github.com:Ultimaker/Cura	2019-08-27 11:43:27 +02:00
Jaime van Kessel	bf66388939	Make functions that should have been static, static.	2019-08-27 11:41:21 +02:00
Jaime van Kessel	43d1157aa1	Fix typing error ... CURA-6388	2019-08-27 11:38:25 +02:00
Lipu Fei	946ec1d32e	Apply missing metadata fields from project files ... CURA-6388	2019-08-26 15:40:34 +02:00
Ian Paschal	f5af418b03	Merge pull request #6247 from Ultimaker/feature_ms_slots ... Support available configurations for network printing	2019-08-26 11:34:06 +02:00
Ghostkeeper	23f4aa6e4f	Fix potential race condition when slice messages arrive after clearing build plate ... Fixes #6245.	2019-08-26 09:15:37 +02:00
ChrisTerBeke	c491d7f3e2	Some reformatting	2019-08-23 10:40:17 +02:00
ChrisTerBeke	d674494cdb	Don't look at available configurations when no slots are available	2019-08-23 10:10:44 +02:00
ChrisTerBeke	3578afd4ac	Add support for multiple available configurations via network and cloud	2019-08-22 23:47:07 +02:00
Ghostkeeper	9122d0cca4	Remove misleading text that says you could enter hostnames ... We don't resolve the hostnames ever. You can only enter IP addresses.	2019-08-21 09:56:32 +02:00
Remco Burema	5039d8db05	Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree	2019-08-20 13:53:12 +02:00
Remco Burema	0e6c05e443	Merge pull request #6206 from Ultimaker/CURA-6709_upgrade_imade3d ... CURA-6709 Fix version upgrade for imade3d jellybox	2019-08-20 13:08:30 +02:00
Ghostkeeper	dcf7ed9969	Fix finding materials by GUID ... See, I made the mistake again. Contributes to issue CURA-6600.	2019-08-19 16:38:59 +02:00
Ghostkeeper	443495973f	Don't use deprecated material manager any more ... Contributes to issue CURA-6600.	2019-08-19 16:16:28 +02:00
Jaime van Kessel	2417705dfd	Prevent crashes when duplicating a material ... CURA-6600	2019-08-19 11:42:52 +02:00
Ghostkeeper	362c7d09fb	Fix displaying generic materials ... I had that commented out for debugging.	2019-08-16 13:38:14 +02:00
Ghostkeeper	04d5423d81	Fix scrolling all the way down in Qt 5.13 ... It didn't properly connect the height of the column to the scrolled length, I think. Perhaps a Qt bug. It didn't occur in 5.11 or 5.10 yet.	2019-08-16 13:36:15 +02:00
Remco Burema	7ed8d0b2f7	Remove deprecated .getMetadata() call. ... part of CURA-6600	2019-08-16 09:37:58 +02:00
ChrisTerBeke	60758093f1	Determine skeleton loading properly	2019-08-15 21:29:20 +02:00
ChrisTerBeke	75f52c5a24	Bring back skeleton loading for monitor stage	2019-08-15 21:25:56 +02:00
ChrisTerBeke	7e9662e30e	Fix monitor tab UI not updating for cloud device due to overridden signals	2019-08-15 20:25:59 +02:00
ChrisTerBeke	9e6e9a4beb	Enable force override print job in local network, fix override button not enabled on older firmwares	2019-08-15 20:16:55 +02:00
ChrisTerBeke	de3f82610a	Add tooltips for firmware update back, fix print job override state	2019-08-15 19:42:25 +02:00
ChrisTerBeke	36f6bdca18	Bring cast back to fix typing	2019-08-15 14:36:25 +02:00
ChrisTerBeke	6833323845	UM3PrinterAction - refactor to property, remove discovery start from reset	2019-08-15 14:30:11 +02:00
Remco Burema	7fb9642e45	Replace deprecated .getContainer() calls with .container ... part of CURA-6600	2019-08-15 13:40:08 +02:00
Lipu Fei	4feb22e065	Fix version upgrade for imade3d jellybox ... CURA-6709	2019-08-15 13:37:04 +02:00
ChrisTerBeke	ab4fd3a7f9	Merge branch 'master' of https://github.com/Ultimaker/Cura	2019-08-15 13:21:17 +02:00
ChrisTerBeke	eb5e1904ab	Fix setting printer type on print job	2019-08-15 13:21:10 +02:00
Lipu Fei	f20696966d	Fix logging in FirmwareUpdateChecker	2019-08-15 13:03:51 +02:00
Lipu Fei	214194de85	Merge pull request #6202 from Ultimaker/CURA-6717_machine_heated_build_volume ... Add machine_heated_build_volume.	2019-08-15 09:37:18 +02:00
Lipu Fei	a2dcbc3be7	Use certifi for firmware update checker ... CURA-6698	2019-08-14 14:57:52 +02:00
ChrisTerBeke	e6d30516aa	Fix status interval check for cloud devices	2019-08-14 14:21:16 +02:00
Remco Burema	f947269cf8	Add machine_heated_build_volume. ... See also the engine. part of CURA-6717	2019-08-14 11:59:13 +02:00
ChrisTerBeke	fcd5a563e4	Use cluster_size property from zeroconf if available	2019-08-13 21:42:44 +02:00
ChrisTerBeke	998f58d3fa	Tweak offline check interval for cloud device	2019-08-13 15:19:30 +02:00