+ Created new file Global.java
* Extracted most String Literals from across the project into one file.
Fixed Conflict Issues
Fixed minor mistakes, replaced tab with spaces
Fixed Conflict Issues
+ Created new file Global.java
* Extracted most String Literals from across the project into one file.
Added ModVariables.java
Fixed any errors that were from rebase
Revert "Fixed any errors that were from rebase"

This reverts commit 7ebe673d2e966856f6a032fd5bd7fce77b65c315.