Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png		2023-12-14 00:57:14 +03:00
..
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-14 00:57: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
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