Added: Hay blocks, Hardened Clay, Coal blocks, and Carpet.
Added stained hardened clay
Fixed Hay blocks and Stained clay
Merge PR #928
revert merge of PR#928 to master, which broke on non-snapshot

This reverts commit bc5afbed5c504c0040ece611799ae3f44a11c9ff, reversing
changes made to 7457758fbb609858c4e21f1f9f9b8c79d6c39bf7.
un-revert merge of PR#928, now in a branch

This reverts commit 124def360223447db790adeba1ef1b799730b26b.
s/rednerchecks/renderchecks

Well, I suppose this branch doesn't execute too often, as nobody noticed the typo so far ;).
Merge pull request #943 from krotton/master

A typo in tileset.py. It's tiny, but nevertheless, it's a bug.
Merge branch 'master' of git://github.com/overviewer/Minecraft-Overviewer
Updated texture loading

handled the move into the assets/ directory
also updated texture names
Merge branch 'snapshot'
Fixed default texture loading

Now accounts for the versions directory, which is maintained by the new
launcher
Edited the texture-finding code for 1.6

Now correctly avoids globbing problems. Removed a bit of irrelevant code
for old style minecraft.jar. Tweaked error messages for resource packs
instead of texture files.
Fix typo in textures.py
updated "installing the textures" section of the docs

Also fixed docstring in textures.py for the find_file method.
fixed bug that occurs when %HOME% is set on windows
updated Installing Textures section of the docs

Added a command to download the official textures. Reworded the rest of
the section for clarity.
Merge branch 'master' of github.com:overviewer/Minecraft-Overviewer
removed mkdir command in installing the textures

Apparently the wget -P flag creates directories.
fixed wording related to texturepath in config docs

Changed to be more accurate with the resource pack changes in minecraft
1.6