Merge remote-tracking branch 'refs/remotes/origin/theAzack9'
Did some stuff, not finished. Warning may be errors
Merge remote-tracking branch 'refs/remotes/origin/master'

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