Merge branch 'master', remote branch 'akudeukie/mc_1.6' into universe/master
Merge branches 'universe/master' and 'master'
Merge branch 'master', remote branch 'akudeukie/mc_1.6'
fixed double_plant* texture names
Merge pull request #4 from UniversE/master

Texture names are now aligned to 1.7.2