Ed 3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync ...

# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml

2024-06-21 18:30:31 +03:00

..

UI

Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync

2024-06-21 18:30:31 +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

Don't use invalid defaults for loadouts (#28740)

2024-06-15 16:53:42 +10:00