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
..
Migrations	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
add-migration.ps1	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
add-migration.sh	DB QOL stuff, but not breaking the migrations now (#5086)	2021-10-31 15:18:01 +01:00
Content.Server.Database.csproj	Switch project files to C# 12. (#25487)	2024-02-23 15:02:59 +11:00
DesignTimeContextFactories.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
Model.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
ModelPostgres.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ModelSqlite.cs	Add IPIntel API support. (#33339)	2025-01-12 20:41:26 +01:00
SnakeCaseNaming.cs	Database SnakeCaseNaming fixes	2024-11-12 01:51:54 +01:00