Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Pools

derotate core (#35740)

2025-03-09 01:48:55 -07:00

amber.yml

job counts for each map

2025-04-10 21:55:45 +12:00

arenas.yml

Update arenas.yml

2024-07-23 13:46:57 +03:00

bagel.yml

job counts for each map

2025-04-10 21:55:45 +12:00

box.yml

job counts for each map

2025-04-10 21:55:45 +12:00

centcomm.yml

Refactor map loading & saving

2024-12-23 02:42:17 +13:00

convex.yml

job counts for each map

2025-04-10 21:55:45 +12:00

core.yml

job counts for each map

2025-04-10 21:55:45 +12:00

debug.yml

Update debug.yml

2024-07-23 13:40:19 +03:00

elkridge.yml

job counts for each map

2025-04-10 21:55:45 +12:00

fland.yml

job counts for each map

2025-04-10 21:55:45 +12:00

gate.yml

Gate map (#32032)

2024-12-17 13:06:33 +03:00

loop.yml

job counts for each map

2025-04-10 21:55:45 +12:00

marathon.yml

job counts for each map

2025-04-10 21:55:45 +12:00

meta.yml

job counts for each map

2025-04-10 21:55:45 +12:00

oasis.yml

job counts for each map

2025-04-10 21:55:45 +12:00

omega.yml

remove duplicate CE entry

2025-04-10 22:06:10 +12:00

packed.yml

job counts for each map

2025-04-10 21:55:45 +12:00

plasma.yml

job counts for each map

2025-04-10 21:55:45 +12:00

reach.yml

job counts for each map

2025-04-10 21:55:45 +12:00

relic.yml

job counts for each map

2025-04-10 21:55:45 +12:00

saltern.yml

job counts for each map

2025-04-10 21:55:45 +12:00

salvage.yml

anonymize salvage wrecks (#31087)

2024-08-17 15:09:21 +10:00

train.yml

job counts for each map

2025-04-10 21:55:45 +12:00