Merge "textures" into "master"

Hax didn't sync often enough. D: Here's his unpublished works.