Remco Burema 4277ede64f Fix 1/2 of the duplication material bug. ... The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong. This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed. part of CURA-6863		2019-10-14 01:01:19 +02:00
..
bundled_packages	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00
definitions	Merge branch 'feature_intent'	2019-10-08 13:17:54 +02:00
extruders	Fix whitespace	2019-09-26 10:33:44 +02:00
i18n	Update translations for Cura 4.3	2019-09-30 15:47:24 +02:00
images	Hellbot printers definitions added	2019-09-16 16:23:35 -03:00
meshes	Hellbot printers definitions added	2019-09-16 16:23:35 -03:00
qml	Fix 1/2 of the duplication material bug.	2019-10-14 01:01:19 +02:00
quality	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-01 09:41:05 +02:00
setting_visibility	Add Z Seam Position in Expert View	2019-09-10 13:36:10 +02:00
shaders	Older drivers can lie w.r.t. GLSL-version if it's forced lower.	2019-09-21 14:58:59 +02:00
texts	Added CS tickets to the change log	2019-09-24 12:26:24 +02:00
themes	Change the action_button_hover color in dark theme	2019-09-26 13:16:52 +02:00
variants	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00