21576 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
THeijmans	f6cd807bb3	Adds Ultimaker S5 intent profiles ... Initial version, for merging with master.	2019-09-23 11:50:34 +02:00
Lipu Fei	79f938a39c	Add intent for project saving summary ... CURA-6800	2019-09-23 11:44:11 +02:00
Lipu Fei	ddab8e204a	Add typing ... CURA-6800	2019-09-23 11:43:50 +02:00
Ghostkeeper	5ec833c15e	Remove extraenous space ... This space triggers PoEdit to give a warning that the translation doesn't have the space there. That's okay, since it's a column and the space doesn't influence spacing then.	2019-09-23 11:43:24 +02:00
Ghostkeeper	dab9f71a0a	Merge branch '4.3' of https://github.com/Patola/Cura into Patola-4.3	2019-09-23 11:39:51 +02:00
Ghostkeeper	4bf8ea9332	Merge branch '4.3'	2019-09-23 11:25:31 +02:00
Ghostkeeper	cb045fb0c2	Update default SDK version ... Just in time.	2019-09-23 11:24:20 +02:00
Jaime van Kessel	08ffafa475	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-23 11:19:19 +02:00
Jaime van Kessel	a4ed51342c	Fix favorite not being checked properly in MaterialMenu ... CURA-6804	2019-09-23 11:18:47 +02:00
Lipu Fei	1aa6708677	Fix typing	2019-09-23 10:59:31 +02:00
Lipu Fei	18d93d0b7b	Fix UM2 extended variants ... CURA-6775	2019-09-23 10:43:58 +02:00
Ghostkeeper	61527e082e	Mock ContainerTree instead of ContainerRegistry ... The intent models are now using the ContainerTree to build themselves rather than the registry.	2019-09-23 09:59:57 +02:00
Cláudio 'Patola' Sampaio	d181913eec	Updated pt_BR strings for Cura 4.3	2019-09-23 03:28:40 -03:00
Thomas Karl Pietrowski	bdc35d7573	plugins: Reweighting stages ... In theory it should be possible to add stages, but there is no possiblity to add any other stage in between. Therefore I moved the weights by 10+n*10. So we can add 10 before prepare and 9 stages between those 3 known stages. It is probably possible to set the same weight to multiple stages, but I'm not sure how Cura decides, which stage to take first then. By the moment the plugin's init is called? Or by alphabet? Therefore putting some space in between the weights should give some clearity.	2019-09-21 22:57:23 +02:00
Remco Burema	9e64072b05	Older drivers can lie w.r.t. GLSL-version if it's forced lower. ... ... so don't use gl_PrimitiveID at all when in compatibility mode. This direct commit partly fixes github #6387 -- but see also the forthcoming PR in Uranium.	2019-09-21 14:58:59 +02:00
Remco Burema	cb7d99d2dc	Revert "Make 3MF-reader aware of setting-version for introduction Intent." ... This reverts commit 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab. Should have been (and is now) done in the version upgrade instead.	2019-09-20 11:56:08 +02:00
Ellecross	87cc46454a	Removed PPA entries from the changelog	2019-09-20 11:31:12 +02:00
Ghostkeeper	3479a3df76	Fix _applyVariants using variant manager ... The variant manager doesn't get properly filled any more. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	4a68e7ec95	Fix favorite materials without material manager ... We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	12043df367	Don't use material manager to find or remove materials ... That remove function in the material manager was very weird... Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	cc9115b3d3	Don't use material manager to reset material ... Use the container tree. Contributes to issue CURA-6776.	2019-09-20 09:57:35 +02:00
Ghostkeeper	105e782e75	Remove unused imports to MaterialManager ... Contributes to issue CURA-6776.	2019-09-20 09:57:35 +02:00
Ghostkeeper	729019a2dc	Don't use material manager to reset the material after uninstalling material package ... This class is deprecated. Contributes to issue CURA-6776.	2019-09-20 09:57:27 +02:00
Lipu Fei	03866d0d07	Merge pull request #6380 from Ultimaker/CURA-6690_printhead_negative_values ... Cura 6690 printhead negative values	2019-09-20 09:40:18 +02:00
maukcc	250402142a	HMS434 add ironing	2019-09-20 09:33:41 +02:00
Jaime van Kessel	71a22bf194	Fix few profiles that didn't have global_quality set	2019-09-19 17:31:18 +02:00
Jaime van Kessel	fff37354e2	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-19 17:16:48 +02:00
Jaime van Kessel	a69a394514	Fix container tree generation for machines that only have global profiles ... CURA-6775	2019-09-19 17:16:15 +02:00
Ellecross	e2ad8b6e2e	Updated Change Log for 4.3	2019-09-19 17:08:36 +02:00
Remco Burema	37aca7d361	Menu items should be removed by index, not by object. ... part of CURA-6791	2019-09-19 17:00:16 +02:00
Jaime van Kessel	fe18e73e5b	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent	2019-09-19 16:47:14 +02:00
Jaime van Kessel	fc67090a2f	Fix crash when adding UMO	2019-09-19 16:15:00 +02:00
Jaime van Kessel	7dcf083991	Fix container tree for printers that have no variants but do have qualities & materials ... CURA-6775	2019-09-19 15:56:06 +02:00
Lipu Fei	5690f61d40	Merge pull request #6269 from Ultimaker/feature_intent_container_tree ... Container tree structure	2019-09-19 15:51:21 +02:00
maukcc	a1d8fd8743	HMS434 quality deleted ... HMS434 quality deleted in favor of .package types	2019-09-19 15:35:58 +02:00
Jaime van Kessel	7016e791c8	Fix containertree for machines without materials but with specific qualities ... CURA-6775	2019-09-19 15:33:19 +02:00
Lipu Fei	c661f82756	Recreate bindings for the text fields ... CURA-6690	2019-09-19 15:33:10 +02:00
Jaime van Kessel	830b22e381	Fix crash when adding a machine without materials ... CURA-6775	2019-09-19 15:12:29 +02:00
Jaime van Kessel	2b4144386f	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-09-19 14:56:12 +02:00
Jaime van Kessel	3e474c1107	Ensure that enabling & disabling an extruder gets handled correctly ... CURA-6775	2019-09-19 14:54:58 +02:00
Nino van Hooff	c43cdb5c63	Implement allowPositive for printhead settings ... CURA-6690	2019-09-19 14:49:18 +02:00
Lipu Fei	a3263da3f4	Merge pull request #6338 from Ultimaker/feature_intent_upgrade ... Feature intent upgrade	2019-09-19 14:44:52 +02:00
Lipu Fei	472e6e88c3	Fix typing	2019-09-19 14:39:03 +02:00
Lipu Fei	6e625b2cf8	Fix typing	2019-09-19 14:34:52 +02:00
Jaime van Kessel	3730ea247d	Ensure that intent gets updated when changing quality / material ... CURA-6775	2019-09-19 14:26:18 +02:00
Lipu Fei	d8b59c4471	Fix renamed um2 nozzles ... CURA-6599	2019-09-19 14:26:01 +02:00
Lipu Fei	823f7e5921	Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade	2019-09-19 14:14:29 +02:00
Nino van Hooff	17a832f52f	Do not transform negative printhead min max values to positive while ... displaying CURA-6690	2019-09-19 13:56:37 +02:00
Jaime van Kessel	c76c183c6b	Remove unused code	2019-09-19 13:45:13 +02:00
Ghostkeeper	8b8429d629	Merge branch 'CURA--6683_icons_per_object_settings'	2019-09-19 10:48:23 +02:00