Reverted back to https://github.com/andrewphorn/ClassiCube-Client/tree/91b87c76d8850db33d967f7bd2e4d3573abc9347 manually readded commits since then