Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-01 23:06:19 +03:00
..
DatabaseRecords.cs	Fix database round start date issues (#26838)	2024-04-14 07:39:43 +02:00
ServerBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerDbBase.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-01 23:06:19 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00
ServerDbPostgres.cs	Fix preference loading bugs (#27742)	2024-05-07 14:21:03 +10:00
ServerDbSqlite.cs	Fix preference loading bugs (#27742)	2024-05-07 14:21:03 +10:00
ServerRoleBanDef.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	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00