More Blasters upgrade

Someone merged and overwrote the work I did in my last commit. This is
me redoing it; there's still that bug.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeepSpaceMineFinal.userprefs

Trying to fix weird conflicts