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
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Managers	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Systems	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-14 00:57:14 +03:00
AdminNameOverlay.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00