#135 Fixed NPE when fluid texture not found.
Merge branch 'master' into 1.6.4