Merge branch 'main' into dev

Rename build job to 'Build website'

.github/workflows/build-bot.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   build:
-    name: Build
+    name: Build bot
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/website.yml

@@ -35,7 +35,7 @@ env:
 
 jobs:
   build:
-    name: Build
+    name: Build website
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6

docs/changelogs/1.29.10.md

@@ -0,0 +1,14 @@
+# BlitzKit 1.29.10
+
+Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
+
+## Features
+
+- Combined game mode passive and active abilities into a single dropdown
+- [Mark Greene] Added tier filters to the Guess game
+  - Changing tiers will break your streak
+
+## Fixes
+
+- [Mark Greene] module damage is now properly shown when sorting with it in the tank search
+- Duplicate abilities in the tank filters are now removed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.29.9",
+  "version": "1.29.10",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {

packages/website/src/components/TankSearch/components/FilterControl.tsx

@@ -83,11 +83,36 @@ for (const gameModeIdString in gameModeRoleSets) {
   for (const roleId of roles) {
     const role = gameDefinitions.roles[roleId];
 
-    for (const id of role.consumables) {
+    outerLoop: for (const id of role.consumables) {
+      const name =
+        consumableDefinitions.consumables[id].name.locales[locales.default];
+
+      for (const otherConsumable of consumables.values()) {
+        const otherName =
+          consumableDefinitions.consumables[otherConsumable].name.locales[
+            locales.default
+          ];
+
+        if (name === otherName) continue outerLoop;
+      }
+
       consumables.add(id);
       allGameModeConsumables.add(id);
     }
-    for (const id of role.provisions) {
+
+    outerLoop: for (const id of role.provisions) {
+      const name =
+        provisionDefinitions.provisions[id].name.locales[locales.default];
+
+      for (const otherProvision of provisions.values()) {
+        const otherName =
+          provisionDefinitions.provisions[otherProvision].name.locales[
+            locales.default
+          ];
+
+        if (name === otherName) continue outerLoop;
+      }
+
       provisions.add(id);
       allGameModeProvisions.add(id);
     }