Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
benchmarks.yml	Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552)	2023-08-25 15:33:01 -07:00
build-docfx.yml	.NET 8 compatibility (#22461)	2023-12-15 18:19:48 +01:00
build-map-renderer.yml	.NET 8 compatibility (#22461)	2023-12-15 18:19:48 +01:00
build-test-debug.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
close-master-pr.yml	Action for closing prs submitted by the submitters master branch (#24094)	2024-02-02 01:05:01 +11:00
conflict-labeler.yml	Ignore IanComradeBot in workflows	2023-04-04 15:40:13 +03:00
labeler-approve.yml	Add labeler workflow permissions	2022-08-06 03:01:52 +03:00
labeler-changes.yml	Fix changes workflow name	2022-08-06 03:06:23 +03:00
labeler-needsreview.yml	Auto-labeling actions for pull requests (#6117)	2022-01-10 16:06:08 -07:00
labeler-pr.yml	Ignore IanComradeBot in workflows	2023-04-04 15:40:13 +03:00
no-submodule-update.yml	GitHub files update (#633)	2022-12-10 22:48:56 -08:00
publish-publish.yml	Fix forced manifest instead of ACZ for public build	2023-12-26 14:54:24 +03:00
publish.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
rsi-diff.yml	Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552)	2023-08-25 15:33:01 -07:00
test-packaging.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
update-credits.yml	Fixed credits action failing (#21733)	2023-12-09 13:15:38 +11:00
update-wiki.yml	Update update-wiki.yml (#1724)	2024-01-05 14:55:46 +03:00
validate-rgas.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
validate-rsis.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
validate_mapfiles.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
yaml-linter.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00