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
..
ClientPackaging.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
CommandLineArgs.cs	Configuration argument for content packaging (#25569)	2024-03-24 13:20:34 +11:00
Content.Packaging.csproj	Dependency update / fixes / skrungle bungle (#23745)	2024-01-12 23:22:01 +01:00
Program.cs	Ensure packager creates a release folder (#28426)	2024-06-08 20:33:51 +10:00
ServerPackaging.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-23 09:38:36 +03:00