resolve asset merge conflict
fix textures being extremely blurry (thank you terra!)
fix the client ping system
alright lets go stuff broke again
redirect player to main page if they are missing a query parameter
haha am idiot, needed to pull again
stop mainloop when it errors - fix pingpong
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Cargo.lock
# client/src/lib.rs
# server/src/client_handler.rs
# server/src/handler.rs
# server/src/main.rs
exponential backoff to connections (wait at most 6m25s to connect to server)