Jack Ha 4cd940cc5e Merge branch 'master' into recommended_sidebar		2016-12-01 11:34:41 +01:00
..
definitions	Merge branch 'feature_z_seam_location'	2016-11-30 16:34:50 +01:00
extruders	Merge branch 'all_legacy_machines'	2016-11-15 10:14:52 +01:00
i18n	Add Dutch translation for 'Information' title	2016-11-23 12:45:12 +01:00
images	Publish Ultimaker 3 definitions and profiles	2016-10-19 13:35:00 +02:00
meshes	add JellyBOX build plate mesh	2016-11-13 11:34:24 -05:00
qml	Merge branch 'master' into recommended_sidebar	2016-12-01 11:34:41 +01:00
quality	Fixed profiles by removing double entries and changing math.round to round.	2016-11-24 12:58:33 +01:00
shaders	Tweak convex hull node and transparent object shader	2016-07-27 18:03:20 +02:00
themes/cura	Added color to recommended view support extruder by adding combobox_color style. CURA-2767	2016-12-01 11:34:37 +01:00
variants	Moved some setting functions back to definitions	2016-11-25 09:39:19 +01:00