Merge branch 'master' of https://github.com/Percymodder/MODJAM

Conflicts:
loe/LandOfEvarBeta.java
Uh oh, part 3
uh oh, part 4