ATG biome changes and NPE in fishing
npe fix and potential atg fix (doubt it very much...)
Merge remote-tracking branch 'origin/stable' into stable

Conflicts:
	Mariculture/src/mariculture/core/blocks/BlockUtil.java
	Mariculture/src/mariculture/diving/TileAirCompressorPower.java