Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +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	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07: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
PowerMonitoringWindow.xaml	Power Monitoring Console (#7849)	2022-05-04 10:59:40 -07:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +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