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
..
APC	Fix APC turning invisible after emagging (#20245)	2023-09-23 11:27:51 -08:00
Generation/Teg	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Generator	Power switchable refactor (#20419)	2023-10-25 23:57:23 +11:00
SMES	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Visualizers	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
PowerMonitoringConsoleBoundUserInterface.cs	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
PowerMonitoringConsoleNavMapControl.cs	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
PowerMonitoringWindow.xaml	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
PowerMonitoringWindow.xaml.Widgets.cs	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
SolarControlWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
SolarControlWindow.xaml.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00