tons o' bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/macc188/IGD/reference/constants.java