Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

Tabs

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

EscapeMenu.xaml

Guidebook Revival (#13320)

2023-01-16 02:42:22 -06:00

EscapeMenu.xaml.cs

Merge more UI refactor stuff (#11277)

2022-09-14 14:34:48 -07:00

OptionDropDown.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionDropDown.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionSlider.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionSlider.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionsMenu.xaml

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

OptionsMenu.xaml.cs

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

OptionsTabControlRow.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionsTabControlRow.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00