Adding bukkit block functions and making sure to update with latest pushes
Merge branch '1.6.1' into 1.6.1-bukkit

Conflicts:
	src/main/java/net/minecraft/src/Chunk.java
	src/main/java/net/minecraft/src/ISaveFormat.java
	src/main/java/net/minecraft/src/ItemInWorldManager.java
	src/main/java/net/minecraft/src/SaveFormatOld.java
	src/main/java/net/minecraft/src/World.java
	src/main/java/org/minetweak/plugins/PluginLoader.java
yay more pushy
More Fixxy! and pushy!
Merge branch '1.6.1' into 1.6.1-bukkit

Conflicts:
	src/main/java/net/minecraft/src/World.java
	src/main/java/org/minetweak/Minetweak.java
Merge branch '1.6.1-bukkit' of github.com:Minetweak/Minetweak into 1.6.1-bukkit

Conflicts:
	src/main/java/net/minecraft/src/ItemBlock.java
	src/main/java/net/minecraft/src/World.java
	src/main/java/org/minetweak/Minetweak.java
Fixing Material?
Merge branch '1.6.1-bukkit' of github.com:Minetweak/Minetweak into 1.6.1-bukkit
I think i fixed Kaend's problem.
Add repository information, should now upload archives