Dangit, I would have more, but I was interrupted.
Poof!
Dammit, Git
I blame AJ

Conflicts:
	src/minecraft/sbfp/modsbfp.java
Lolz, merge SUCCESS!