Merge pull request #46 from kirderf1/master

Increased compability with players that have entered medium before the editmode update
1.7 updating from mraof's code.
Editmode is disabled and the old give items button is temporarly re-added.
Server/Lan fix and updated chunk generator position algoritm
Merged together the two card items and the two dowels, along with adding some new features to the punch designex.
Merge mraof/Minestuck into 1.7

Conflicts:
	com/mraof/minestuck/editmode/ClientEditHandler.java
Added 1.7 gradle support
Moved all code and resources to src
Removed build folder, added fake NEI source
More 1.7 stuff
Fixed all warnings except ones regarding the Skaian castle
Merge mraof/Minestuck into 1.7
Removed unused imports and re-removed two edit mode classes.
Moved README.md
Fixed the serious problems with edit mode
Changed the default value for giveItems
Merge branch '1.7'