Scipio Wright fb4ec5ee13 Fix merge conflict

2024-06-04 15:24:28 -04:00

..

docs

…

test

…

__init__.py

Merge branch 'main' into tunc-cleanup-rules

2024-06-04 15:22:52 -04:00

er_data.py

…

er_rules.py

Update to use world instead of player like Vi recommended

2024-06-01 12:38:02 -04:00

er_scripts.py

Merge branch 'main' into tunc-cleanup-rules

2024-06-04 15:22:52 -04:00

items.py

…

locations.py

…

options.py

TUNIC: Fix plando connections, seed groups, and UT support (#3429)

2024-06-03 03:44:37 -05:00

regions.py

…

rules.py

Fix merge conflict

2024-06-04 15:24:28 -04:00