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

..

_bizhawk

…

_sc2common

…

adventure

Adventure: Remove unused variables (#4301)

2024-12-06 07:15:26 +01:00

ahit

…

alttp

LTTP: sort of use new options system (#3764)

2024-11-29 05:02:26 +01:00

apsudoku

…

aquaria

# Conflicts:

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

archipidle

…

blasphemous

Blasphemous: Add start_inventory_from_pool (#4217)

2024-11-30 16:08:41 +01:00

bomb_rush_cyberfunk

…

bumpstik

…

celeste64

…

checksfinder

…

clique

…

cv64

…

cvcotm

# Conflicts:

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

dark_souls_3

DS3: Clarify location names for Yoel and Yuria items (#3881)

2024-12-01 05:00:06 +01:00

dkc3

…

dlcquest

…

doom_1993

id Tech 1 games: Add command line instructions/info (#3757)

2024-12-01 04:10:43 +01:00

doom_ii

id Tech 1 games: Add command line instructions/info (#3757)

2024-12-01 04:10:43 +01:00

factorio

Factorio: add Atomic Cliff Remover Trap (#4282)

2024-11-30 06:53:28 +01:00

faxanadu

New Game: Faxanadu (#3059)

2024-11-29 22:45:36 +01:00

ff1

…

ffmq

FFMQ: No Longer Allow Inaccessible Useful Items (#4323)

2024-12-03 22:51:58 +01:00

generic

…

heretic

id Tech 1 games: Add command line instructions/info (#3757)

2024-12-01 04:10:43 +01:00

hk

# Conflicts:

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

hylics2

…

kdl3

Various Worlds: use / explicitly for pkgutil (#4232)

2024-12-09 01:59:40 +01:00

kh1

…

kh2

KH2: Add missing indirect conditions for Final region access (#3923)

2024-12-03 02:51:10 +01:00

ladx

# Conflicts:

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

landstalker

…

lingo

# Conflicts:

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

lufia2ac

…

meritous

…

messenger

…

minecraft

Various Worlds: use / explicitly for pkgutil (#4232)

2024-12-09 01:59:40 +01:00

mlss

…

mm2

Various Worlds: use / explicitly for pkgutil (#4232)

2024-12-09 01:59:40 +01:00

mmbn3

…

musedash

# Conflicts:

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

noita

…

oot

…

osrs

…

overcooked2

…

pokemon_emerald

# Conflicts:

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

pokemon_rb

Pokemon RB: Fix Incorrect Hidden Item Location in Seafoam Islands B2F (#4304)

2024-12-05 07:48:33 +01:00

raft

Raft: Place locked items in create_items and fix get_pre_fill_items (#4250)

2024-12-09 01:57:34 +01:00

rogue_legacy

…

ror2

…

sa2b

…

saving_princess

Saving Princess: implement new game (#3238)

2024-12-07 11:29:27 +01:00

sc2

…

shivers

Various Worlds: use / explicitly for pkgutil (#4232)

2024-12-09 01:59:40 +01:00

shorthike

…

sm

Super Metroid: KeyError on invalid item name #4222

2024-12-01 05:03:13 +01:00

sm64ex

# Conflicts:

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

smw

…

smz3

SMZ3: generate without rom (#3461)

2024-11-30 03:36:00 +01:00

soe

…

spire

…

stardew_valley

# Conflicts:

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

subnautica

…

terraria

…

timespinner

Timespinner: Implemented support for universal tracker (#3771)

2024-12-01 04:11:45 +01:00

tloz

…

tunic

# Conflicts:

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

undertale

…

v6

…

wargroove

…

witness

# Conflicts:

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

yachtdice

…

yoshisisland

…

yugioh06

YGO06: add Item groups (#3737)

2024-12-01 04:09:22 +01:00

zillion

Zillion: use "new" settings api and cleaning (#3903)

2024-11-29 21:25:01 +01:00

zork_grand_inquisitor

…

__init__.py

…

AutoSNIClient.py

…

AutoWorld.py

Core: fix settings API for removal of Python 3.8, 3.9 (#4280)

2024-11-29 21:17:56 +01:00

Files.py

…

LauncherComponents.py

Launcher: support Component icons inside apworlds (#3629)

2024-11-30 03:58:52 +01:00