monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: cleanup gitignore, as a bunch of files/folders no longer exist in AP

This commit is contained in:
Fabian Dill 2022-01-29 15:39:14 +01:00
parent a97e6833a3
commit 5777808aa9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -27,14 +27,9 @@ dist
README.html README.html
.vs/ .vs/
EnemizerCLI/ EnemizerCLI/
RaceRom.py
weights/
/MultiMystery/
/Players/ /Players/
/QUsb2Snes/
/options.yaml /options.yaml
/config.yaml /config.yaml
/uploads/
/logs/ /logs/
_persistent_storage.yaml _persistent_storage.yaml
mystery_result_*.yaml mystery_result_*.yaml
@ -45,6 +40,10 @@ Output Logs/
/factorio/ /factorio/
/Minecraft Forge Server/ /Minecraft Forge Server/
/WebHostLib/static/generated /WebHostLib/static/generated
/freeze_requirements.txt
/Archipelago.zip
/setup.ini
# Byte-compiled / optimized / DLL files # Byte-compiled / optimized / DLL files
__pycache__/ __pycache__/
@ -152,8 +151,6 @@ dmypy.json
# Cython debug symbols # Cython debug symbols
cython_debug/ cython_debug/
Archipelago.zip
#minecraft server stuff #minecraft server stuff
jdk*/ jdk*/
minecraft*/ minecraft*/

4
CommonClient.py
View File

@ -465,13 +465,13 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
raise Exception('Player slot already in use for that team') raise Exception('Player slot already in use for that team')
elif 'IncompatibleVersion' in errors: elif 'IncompatibleVersion' in errors:
raise Exception('Server reported your client version as incompatible') 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 # last to check, recoverable problem
elif 'InvalidPassword' in errors: elif 'InvalidPassword' in errors:
logger.error('Invalid password') logger.error('Invalid password')
ctx.password = None ctx.password = None
await ctx.server_auth(True) await ctx.server_auth(True)
elif 'InvalidItemsHandling' in errors:
raise Exception('The item handling flags requested by the client are not supported')
elif errors: elif errors:
raise Exception("Unknown connection errors: " + str(errors)) raise Exception("Unknown connection errors: " + str(errors))
else: else: