Common do it.
missing files
Merge remote-tracking branch 'di3mex/master'

Conflicts:
	src/me/ryanhamshire/ExtraHardMode/BlockEventHandler.java
	src/me/ryanhamshire/ExtraHardMode/BlockPhysicsCheckTask.java
	src/me/ryanhamshire/ExtraHardMode/DataStore.java
	src/me/ryanhamshire/ExtraHardMode/DragonAttackTask.java
	src/me/ryanhamshire/ExtraHardMode/EntityEventHandler.java
	src/me/ryanhamshire/ExtraHardMode/ExtraHardMode.java
	src/me/ryanhamshire/ExtraHardMode/Messages.java
	src/me/ryanhamshire/ExtraHardMode/MoreMonstersTask.java
	src/me/ryanhamshire/ExtraHardMode/PlayerEventHandler.java
	src/me/ryanhamshire/ExtraHardMode/RemoveExposedTorchesTask.java
Merge pull request #1 from Mitsugaru/master

Redesign & Restructuring
IntelliJ Test Commit
added some documentation. Reverted to curly braces at line beginning
Merge remote-tracking branch 'origin/master'
Start moving over to RootConfig. Reformat some Code so that curly braces are on the line beginning. Start to fix the "completely" broken MonstersSpawnInLight. Move away from maven, because it makes live debugging a lot more difficult.
Almost done with 3.1.
Personal updates.
Merge branch 'master' into minerp

Conflicts:
	plugin.yml
	src/me/ryanhamshire/ExtraHardMode/config/RootNode.java
	src/me/ryanhamshire/ExtraHardMode/event/EntityEventHandler.java
	src/me/ryanhamshire/ExtraHardMode/event/PlayerEventHandler.java