UPDATES ON EVERYTHING
Merge remote-tracking branch 'refs/remotes/ExtraneousCraft/master'