Arjen Hiemstra aed23ca17e Merge branch '2.3' ... * 2.3: Expand logic for showing the inherit button in SettingItem Add a method to get overrides for a specified (extruder)stack Add global profiles for UM3 so this can be tested without dependencies Account for empty material when switching quality changes Set the global variant and material to empty for multi-extrusion machines Also properly set global profile when changing quality_changes profiles Add support for global quality profiles		2016-10-24 17:10:41 +02:00
..
definitions	Add definition for Printrbot Play with heated bed upgrade.	2016-10-22 17:36:21 +01:00
extruders	Publish Ultimaker 3 definitions and profiles	2016-10-19 13:35:00 +02:00
i18n	CURA-2751 Change settings label "Simple" to "Recommended"	2016-10-20 12:51:19 +02:00
images	Publish Ultimaker 3 definitions and profiles	2016-10-19 13:35:00 +02:00
meshes	Add definition and mesh for Printrbot Play.	2016-10-22 16:36:06 +01:00
qml	Merge branch '2.3'	2016-10-24 17:10:41 +02:00
quality	Add global profiles for UM3 so this can be tested without dependencies	2016-10-24 11:19:49 +02:00
shaders	Tweak convex hull node and transparent object shader	2016-07-27 18:03:20 +02:00
themes/cura	Make separate theme colour for detail text	2016-10-21 13:06:49 +02:00
variants	Publish Ultimaker 3 definitions and profiles	2016-10-19 13:35:00 +02:00