Merge branch 'dependabot/npm_and_yarn/express-rate-limit-7.1.5' of ht…

…tps://github.com/RCVolus/league-prod-toolkit into dependabot/npm_and_yarn/express-rate-limit-7.1.5
RCVolus · Dec 4, 2023 · 4bb5998 · 4bb5998
2 parents deda426 + 542f33b
commit 4bb5998
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ logs/
 .idea/
 core-build/
 cache/
-.DS_Store
+.DS_Store
+cert/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,13 +1,19 @@
 {
   "cSpell.words": [
     "Agentselect",
+    "atem",
     "champselect",
     "Chemtech",
+<<<<<<< HEAD
     "eune",
+=======
+    "CSGOGSI",
+>>>>>>> c9cd282 (submodule updates)
     "farsight",
     "Herold",
     "Herolds",
     "Hextech",
+    "keyer",
     "killfeed",
     "RCVPT",
     "uniqid",

diff --git a/modules/module-atem b/modules/module-atem
diff --git a/modules/module-cs-gsi b/modules/module-cs-gsi
diff --git a/modules/module-league-caster-cockpit b/modules/module-league-caster-cockpit
diff --git a/modules/module-league-champselect-ace b/modules/module-league-champselect-ace
diff --git a/modules/module-league-champselect-tent b/modules/module-league-champselect-tent
diff --git a/modules/module-league-end-of-game b/modules/module-league-end-of-game
diff --git a/modules/module-league-in-game b/modules/module-league-in-game
diff --git a/modules/module-league-state b/modules/module-league-state
diff --git a/modules/module-league-static b/modules/module-league-static
diff --git a/modules/module-tournament-tree b/modules/module-tournament-tree
diff --git a/modules/module-valorant-ingame b/modules/module-valorant-ingame
diff --git a/modules/module-valorant-pregame b/modules/module-valorant-pregame
diff --git a/modules/module-valorant-state b/modules/module-valorant-state
diff --git a/modules/module-valorant-static b/modules/module-valorant-static
diff --git a/modules/plugin-database b/modules/plugin-database
diff --git a/modules/plugin-prod-clock b/modules/plugin-prod-clock
diff --git a/modules/plugin-theming b/modules/plugin-theming
diff --git a/modules/plugin-webapi b/modules/plugin-webapi
+135 −1		controller/InGameState.ts
+1 −1		frontend/gfx/ingame.css
+0 −15		frontend/gfx/ingame.js
+9 −9		package-lock.json
+2 −2		package.json