Morb0 4516e1ceef Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/skeleton_first.yml		2023-08-22 08:22:56 +03:00
..
Audio	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-21 09:44:38 +03:00
Changelog	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-22 08:22:56 +03:00
ConfigPresets	Set Discord rich presence Cvar logo (#1356)	2023-08-21 12:57:01 +03:00
Credits
Fonts
Locale	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-22 08:22:56 +03:00
Maps	Fix maps (#1349)	2023-08-21 10:51:01 +03:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-22 08:22:56 +03:00
ServerInfo	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-21 09:44:38 +03:00
Textures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-22 08:22:56 +03:00
clientCommandPerms.yml	Adjust debug command perm (#19202)	2023-08-16 02:03:24 -06:00
engineCommandPerms.yml	Add oldhelp to engine commands perms (#18603)	2023-08-03 11:44:31 -05:00
keybinds.yml	Fix throw hotkey also focusing UI (#17493)	2023-06-20 18:24:32 -07:00
manifest.yml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
map_attributions.txt	Core: NEW station map (#17269)	2023-07-19 01:23:48 -06:00
mapping_actions.yml
migration.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-15 00:08:39 +03:00
toolshedEngineCommandPerms.yml	Fix missing command permissions (#19008)	2023-08-11 21:54:57 -07:00