Fix the stupid errors
Merge branch '1.6.1' of github.com:Minetweak/Minetweak into 1.6.1

Conflicts:
	src/main/java/net/minecraft/src/AnvilSaveConverter.java
	src/main/java/net/minecraft/src/DedicatedServer.java
	src/main/java/net/minecraft/src/NetServerHandler.java
	src/main/java/net/minecraft/src/PropertyManager.java
One more fix