Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/CharacterSetupGui.xaml # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Clothing/Back/satchel.yml # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-11-04 12:16:53 +03:00
..
Pair	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Tests	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-04 12:16:53 +03:00
Content.IntegrationTests.csproj	Fix content.integration tests warnings (#17817)	2023-07-06 14:54:25 +10:00
DummyParallaxManager.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
GlobalUsings.cs	Fix content.integration tests warnings (#17817)	2023-07-06 14:54:25 +10:00
PoolManager.cs	Replace all T : Component constraints with T : IComponent (#21073)	2023-10-17 19:42:47 -07:00
PoolManager.Cvars.cs	Split PoolManager into separate classes. (#19370)	2023-08-22 22:14:01 +10:00
PoolManager.Prototypes.cs	Remove PoolSettings.ExtraPrototypes option (#18678)	2023-08-05 14:16:48 +10:00
PoolManagerTestEventHandler.cs	Remove PoolSettings.ExtraPrototypes option (#18678)	2023-08-05 14:16:48 +10:00
PoolSettings.cs	Split PoolManager into separate classes. (#19370)	2023-08-22 22:14:01 +10:00
PoolTestLogHandler.cs	Fix content.integration tests warnings (#17817)	2023-07-06 14:54:25 +10:00
TestPrototypesAttribute.cs	Fix test prototypes fields being marked as unused (#20853)	2023-10-09 00:19:32 -07:00