diff --git a/.gitignore b/.gitignore index 45815f10..3bdaaaba 100644 --- a/.gitignore +++ b/.gitignore @@ -27,14 +27,9 @@ dist README.html .vs/ EnemizerCLI/ -RaceRom.py -weights/ -/MultiMystery/ /Players/ -/QUsb2Snes/ /options.yaml /config.yaml -/uploads/ /logs/ _persistent_storage.yaml mystery_result_*.yaml @@ -45,6 +40,10 @@ Output Logs/ /factorio/ /Minecraft Forge Server/ /WebHostLib/static/generated +/freeze_requirements.txt +/Archipelago.zip +/setup.ini + # Byte-compiled / optimized / DLL files __pycache__/ @@ -152,8 +151,6 @@ dmypy.json # Cython debug symbols cython_debug/ -Archipelago.zip - #minecraft server stuff jdk*/ minecraft*/ diff --git a/CommonClient.py b/CommonClient.py index a89a2703..ddebf6fe 100644 --- a/CommonClient.py +++ b/CommonClient.py @@ -465,13 +465,13 @@ async def process_server_cmd(ctx: CommonContext, args: dict): raise Exception('Player slot already in use for that team') elif 'IncompatibleVersion' in errors: raise Exception('Server reported your client version as incompatible') + elif 'InvalidItemsHandling' in errors: + raise Exception('The item handling flags requested by the client are not supported') # last to check, recoverable problem elif 'InvalidPassword' in errors: logger.error('Invalid password') ctx.password = None await ctx.server_auth(True) - elif 'InvalidItemsHandling' in errors: - raise Exception('The item handling flags requested by the client are not supported') elif errors: raise Exception("Unknown connection errors: " + str(errors)) else: