Your Name 9150e85442 Merge remote-tracking branch 'upstream/master' into feature/upstream-master-20260614 ...

# Conflicts:
#	src/Client.cc
#	src/IPStackSimulator.cc
#	src/ReceiveCommands.cc
#	src/ReceiveSubcommands.cc
#	src/SendCommands.cc
#	src/ServerState.cc
#	src/ServerState.hh

2026-06-14 18:30:38 -04:00

..

blueburst

more work on ItemMagEdit

2026-06-06 21:51:15 -07:00

client-functions

Merge upstream master

2026-06-11 18:31:23 -04:00

client-functions.disabled

Disable GC V3 XP patch menu for now

2026-05-24 12:33:43 -04:00

ep3

reimplement Episode 3 map categories

2025-10-26 23:07:47 -07:00

gba

add non-English versions of several GC quests

2023-10-16 11:34:11 -07:00

maps

add symlinks for DC V1 battle mode city maps; closes #772

2026-06-06 21:51:15 -07:00

patch-bb/data

Force BB clients to repatch default lobby assets

2026-05-17 02:21:41 -04:00

patch-pc/Media/PSO

Adjust PSOPC patch directory structure

2023-12-17 18:44:16 -08:00

patch-pc-5x

Add PC V2 EXP patch assets

2026-05-20 23:04:38 -04:00

patch-pc-10x/Media/PSO

Add PC V2 EXP patch assets

2026-05-20 23:04:38 -04:00

quests

Merge remote-tracking branch 'upstream/master' into feature/upstream-master-20260614

2026-06-14 18:30:38 -04:00

tables

name Root structures appropriately

2026-06-14 10:03:55 -07:00

text-sets

rewrite map data model

2025-01-01 17:47:50 -08:00

config.example.json

Merge remote-tracking branch 'upstream/master' into feature/upstream-master-20260614

2026-06-14 18:30:38 -04:00