Ed b891542ca9 Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml

2024-06-04 18:09:38 +03:00

..

Audio

Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

2024-06-04 18:09:38 +03:00

Changelog

Automatic changelog update

2024-06-04 13:27:27 +00:00

ConfigPresets

New event: Approaching unknown shuttle (#24490)

2024-05-10 04:35:59 -07:00

Credits

Shut up a child throwing a tantrum (#28538)

2024-06-03 03:05:18 +02:00

Fonts

Implement basic emoji support (#24039)

2024-01-29 15:32:13 +11:00

IgnoredPrototypes

Add a way for bulk abstracting prototypes (#24140)

2024-01-16 21:39:14 -08:00

Locale

Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

2024-06-04 18:09:38 +03:00

Maps

Updated day cycle (#171)

2024-06-04 17:54:49 +03:00

Prototypes

Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

2024-06-04 18:09:38 +03:00

ServerInfo

Merge remote-tracking branch 'upstream/master' into ed-30-05-2024-upstream

2024-05-30 13:29:19 +03:00

Textures

Battle hammer (#206)

2024-06-04 15:28:52 +03:00

clientCommandPerms.yml

Allow players to run saveconfig command. (#25200)

2024-02-14 11:03:27 +11:00

engineCommandPerms.yml

Clean up command perms (#28451)

2024-06-01 01:14:43 -07:00

keybinds.yml

Emotes Menu (#26702)

2024-04-28 21:38:23 -07:00

manifest.yml

Деревянная стена, стул, стол, удаление всех рецептов крафтов на G (#6)

2024-03-30 14:52:16 +03:00

map_attributions.txt

Add map Oasis (#25736)

2024-04-20 23:59:12 -06:00

mapping_actions.yml

Make mapping actions slightly more useable (#28394)

2024-05-30 12:09:07 -04:00

migration.yml

Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

2024-06-04 18:09:38 +03:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

2023-08-24 02:21:47 -07:00