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

..

UI

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

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

ClientPreferencesManager.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

IClientPreferencesManager.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

LobbyState.cs

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

LobbyUIController.cs

Fix 38 non-obsolete warnings (#33794)

2025-02-11 20:59:50 +11:00