Ed 7d26a26547 Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	LICENSE.TXT
#	Resources/Locale/ru-RU/administration/commands/babyjail.ftl
#	Resources/Maps/Shuttles/emergency_elkridge.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-01-22 13:46:46 +03:00

..

BanList

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

Commands

Upstream sync (#786)

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

Components

Content update for UI prediction (#27214)

2024-04-26 18:16:24 +10:00

Logs

Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687)

2024-08-05 16:13:27 -07:00

Managers

Upstream sync (#786)

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

Notes

Improve admin message seen/dismiss state. (#26223)

2024-03-21 16:15:46 +01:00

Systems

Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream

2025-01-22 13:46:46 +03:00

Toolshed

Toolshed refactor (#33598)

2024-12-21 17:45:48 +11:00

UI

Upstream sync (#786)

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

AdminCommandAttribute.cs

Toolshed (#17895)

2023-08-02 16:09:08 -05:00

AdminPermsChangedEventArgs.cs

Un-revert IPlayerManager refactor (#21244)

2023-10-28 09:59:53 +11:00

AdminRank.cs

Remove redundant #nullable enable (#4275)

2021-07-16 17:37:09 -07:00

BanPanelEui.cs

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

ContentNetworkResourceManager.cs

Un-revert IPlayerManager refactor (#21244)

2023-10-28 09:59:53 +11:00

PlayerLocator.cs

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

PlayerPanelEui.cs

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

QuickDialogSystem.cs

Obsolete refactor - ConnectedClient to Channel (#24409)

2024-01-23 09:14:13 +11:00

QuickDialogSystem.OpenDialog.cs

Obsolete refactor - ConnectedClient to Channel (#24409)

2024-01-23 09:14:13 +11:00

ServerApi.cs

Panic Bunker uses minutes not hours (#28805)

2024-06-09 22:45:47 +02:00

ServerApi.Utility.cs

Game server admin API (#26880)

2024-04-14 20:13:29 +10:00