Update to latest upstream
See MassiveCraft/mcore@813661877d0bb73cabe56f748c72ad6e7e72df0f for more info