Morb0 29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/military.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Maps/kettle.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml		2023-12-11 21:56:43 +03:00
..
Pair	Add item sprite test (#21599)	2023-11-18 17:26:08 +11:00
Tests	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-11 21:56:43 +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	Fix SpawnAndDeleteEntityCountTest heisentest (#21975)	2023-11-30 22:08:08 +11:00
PoolManager.Cvars.cs	Fix MapPainter (#22290)	2023-12-10 22:19:26 +11: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