Added Enderich stuff and Block textures
Updated Lang File
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/java/com/kaboomboom3/fantasymod/Pyroxore.java