Ed bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml

2024-07-04 18:14:21 +03:00

..

Audio

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

2024-06-30 11:18:30 +03:00

Changelog

Automatic changelog update

2024-07-04 08:03:49 +00:00

ConfigPresets

Fix Farm Grass Hopper config for real this time (#29583)

2024-06-29 22:18:06 +02:00

Credits

Update Credits (#29594)

2024-06-29 20:31:18 -04: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-05-07-2024-upstream

2024-07-04 18:14:21 +03:00

Maps

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

2024-07-04 18:14:21 +03:00

Prototypes

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

2024-07-04 18:14:21 +03:00

ServerInfo

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

2024-06-17 14:20:38 +03:00

Textures

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

2024-07-04 18:14:21 +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-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

toolshedEngineCommandPerms.yml

…