Merge remote-tracking branch 'refs/remotes/origin/Dritory' into theAzack9

Conflicts:
	Epsilon src/mods/Epsilon/blocks/EpsilonBlocksInitialization.java
Stuff
bunch of changes
Merge remote-tracking branch 'refs/remotes/origin/theAzack9'

Conflicts:
	Epsilon src/mods/Epsilon/blocks/EpsilonBlocksInitialization.java