Ed ab1e071fdf Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-10-03 17:34:08 +03:00

..

Audio

Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

2024-10-03 17:34:08 +03:00

Changelog

Automatic changelog update

2024-10-03 14:02:07 +00:00

ConfigPresets

Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2

2024-09-17 11:54:36 +03:00

Credits

Update Credits (#32516)

2024-10-02 01:29:00 +02:00

Fonts

…

IgnoredPrototypes

Update cp14-ignoredPrototypes.yml

2024-09-27 10:48:56 +03:00

Locale

Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

2024-10-03 17:34:08 +03:00

Maps

Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

2024-10-03 17:34:08 +03:00

Prototypes

Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

2024-10-03 17:34:08 +03:00

ServerInfo

Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream

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

Textures

Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

2024-10-03 17:34:08 +03:00

clientCommandPerms.yml

…

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

…

map_attributions.txt

Added Cog(map) and its own evac shuttle (#30840)

2024-08-13 13:27:24 -06:00

mapping_actions.yml

…

migration.yml

2 new Lobby image, some bugfix (#468)

2024-09-28 01:29:02 +03:00

toolshedEngineCommandPerms.yml

…