Merge branch 'main' into banns

PokemonAutomation · Oct 1, 2024 · ae9e117 · ae9e117
2 parents d19ca53 + b73f05c
commit ae9e117
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/PokemonScarletViolet/TeraAutoHost-BanList.json b/PokemonScarletViolet/TeraAutoHost-BanList.json
@@ -247,7 +247,7 @@
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Blaze", "notes": "6/2 in Tenshi Gimmighoul. Unbanned to let another Blaze person join."},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "SACHA EV", "notes": "6/2 in Tenshi Gimmighoul"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Apo", "notes": "5/2 in Tenshi Gimmighoul"},
-    {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Inferno", "notes": "4/2 in Tenshi Gimmighoul"},
+    {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Inferno", "notes": "4/2 in Tenshi Gimmighoul. Unbanned to let another Inferno join raids."},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Lior", "notes": "5/2 in Tenshi Gimmighoul"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Raino", "notes": "5/2 in Tenshi Gimmighoul"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Adalyn", "notes": "4/2 in Tenshi Gimmighoul"},

diff --git a/PokemonScarletViolet/TeraAutoHost-KillSwitch.json b/PokemonScarletViolet/TeraAutoHost-KillSwitch.json
@@ -1,4 +1,4 @@
 {
-    "date": "2024-06-09 23:57:00",
-    "reason": "Tera Raid Event Ends: Swampert"
+    "date": "2024-09-08 23:57:00",
+    "reason": "Tera Raid Event Ends: Incineroar"
 }