Morb0 29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/military.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Maps/kettle.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml		2023-12-11 21:56:43 +03:00
..
PlayerRecord.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
ServerBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerBanNote.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerDbBase.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-11 21:56:43 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	High-latency DB testing stuff (#22282)	2023-12-10 16:30:12 +01:00
ServerDbPostgres.cs	High-latency DB testing stuff (#22282)	2023-12-10 16:30:12 +01:00
ServerDbSqlite.cs	High-latency DB testing stuff (#22282)	2023-12-10 16:30:12 +01:00
ServerRoleBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerRoleBanNote.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerRoleUnbanDef.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
ServerUnbanDef.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
UserDbDataManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00