fix fortune and silktouch working and Pump auto liquid extraction
Merge branch 'master' into 1.5.2

Conflicts:
	src/org/yogpstop/qp/TilePump.java
Merge branch '1.5.2' into 1.4.7
Update to 1.5.3.3
Merge branch 'master' into 1.5.2
Merge branch '1.5.2' into 1.4.7