21509 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ian Paschal	2d03bc6bc3	Merge pull request #6461 from Ultimaker/CS-347_auto_switch_to_cloud ... Fix cloud connection auto fallback	2019-10-02 11:45:58 +02:00
Ghostkeeper	2a4c387067	Add sideways move to not squash the primed amount onto the nozzle ... Provided by Psychonno and tested by MetalRobo in #6424.	2019-10-02 11:44:24 +02:00
Jaime van Kessel	872d6365a9	Fix seam location if it's relative	2019-10-02 10:45:50 +02:00
Ghostkeeper	649ca99fe0	Only match on printer-specific materials, not variant-specific too ... If a submaterial doesn't exist for the current variant node but it does exist for a different variant node, then it would not be found in the variant-specific materials and then would be looked up in the printer-specific materials. It then depends on the order in which findInstanceContainersMetadata returns things for whether the actual printer-specific material is selected or a different variant-specific material is selected. No longer now, because the variant name is specified to be absent so it may not match on variant-specific profiles any more. Maybe this even gives us a small performance gain when combining these dictionaries, since there are now like 80% fewer profiles in that query. Contributes to issue CURA-6831.	2019-10-02 08:55:13 +02:00
Ghostkeeper	0b610ccd58	Fix getting correct metadata entry for variant name ... Turns out that the material profiles deserialise the variant to the 'variant_name' metadata entry, not just 'variant'. This caused it to find no variant-specific material profiles at all anywhere. It would always fall back to the machine-specific names. Contributes to issue CURA-6831.	2019-10-02 08:55:12 +02:00
Ghostkeeper	c8be172343	Add debugging functionality to visualise the container tree ... Could be useful for later, don't you think? Contributes to issue CURA-6831.	2019-10-02 08:55:12 +02:00
Ghostkeeper	b245be6970	Remove has_machine_materials metadata ... It's not behaving as expected here. For instance, Ultimaker 3 wasn't specifying has_machine_materials and thus only the base materials would get loaded, but clearly the Ultimaker 3 has materials specialised for it. Whether or not a printer has materials specialised for it is now determined by whether the specialisations exist in the material files. So we don't need the metadata entry any more. It seemed to have not been in use anyway, except by one printer which specified that has_machine_materials is true. I've now made it behave as if it's always true. Contributes to issue CURA-6831.	2019-10-02 08:55:04 +02:00
Lipu Fei	179fa325fc	Merge pull request #6458 from Ultimaker/CURA-6817_intent_fix_sync_config ... Fix synchronise configurations (intent branch).	2019-10-02 08:53:53 +02:00
Lipu Fei	89c35cd03c	Simplify code ... CURA-6817	2019-10-02 08:53:00 +02:00
Lipu Fei	be33a9aa7e	Fix updating current root material IDs ... CURA-6821	2019-10-02 08:41:05 +02:00
ChrisTerBeke	445743ab75	Use empty string as fallback value	2019-10-01 19:53:40 +02:00
ChrisTerBeke	76536fe715	Ensure string matching is done with strings	2019-10-01 19:52:40 +02:00
ChrisTerBeke	5f31551184	Fix checking for cases where machine creation failed	2019-10-01 19:41:02 +02:00
ChrisTerBeke	c3d846440d	Set some meta data before switching active stacks, fix manual added device pairing	2019-10-01 19:31:35 +02:00
Remco Burema	a1d90c17da	Fix synchronize configurations (intent branch). ... - Approximate diameter needed to be a string. - GUID-tag is mostly in capitals. - Workaround for an overload of 'get' not being called (default parameter didn't work somehow?). part of CURA-6817	2019-10-01 16:46:11 +02:00
Lipu Fei	296f8af59c	Always clear ListModel so layer height selector will align properly ... CURA-6836	2019-10-01 16:15:36 +02:00
Lipu Fei	c030328b7f	Fix intent profile selection ... CURA-6810	2019-10-01 15:21:01 +02:00
Lipu Fei	ad7b58e460	Get diameter from material container ... CURA-6821	2019-10-01 15:05:35 +02:00
Lipu Fei	aaca4bb9a1	Fix KeyError in root material ID check ... CURA-6827	2019-10-01 11:58:54 +02:00
Lipu Fei	51c96aecde	Fix for-loop in updateMaterialWithVariant ... CURA-6821	2019-10-01 11:43:46 +02:00
Lipu Fei	55a5464ed3	Fix missing import	2019-10-01 11:41:17 +02:00
Lipu Fei	f867f3485e	Fix TestIntentManager	2019-10-01 11:30:54 +02:00
Lipu Fei	bc524b2c14	Fix unit test due to QualityGroup parent changes	2019-10-01 11:26:10 +02:00
Lipu Fei	961e1e0d7e	Fix material node update for empty_material ... CURA-6821	2019-10-01 10:56:17 +02:00
Lipu Fei	df105bc822	Fix update material due to compatible material diameter change ... CURA-6821	2019-10-01 10:40:16 +02:00
Lipu Fei	96a9bcccbb	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-01 09:41:05 +02:00
Lipu Fei	609ceed140	Merge pull request #6426 from Ultimaker/CURA-6106_fix_interface_disappearing ... Warn when difference between X/Y distance and minimum X/Y distance is too big	2019-10-01 09:40:05 +02:00
Ghostkeeper	ed9ec1d724	Align comment with the rest ... Looks nicer.	2019-09-30 17:30:12 +02:00
Ghostkeeper	01b66ecaa0	Merge branch 'oorail/fix-jgaurora-z603s-end-print-problem' of https://github.com/oorail/Cura into oorail-oorail/fix-jgaurora-z603s-end-print-problem	2019-09-30 17:25:58 +02:00
Ghostkeeper	7bf2fa3b43	Add typing and documentation and remove unused code ... Contributes to issue CURA-6785.	2019-09-30 16:50:35 +02:00
Ghostkeeper	69028bf279	Remove unused import ... Contributes to issue CURA-6785.	2019-09-30 16:24:53 +02:00
oorail	d47ff60bf8	Optimized machine end gcode to move at F600 and in one command vs two	2019-09-30 09:51:44 -04:00
Ghostkeeper	eb1d0248c2	Update translations for Cura 4.3 ... These are the new translations for Cura 4.3 for Polish. These are too late, but in the future we may work on these.	2019-09-30 15:47:24 +02:00
Ghostkeeper	d9676a3336	Merge branch 'patch-6' of https://github.com/thopiekar/Cura into thopiekar-patch-6	2019-09-30 14:49:42 +02:00
Ghostkeeper	f7438c9e57	Merge branch 'patch-5' of https://github.com/thopiekar/Cura into thopiekar-patch-5	2019-09-30 13:13:06 +02:00
Ghostkeeper	5c2c4118c6	Add clarification about that supported overhang doesn't fall into this category ... Fixes #6436.	2019-09-30 12:58:36 +02:00
Jaime van Kessel	916bb5a32b	Select correct intent when quality_changes has an intent category	2019-09-30 12:55:10 +02:00
Marijn Dee	05a9418755	Merge pull request #6438 from Ultimaker/CS-298_network_screen_printer_name ... Use printer type name instead of id	2019-09-30 09:34:10 +02:00
oorail	6228b30d62	Changed the JG Aurora z603s definition to send the print head to the rear of the printer. The z603S is a COREXY style printer, unlike the other JG Aurora printers where moving the Y-axis shifts the bed to the front for easy print removal. On the z603s, it shoves the print head into the frame of the printer, the X-axis bar and the print head are then in the way, making it difficult to remove the print. The z603S should have the print head homed on X and Y axis to tuck it out of the way in the rear right of the printer	2019-09-29 18:52:40 -04:00
Thomas Karl Pietrowski	f57528ef1a	CuraApplication: Some formatting around messageBox functions ... Just preventing some long lines.	2019-09-29 21:20:11 +02:00
Ghostkeeper	3c17af6192	Clarify description of support interface area settings ... They'll be generated and then tossed away. I'm specifying that there will be normal support in its place, unlike the minimum support area setting that replaces the support with air. It won't be air here, but normal support.	2019-09-29 18:25:11 +02:00
Thomas Karl Pietrowski	cfc296de37	Update ActionPanelWidget.qml ... Find this whitespace strange. Shouldn't this normally give an error? Or is this allowed due to the syntax?	2019-09-28 10:36:05 +02:00
ChrisTerBeke	99832c3a68	Use printer type name instead of id	2019-09-27 21:09:53 +02:00
Chris ter Beke	93f2641be7	Merge pull request #6437 from Ultimaker/CS-328_improvements ... CS-328 improvements	2019-09-27 20:56:18 +02:00
ChrisTerBeke	9e54cc33ce	Move code	2019-09-27 20:50:46 +02:00
ChrisTerBeke	b18f9469bf	Select correct machine type connecting to output device	2019-09-27 20:39:57 +02:00
ChrisTerBeke	01e665a0d7	Partial revert of #6432, actually fix refreshing configurations	2019-09-27 19:25:23 +02:00
Nino van Hooff	2c12d713e3	Revert "Do not show the "load project or models" dialog when opening a file from a command line argument" ... This reverts commit abfd7e92, because the desired behavior has still tbd	2019-09-27 16:50:28 +02:00
Nino van Hooff	abfd7e9266	Do not show the "load project or models" dialog when opening a file from ... a command line argument	2019-09-27 16:37:41 +02:00
Ghostkeeper	45f3b6eeb2	Simplify quality node intents list test ... Not a whole lot of mocking. I also added a lot of extra instance containers that should NOT match. Added during testing & tooling.	2019-09-27 16:04:49 +02:00