Yay most server changes done

Signed-off-by: PenguinToast <java.user.00001@gmail.com>
Merge remote-tracking branch 'origin/dev-majorchangeserver' into majorchangev01
we had lots of new stuff
yay new stuffs again