Merge branch 'master' into pizza-rofl

AdventureTimeSS14 · Jan 7, 2024 · be17a0e · be17a0e
2 parents 4b0f6b2 + e924632
commit be17a0e
Show file tree

Hide file tree

Showing 302 changed files with 56,375 additions and 32,926 deletions.
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -156,6 +156,7 @@ void AddSection(string title, string path, bool markup = false)
             }
 
             AddSection(Loc.GetString("credits-window-contributors-section-title"), "GitHub.txt");
+            AddSection(Loc.GetString("credits-window-devADT-section-title"), "ADTeam.txt"); // ADT team
             AddSection(Loc.GetString("credits-window-codebases-section-title"), "SpaceStation13.txt");
             AddSection(Loc.GetString("credits-window-tts-title"), "TTS.txt"); // Corvax-TTS
             AddSection(Loc.GetString("credits-window-original-remake-team-section-title"), "OriginalRemake.txt");