Added fish types with item metadata
Merge branch 'master' of https://github.com/defiant810/Essencraft

Conflicts:
	src/main/java/com/co2/essencraft/config/ConfigHandler.java
	src/main/java/com/co2/essencraft/lib/StringLib.java