Vigers Ray 28484c893c Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml # Resources/migration.yml		2024-12-16 18:50:05 +03:00
..
Whitelist	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ConnectionManager.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-16 18:50:05 +03:00
ConnectionManager.Whitelist.cs	Fix whitelist (#31563)	2024-08-28 17:11:25 +10:00
GrantConnectBypassCommand.cs	Use moderator perms for grant_connect_bypass (#29406)	2024-06-24 23:56:29 +02:00
UserDataExt.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00