Morb0 a0bce916fb Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/origin.yml		2024-08-16 14:29:08 +03:00
..
Pair	Add random seed options to tests (#30735)	2024-08-09 15:25:43 +10:00
Tests	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-16 14:29:08 +03:00
Content.IntegrationTests.csproj	Switch project files to C# 12. (#25487)	2024-02-23 15:02:59 +11: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	Add random seed options to tests (#30735)	2024-08-09 15:25:43 +10:00
PoolManager.Cvars.cs	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
PoolManager.Prototypes.cs	Update component query benchmarks (#27967)	2024-05-19 11:55:10 +10:00
PoolManagerTestEventHandler.cs	Update component query benchmarks (#27967)	2024-05-19 11:55:10 +10:00
PoolSettings.cs	Add random seed options to tests (#30735)	2024-08-09 15:25:43 +10:00
PoolTestLogHandler.cs	Add some tests and fix some miscellaneous bugs (#22836)	2023-12-28 10:05:20 +11:00
TestPrototypesAttribute.cs	Fix test prototypes fields being marked as unused (#20853)	2023-10-09 00:19:32 -07:00