Diego Prado Gesto 97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. ... Fix other possible cases when the type or the color are also None.		2018-06-07 10:54:23 +02:00
..
definitions	Merge branch '3.4' into fix_retraction_amount	2018-06-04 14:42:39 +02:00
extruders	Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile	2018-04-23 21:05:34 -07:00
i18n	Update translation templates per language	2018-06-06 16:57:33 +02:00
images	Add Ultimaker S5 resources	2018-04-23 11:27:13 +02:00
meshes	Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile	2018-04-23 21:05:34 -07:00
qml	Fix a crash in MaterialManager when the brand of the material is None.	2018-06-07 10:54:23 +02:00
quality	Merge pull request #3762 from Ultimaker/Optimization	2018-05-14 13:39:19 +02:00
setting_visibility	Add fan speed to basic setting visibility	2018-06-06 10:56:58 +02:00
shaders	Fix support blocker on older (legacy) opengl	2018-05-14 14:29:41 +02:00
themes	Message stack shows properly messages	2018-05-28 16:03:05 +02:00
variants	Add the aluminum build plate variant to avoid crashes when synching to	2018-05-15 11:41:58 +02:00
bundled_packages.json	CURA-5442 Final fixes	2018-06-04 17:00:59 +02:00