Arthur Asimov 3da699ad32 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json		2023-12-05 07:42:45 +03:00
..
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
Commands	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Logs	Move ActorComponent to shared (#21293)	2023-10-29 04:21:02 +11:00
Managers	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Notes	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Systems	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Toolshed	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
UI	Revert Arch testmerge 2 (#21901)	2023-11-26 14:20:07 +11: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	use /64 for ipv6 bans (#22121)	2023-12-04 00:36:49 -06:00
ContentNetworkResourceManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
PlayerLocator.cs	Cache HTTP client in player locator (#12555)	2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
QuickDialogSystem.OpenDialog.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00