Modified rendering of liquid conduits to show type of liquid accepted.
Merge branch 'master' into 1.6.4