FIX .. some IDIOT ruins the upload. see discrip.

Some person with a stick figure icon (dont remember the name) keeps on
pushing updated using simpleui and such..  this is the restore and fix.
how so we stop this guy form doing commits?
cactus green dye
wool (pull from here plz)
even more blocks
blocks-2
Merge branch 'master' of https://github.com/ronmurphy/Minecraft
git commit fix
Crafting: Tidied up existing recipes
Started using shapeless recipes where applicable
We currently have spruce planks but not logs, and birch logs but not planks
Also the Spruce log texture is named "oak"
Crafting GUI: Refactored to reuse crafting_outcome
Crafting GUI: Added amount to results slot
Crafting: Made picking up results instantly remove ingredient
Previously, they didn't change until an item was placed in the inventory
Blocks: Marked Torch as transparent
Fixes the block underneath torches being invisible
diamond and stone tools
Merge branch 'crafting' of https://github.com/Nebual/Minecraft

Conflicts:
	crafting.py
merge
fixes and lapis and emerald ores.
world._show_block: Commented out currently unused code
Should speed up world loading/generating
Added support for MC 1.5 Texture Pack format
Should have nearly identical performance to the single file texture.png format
Still uses old texture.png if a Texture Pack isn't present, unsure if we should
phase out the single file entirely
Removed garbage
Merge branch 'texturepack' of git://github.com/Nebual/Minecraft

Conflicts:
	blocks.py