Morb0 81fe87f513 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Maps/saltern.yml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml		2023-08-21 09:44:38 +03:00
..
APC	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
Generation/Teg	Fix some TEG code conventions (#19259)	2023-08-17 11:50:41 -07:00
Generator	Material generators from Afterlight (#18387)	2023-07-31 14:42:38 -04:00
SMES	Resolves SmesVisualizer is Obsolete (#13899)	2023-05-07 13:43:41 +10:00
Visualizers	Resolves PowerDeviceVisualizer is Obsolete (#13900)	2023-04-22 19:37:40 +10:00
PowerMonitoringWindow.xaml	Power Monitoring Console (#7849)	2022-05-04 10:59:40 -07:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03: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