Morb0 da4af61aee Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json		2024-06-15 10:39:49 +03:00
..
UI	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-15 10:39:49 +03:00
ClientPreferencesManager.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03: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	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-15 10:39:49 +03:00