Scipio Wright c74ccd74a4 # Conflicts: ...

#	worlds/tunic/__init__.py
#	worlds/tunic/combat_logic.py
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/er_scripts.py

2024-12-15 17:10:22 -05:00

..

docs

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

2024-11-18 09:13:55 -05:00

test

TUNIC: Logic Rules Redux (#3544)

2024-09-08 14:42:59 +02:00

__init__.py

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

2024-12-08 20:10:58 -05:00

combat_logic.py

# Conflicts:

2024-12-15 17:10:22 -05:00

er_data.py

# Conflicts:

2024-12-15 17:10:22 -05:00

er_rules.py

# Conflicts:

2024-12-15 17:10:22 -05:00

er_scripts.py

Add a failsafe for direction pairing

2024-09-20 20:25:51 -04:00

items.py

TUNIC: Add prog + useful to some items #4066

2024-10-23 02:30:31 +02:00

ladder_storage_data.py

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

2024-11-18 09:13:55 -05:00

locations.py

TUNIC: Logic Rules Redux (#3544)

2024-09-08 14:42:59 +02:00

options.py

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

2024-12-08 20:10:58 -05:00

regions.py

TUNIC: Logic Rules Redux (#3544)

2024-09-08 14:42:59 +02:00

rules.py

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

2024-12-08 20:10:58 -05:00