Fixed NoClassDefFoundError
Merge branch '1.7' of https://github.com/kirderf1/Minestuck into kirderf1-1.7
Merge pull request #49 from kirderf1/1.7

Edit mode fix
Merge pull request #50 from kirderf1/master

Deploylist, grist widget spawning grist entities and more.
Made underlings call all underling types to help
Actually make underlings call allies for help
Readded real NEI support
Fixed layered sand
Updated README.md
Fixed land register packets being empty
Merge branch 'master' of github.com:mraof/Minestuck
Underlings drop secondary grist instead of random
Bug fixes mainly
Fixed bugs, added aspects, created rooks
Updated to 1.7.10, added transportalizers
Added Alchemization Recipe for Transportalizer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/mraof/minestuck/Minestuck.java
	src/com/mraof/minestuck/client/ClientProxy.java
	src/com/mraof/minestuck/client/gui/GuiHandler.java
	src/com/mraof/minestuck/client/gui/GuiPlayerStats.java
	src/com/mraof/minestuck/network/TitlePacket.java
	src/com/mraof/minestuck/world/storage/MinestuckSaveHandler.java