Cinka 614318c0f2 Merge remote-tracking branch 'upstream/master' into upstream ...

# Conflicts:
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

2024-03-02 16:39:39 +03:00

..

Pair

[Upstream] Upstream (#109)

2024-02-23 16:05:48 +00:00

Tests

Merge remote-tracking branch 'upstream/master' into upstream

2024-03-02 16:39:39 +03:00

Content.IntegrationTests.csproj

Dependency update / fixes / skrungle bungle (#23745)

2024-01-12 23:22:01 +01:00

DummyParallaxManager.cs

…

GlobalUsings.cs

…

PoolManager.cs

Dependency update / fixes / skrungle bungle (#23745)

2024-01-12 23:22:01 +01:00

PoolManager.Cvars.cs

Fix MapPainter (#22290)

2023-12-10 22:19:26 +11:00

PoolManager.Prototypes.cs

…

PoolManagerTestEventHandler.cs

…

PoolSettings.cs

…

PoolTestLogHandler.cs

Add some tests and fix some miscellaneous bugs (#22836)

2023-12-28 10:05:20 +11:00

TestPrototypesAttribute.cs

…