Will this work for compile?
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/cazzar/corelib/lib/SoundSystemHelper.java
Better type annotations for the compiler and source packages, also reverted mappings to maintain other-mod compatibility