Morb0 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2 ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml		2023-09-19 11:41:15 +03:00
..
Audio	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
Changelog	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
ConfigPresets	Update WL server title (#1418)	2023-09-15 00:27:43 +03:00
Credits
Fonts
Locale	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
Maps	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
ServerInfo	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Textures	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
clientCommandPerms.yml	Adjust debug command perm (#19202)	2023-08-16 02:03:24 -06:00
engineCommandPerms.yml	Add print_pvs_ack command permissions (#20296)	2023-09-18 05:24:25 +10:00
keybinds.yml	Improve vv /c/enthover and add keybind (#20127)	2023-09-16 14:09:51 +10: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	Refactor actions to be entities with components (#19900)	2023-09-08 18:16:05 -07:00
migration.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
toolshedEngineCommandPerms.yml	Fix missing toolshed command perms and tests (#19470)	2023-08-24 02:21:47 -07:00