Morb0 c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml # Resources/Prototypes/Maps/omega.yml # Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-12-24 20:02:16 +03:00
..
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +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
OptionsMenu.xaml	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00
OptionsMenu.xaml.cs	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00