Ed f84e1ba04d Merge branch 'master' into ed-25-08-2025-upstream-sync ...

# Conflicts:
#	Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml

2025-09-08 11:33:44 +03:00

..

Pair

MapRenderer code fixes (#38357)

2025-06-26 14:47:39 +02:00

Tests

Merge branch 'master' into ed-25-08-2025-upstream-sync

2025-09-08 11:33:44 +03:00

AssemblyInfo.cs

Reduce LevelOfParallelism to 2 for integration tests (#39566)

2025-08-11 12:43:57 -07: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

ExternalTestContext.cs

MapRenderer code fixes (#38357)

2025-06-26 14:47:39 +02:00

GlobalUsings.cs

Fix content.integration tests warnings (#17817)

2023-07-06 14:54:25 +10:00

ITestContextLike.cs

MapRenderer code fixes (#38357)

2025-06-26 14:47:39 +02:00

NUnitTestContextWrap.cs

MapRenderer code fixes (#38357)

2025-06-26 14:47:39 +02:00

PoolManager.cs

MapRenderer code fixes (#38357)

2025-06-26 14:47:39 +02:00

PoolManager.Cvars.cs

Mob collisions (#34580)

2025-04-05 00:33:52 +11:00

PoolManager.Prototypes.cs

Update component query benchmarks (#27967)

2024-05-19 11:55:10 +10:00

PoolManagerTestEventHandler.cs

Test parallelization stuff. (#31650)

2024-09-01 03:28:30 +02: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