Morb0 07a34aaaae Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json		2024-08-23 09:38:36 +03:00
..
ClientPackaging.cs	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +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