Morb0 996b761d80 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Packaging/ClientPackaging.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json		2025-01-16 13:37:26 +03:00
..
IPIntel	Fix IPIntel causing frequent errors with the cleanup job. (#34428)	2025-01-14 21:38:26 +01:00
Whitelist	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ConnectionManager.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
ConnectionManager.Whitelist.cs	Add IPIntel API support. (#33339)	2025-01-12 20:41:26 +01: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