Merge branch 'master' into import_table_models
Merge remote-tracking branch 'origin/import_table_models' into import_table_models
Merge branch 'master' into import_table_models

Conflicts:
	gradle.properties
add .69 build for dev1 branch
Merge branch 'master' into import_table_models

Conflicts:
	src/main/java/net/shadowmage/ancientwarfare/structure/template/load/TemplateLoader.java
actually fix animal farm load/save from nbt of max animal values.
Closes #118
Fix NPCs respawning with equipment from resurrections.  Closes #117
Merge branch 'import_table_models' into vehicle_start
Merge branch 'vehicle_start' of https://github.com/shadowmage45/AncientWarfare2.git into vehicle_start