Updating to current 1.6.4 build.
Merging in Roomon1's structure fixes.
Merge branch 'master' of https://github.com/FossilsArcheologyRevival/FossilArcheology1.7

Conflicts:
	src/main/java/coolalias/structuregenapi/util/StructureGeneratorBase.java
	src/main/java/mods/fossil/gens/structure/academy/AcademyUtil.java
	src/main/java/mods/fossil/gens/structure/shipwreck/ShipWreck1.java
	src/main/java/mods/fossil/gens/structure/shipwreck/ShipWreckUtil.java
Updating to latest 1.6.4.
f1e3f9e8255079f31729575b0c03f6156088bd07
6ceaef11c6c2a052924d8180ffcd8db3edd4fcbf
6531df7635eb3977417e633c8011ffb9fc15266d
b1ae130764d486d1d3fef4f72614091af33675cd
Corrected nbt check in pregnant entities.
Fixed connection messages.
Model tweaks.
Arm bones are actually registered now.
Dilophoosaurus no longer crash when hit.
Added spinosaurus sounds
Fixed T-Rex texture.
Bump for 6.3.1 release.
Null check.
Merge pull request #29 from 4f6f3b/master

Update to 6.3.1.