broke it in a way that makes it still work(server work)
Merge branch 'master' of https://github.com/mookie1097/NausicaaMod.git

Conflicts:
	src/main/java/mooklabs/nausicaamod/Main.java