21509 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	4dea8fba76	Merge pull request #6349 from Ultimaker/CURA-6775_fix_crash_empty_containers ... Fix crash when adding printers with empty profile layers	2019-09-16 09:15:10 +02:00
Daniel Green	57a50c9c3d	Correction for build volume.	2019-09-15 09:56:21 -07:00
Mark Burton	fb5ec97cb8	Fix spelling.	2019-09-14 20:19:52 +01:00
Jaime van Kessel	0ff9d72c4c	Remove use of deprecated extruders property	2019-09-13 17:27:16 +02:00
Ghostkeeper	2cca95384d	Don't look for quality group for empty material ... Just don't add it to the list of available intents then. Contributes to issue CURA-6775.	2019-09-13 16:09:02 +02:00
Ghostkeeper	7942db5147	Give empty material the required material properties ... It needs a GUID, base file and material type to show up in the material nodes in the container tree. Contributes to issue CURA-6775.	2019-09-13 16:07:33 +02:00
Ghostkeeper	cc27392ab0	Don't use material groups to update metadata ... The material groups are not filled any more in the material manager so this fails. This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference. The function becomes a lot simpler though. And it works again. Contributes to issue CURA-6600.	2019-09-13 14:42:27 +02:00
Ghostkeeper	bb0c9c80dc	Don't use material groups to find just the root container ... Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well. Contributes to issue CURA-6600.	2019-09-13 14:42:27 +02:00
Ghostkeeper	882e60bf95	Fix typing of application ... Because CuraApplication has the getMachineManager() function and such, not UM.Application. Discovered during work on CURA-6600.	2019-09-13 14:42:26 +02:00
Nino van Hooff	d6872a65bd	Fix infillOnlyCheckbox not representing mesh type ... Not a bug but a feature: When the overlays button is clicked, the infill mesh type is set and the checkbox checked CURA-6683	2019-09-13 13:36:30 +02:00
Remco Burema	756c21cd19	Remove extra empty lines in ChangeAtZ-scipt output.	2019-09-13 13:33:06 +02:00
Nino van Hooff	44fbcaeb3a	Fix Settings lines positioning for Per Object Settings ... CURA-6683	2019-09-13 13:26:00 +02:00
Nino van Hooff	667e5f8e18	Fix reference error in POS ... CURA-6683	2019-09-13 13:26:00 +02:00
Nino van Hooff	606faf54c2	Remove unnecessary component initialization ... CURA-6683	2019-09-13 13:26:00 +02:00
Nino van Hooff	fe0e1e5aba	Remove unnecessary ; line endings in QML ... CURA-6683	2019-09-13 13:26:00 +02:00
Nino van Hooff	90fefac37f	Remove redundant rows from POS QML ... CuRA-6683	2019-09-13 13:26:00 +02:00
Nino van Hooff	184a72f7ab	Bind current_mesh_type to UM.ActiveTool.properties.getValue("MeshType") ... CURA-6683	2019-09-13 13:26:00 +02:00
Jaime van Kessel	55a8d03d42	Fix typing error	2019-09-13 13:16:48 +02:00
Remco Burema	ef0f5988a2	Fix 3MF-workspace-reading: Variants where not loaded properly. ... part of CURA-6600	2019-09-13 12:59:54 +02:00
Ian Paschal	495ed17294	Merge pull request #6347 from Ultimaker/allow_hiding_new_cloud_printers_popup ... Store in preferences if the user wants to hide the message	2019-09-13 12:54:01 +02:00
maukcc	d514b324fb	HMS434 update ... HMS434 update on material and quality profiles	2019-09-13 11:38:42 +02:00
ChrisTerBeke	55cdb07c1c	Fix loading popup image on windows	2019-09-13 11:12:13 +02:00
ChrisTerBeke	5dfb8216df	Fix loading popup image on windows	2019-09-13 11:06:34 +02:00
Lipu Fei	5631e94a48	Fix creality variant versions	2019-09-13 10:53:10 +02:00
Lipu Fei	bbde75491d	Fix version number in upgrade from 4.1 to 4.2	2019-09-13 10:52:41 +02:00
Jaime van Kessel	2395567f1e	Only show printerTypes for active machine	2019-09-13 10:49:35 +02:00
ChrisTerBeke	e8b48a299b	Store in preferences if the user wants to hide the message	2019-09-13 10:45:42 +02:00
Jaime van Kessel	1e130637ee	Remove retry action from login ... It doesn't work anyway and there is another way that does work (eg; login via the top right)	2019-09-13 10:38:52 +02:00
Lipu Fei	fa8213c601	Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade	2019-09-13 10:31:11 +02:00
Jaime van Kessel	febe953226	Don't assert if there are already 7 containers in stack ... CURA-6599 Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>	2019-09-13 09:29:49 +02:00
Diego Prado Gesto	bca68c6db0	Merge branch 'feature_intent' into feature_intent_container_tree	2019-09-13 09:02:51 +02:00
Diego Prado Gesto	d38e60ce06	Merge branch 'master' into feature_intent	2019-09-13 09:02:30 +02:00
Diego Prado Gesto	d9af8bd6b0	Merge branch '4.3'	2019-09-13 09:00:34 +02:00
Ghostkeeper	f4a2f3efa6	Emit activeStackChanged as documented when containers in the active stack change ... This fixes updating the intent models when you switch nozzles. Among other things, probably. Contributes to issue CURA-6600.	2019-09-12 17:27:30 +02:00
Ghostkeeper	603f18ebc9	No need to sort quality groups by type alphabetically ... Like, it would put 'draft' first and 'verydraft' last. Just makes no sense. They have unique layer heights already. Contributes to issue CURA-6600.	2019-09-12 16:44:40 +02:00
Ghostkeeper	9c47fc8e70	Use container tree to get quality definition of printer ... Contributes to issue CURA-6600.	2019-09-12 16:15:40 +02:00
Ghostkeeper	7d49fd7fa2	Don't import type that's only used for type checking ... Contributes to issue CURA-6600.	2019-09-12 16:15:03 +02:00
Ghostkeeper	b8ab04df4a	Correct type of logged item	2019-09-12 15:58:09 +02:00
Ghostkeeper	f1299589c9	Remove debug prints ... Contributes to issue CURA-6600.	2019-09-12 15:49:27 +02:00
Ghostkeeper	3a3aeb92a9	Log errors rather than printing them ... This way we can debug them if a user sends us the logs.	2019-09-12 15:45:10 +02:00
Ghostkeeper	2d2bf9e279	Use logger for errors instead of printing them to stdout ... This way they will show up in users' logs.	2019-09-12 15:25:01 +02:00
Ghostkeeper	92d2686fed	Pick quality changes group from quality changes groups, not quality groups ... Oops. Probably went wrong when I copied over this code from some other place. Contributes to issue CURA-6600.	2019-09-12 15:19:06 +02:00
Ghostkeeper	2d0a122c2d	Display list of custom quality profiles ... If you activate any of them from here though, it'll crash. Contributes to issue CURA-6598.	2019-09-12 15:13:02 +02:00
Jaime van Kessel	5db122aff6	Merge branch 'master' of github.com:Ultimaker/Cura into CURA--6683_icons_per_object_settings	2019-09-12 15:01:11 +02:00
Ghostkeeper	9a5d45282a	Set intent category of quality changes group correctly ... If any profile has a different intent than default, the entire group becomes that intent. There can only be one intent that's different from default per group. Contributes to issue CURA-6600.	2019-09-12 14:54:24 +02:00
Jaime van Kessel	a6a106b526	Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura	2019-09-12 14:09:46 +02:00
HUNIBEST	67aa37b13d	Add Cubicon plus A15 and A30 ... Add Cubicon devices profile - Style Plus-A15 - Dual Pro-A30 CURA-6771	2019-09-12 14:05:13 +02:00
Remco Burema	f4395cc647	Correct comment.	2019-09-12 14:04:30 +02:00
Ghostkeeper	ba0ebf044a	Merge branch '4.3'	2019-09-12 13:54:55 +02:00
Nino van Hooff	0cd664975e	Remove face selection for a PreviewPass ... Fixes issue where the selected face for the lay-flat feature showed up in the model thumbail of print jobs. CURA-6754	2019-09-12 13:42:19 +02:00