Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Changelog/ChangelogManager.cs # Content.Client/Doors/AirlockVisualizer.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml		2023-04-23 16:02:09 +03:00
..
APC	replace apc panel with wires panel (#14832)	2023-04-20 16:42:22 +10:00
SMES	Remove ISpriteComponent (#13458)	2023-01-15 13:38:53 +11: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	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