Ed dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml

2024-08-05 15:28:42 +03:00

..

UI

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

2024-08-05 15:28:42 +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

Lobby refactor + species loadouts support (#27576)

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

LobbyUIController.cs

De-duplicate loadout gear (#30341)

2024-08-05 00:42:25 -04:00