Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Resources/Audio/Announcements/license.txt # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-03-07 18:54:29 +03:00
..
APC	Enhanced APC UI + New NT logo to footer (#14258)	2023-03-06 21:55:35 -04:00
SMES	Remove ISpriteComponent (#13458)	2023-01-15 13:38:53 +11:00
Visualizers	Remove some obsolete AppearanceComponent method usages (#13726)	2023-02-02 12:34:53 -04:00
PowerMonitoringWindow.xaml	Power Monitoring Console (#7849)	2022-05-04 10:59:40 -07:00
PowerMonitoringWindow.xaml.cs	Repository cleanup (#631)	2022-12-10 12:10:27 -08:00
SolarControlWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
SolarControlWindow.xaml.cs	BUI changes required for Engine PR (#10608)	2022-08-21 03:38:30 +10:00