Ed 97939f6e3e Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream ...

# Conflicts:
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

2024-08-08 12:29:20 +03:00

..

Audio

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

2024-08-05 15:28:42 +03:00

Changelog

Automatic changelog update

2024-08-08 03:09:34 +00:00

ConfigPresets

Merge branch 'master' into ed-05-08-2024-upstream

2024-08-05 21:08:20 +03:00

Credits

Update Credits (#30620)

2024-08-03 21:01:41 -04:00

Fonts

Implement basic emoji support (#24039)

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

IgnoredPrototypes

ignore traits

2024-07-28 21:04:45 +03:00

Locale

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

2024-08-08 12:29:20 +03:00

Maps

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

2024-08-08 12:29:20 +03:00

Prototypes

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

2024-08-08 12:29:20 +03:00

ServerInfo

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

2024-07-28 20:58:48 +03:00

Textures

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

2024-08-08 12:29:20 +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

Add mapping editor (#23427)

2024-08-04 13:31:45 +10: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-05-08-2024-upstream

2024-08-05 15:28:42 +03:00

toolshedEngineCommandPerms.yml

…