Morb0 e853272357 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml		2024-07-21 12:48:56 +03:00
..
DiskConsoleBoundUserInterface.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
DiskConsoleMenu.xaml	Technology Disks (#13077)	2022-12-20 16:39:57 -06:00
DiskConsoleMenu.xaml.cs	Technology Disks (#13077)	2022-12-20 16:39:57 -06:00
MiniTechnologyCardControl.xaml	Remove custom tooltip timings (#19604)	2023-09-11 13:53:35 +10:00
MiniTechnologyCardControl.xaml.cs	Avoid emptying and recreating all UI cards on every update (#21990)	2023-11-29 14:49:44 -05:00
ResearchClientBoundUserInterface.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
ResearchClientServerSelectionMenu.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
ResearchClientServerSelectionMenu.xaml.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
ResearchConsoleBoundUserInterface.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
ResearchConsoleMenu.xaml	Wide research computer ui (#1401)	2023-09-09 18:13:16 +03:00
ResearchConsoleMenu.xaml.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
TechnologyCardControl.xaml	Fix PDA capitalization to be PascalCase (#17335)	2023-06-15 11:44:28 +10:00
TechnologyCardControl.xaml.cs	Fix some markup related obsolete warnings in research and anomaly related systems (#30072)	2024-07-15 22:14:37 +03:00