Merge branch 'master' of git://github.com/ronmurphy/Minecraft
Merge branch 'master' of git://github.com/avelanarius/Minecraft
Updated TODO list.

- Removed "don't generate dirt under grass" thanks to git://github.com/ronmurphy/Minecraft

- Added "Enable blending mode to get semi-transparent textures working. Render in the right order so they show up correctly."
Merge branch 'master' of git://github.com/avelanarius/Minecraft
TREES (could be better)

-maxtrees #, also, trees in -terrain built in.  Bad tree looks for
generation, feel free to adjust and share.
Merge branch 'master' of git://github.com/avelanarius/Minecraft
Merge branch 'master' of git://github.com/ronmurphy/Minecraft
Removed redundant GLOBAL
Merge branch 'master' of git://github.com/avelanarius/Minecraft
Change inventory key to E as per Minecraft.
Merge commit '88b79ba165dc166de695055cab908bfca68e8632'

Conflicts:
	inventory.py