Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/leon1236/endrealm/init/ModBlocks.java

#$
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/leon1236/endrealm/init/ModBlocks.java