Ed 2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml

2024-07-23 12:24:42 +03:00

..

Pair

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

Tests

Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream

2024-07-23 12:24:42 +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

Make tests automatically reset modified cvars (#28219)

2024-05-31 12:44:35 +10:00

PoolManager.Cvars.cs

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03: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

Split PoolManager into separate classes. (#19370)

2023-08-22 22:14:01 +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