Marechal-l 5ba427d55d Merge branch 'feature/ds3_use_slotdata' into feature/main_candidate ...

# Conflicts:
#	worlds/dark_souls_3/data/locations_data.py

2022-10-28 20:14:06 +02:00

..

data

Merge branch 'feature/ds3_use_slotdata' into feature/main_candidate

2022-10-28 20:14:06 +02:00

docs

DS3: Remove AP.json from the documentation

2022-10-28 19:56:48 +02:00

__init__.py

Merge branch 'feature/ds3_use_slotdata' into feature/main_candidate

2022-10-28 20:14:06 +02:00

Items.py

DS3: Changed i in loop

2022-10-28 19:16:00 +02:00

Locations.py

DS3: Changed i in loop

2022-10-28 19:16:00 +02:00

Options.py

…