Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

Audio

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Changelog

Automatic changelog update

2025-02-16 08:36:41 +00:00

ConfigPresets

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Credits

Update Credits (#35196)

2025-02-16 03:06:32 +01:00

Fonts

…

IgnoredPrototypes

Update cp14-ignoredPrototypes.yml

2024-12-11 14:49:44 +03:00

Locale

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Maps

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Prototypes

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

ServerInfo

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Textures

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

clientCommandPerms.yml

Move client dumpentities command to "DEBUG" (#32687)

2024-10-07 19:19:42 +02:00

engineCommandPerms.yml

…

keybinds.yml

…

manifest.yml

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

map_attributions.txt

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

mapping_actions.yml

…

migration.yml

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

toolshedEngineCommandPerms.yml

Toolshed refactor (#33598)

2024-12-21 17:45:48 +11:00