updated to 1.5.2
added missing textures
fixed up merge conflicts