Ed 5c391b753f Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
#	Resources/Maps/Test/dev_map.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-02-06 14:38:00 +03:00

..

Audio

Upstream sync (#846)

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

Changelog

Upstream sync (#846)

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

ConfigPresets

Upstream sync (#846)

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

Credits

Upstream sync (#846)

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

Fonts

…

IgnoredPrototypes

Update cp14-ignoredPrototypes.yml

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

Locale

Upstream sync (#846)

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

Maps

Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix

2025-02-06 14:38:00 +03:00

Prototypes

Upstream sync (#846)

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

ServerInfo

Upstream sync (#846)

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

Textures

Upstream sync (#846)

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

clientCommandPerms.yml

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

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

engineCommandPerms.yml

Remove testbed command (#31793)

2024-09-03 22:02:27 +10:00

keybinds.yml

Make holding down an arrow key traverse the pointer in chat (#31380)

2024-08-24 11:37:30 +02:00

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

Upstream sync (#846)

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

toolshedEngineCommandPerms.yml

Toolshed refactor (#33598)

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