Scipio Wright 2527b0f950 Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing ...

# Conflicts:
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/items.py

2024-08-16 19:53:38 -04:00

..

docs

…

test

…

__init__.py

Make it so the shops show up in the entrance hints

2024-08-16 19:17:51 -04:00

combat_logic.py

…

er_data.py

Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing

2024-08-16 19:53:38 -04:00

er_rules.py

Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing

2024-08-16 19:53:38 -04:00

er_scripts.py

Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing

2024-08-13 21:02:16 -04:00

items.py

Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing

2024-08-16 19:53:38 -04:00

ladder_storage_data.py

…

locations.py

…

options.py

Merge branch 'main' into tunc-portal-direction-pairing

2024-08-14 23:14:46 -04:00

regions.py

…

rules.py

Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing

2024-08-16 19:53:38 -04:00