Vigers Ray d86ad2ba97 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json		2025-01-15 18:23:20 +03:00
..
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Managers	Hide some map related logs from clients (#27127)	2024-04-19 15:26:21 +10:00
Systems	Scale text in admin player overlay (#31503)	2024-08-27 16:43:47 +02:00
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-15 18:23:20 +03:00
AdminNameOverlay.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
QuickDialogSystem.cs	make dialog window not evil (#24677)	2024-02-01 23:56:40 +11:00