Converted Hallucination and majority of EM_StatusManager
Merge branch 'Fuwnayguy' into bigUpdate
Converted most of EnviroDataTracker
Converted Earthquake
Merge branch 'thislooksfun' of https://github.com/Funwayguy/EnviroMine-1.7 into GenDeathrow

Conflicts:
	src/main/java/enviromine/handlers/EM_StatusManager.java
Merge branch 'thislooksfun' into bigUpdate

WARNING: Unable to merge 'src/main/java/enviromine/handlers/EM_StatusManager.java' due to unresolved conflicts!

Conflicts:
	src/main/java/enviromine/handlers/EM_StatusManager.java
* Fixed Rest of the ID issues
* Fixed Biome Array
- Commented out Modded Armor Search
   TODO Set up Modded Armor for Iterator
Merge branch 'Fuwnayguy' into bigUpdate
Converted Potions & Utils
Merge branch 'GenDeathrow' into bigUpdate

Conflicts:
	src/main/java/enviromine/handlers/EM_StatusManager.java
Merge branch 'Fuwnayguy' into bigUpdate