Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Audio

Wendigo demiplane antag (#1174)

2025-04-12 17:32:53 +03:00

Changelog

Automatic changelog update

2025-04-10 16:00:25 +00:00

ConfigPresets

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

Credits

Update Credits (#36337)

2025-04-06 02:37:26 +02:00

Fonts

…

IgnoredPrototypes

Update cp14-ignoredPrototypes.yml

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

Locale

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

Maps

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

Prototypes

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

ServerInfo

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

Textures

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

clientCommandPerms.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

engineCommandPerms.yml

…

keybinds.yml

Skill progression system [Draft] (#1056)

2025-03-27 17:20:20 +03: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

Revert "Another Try" (#1170)

2025-04-12 12:03:18 +03:00

toolshedEngineCommandPerms.yml

Update permissions for engine toolshed PR

2024-12-24 03:37:31 +13:00