Started updating for 1.6.1
Fixed textures
Merge branch 'MC-1.6.1'
Fixed torch textures again