Merge branch 'beta' into suppress-ooze

.gitattributes

@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+* -crlf

.github/workflows/test-shard-template.yml

@@ -29,4 +29,4 @@ jobs:
       - name: Install Node.js dependencies
         run: npm ci
       - name: Run tests
-        run: npx vitest --project ${{ inputs.project }} --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}
+        run: npx vitest --project ${{ inputs.project }} --no-isolate --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}

.github/workflows/tests.yml

@@ -15,29 +15,8 @@ on:
     types: [checks_requested]
 
 jobs:
-  pre-test:
-    name: Run Pre-test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          path: tests-action
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        working-directory: tests-action
-        run: npm ci
-      - name: Run Pre-test
-        working-directory: tests-action
-        run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }}
-
   run-tests:
     name: Run Tests 
-    needs: [pre-test]
     strategy:
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

biome.jsonc

@@ -50,7 +50,8 @@
         "noUndeclaredVariables": "off",
         "noUnusedVariables": "error",
         "noSwitchDeclarations": "warn", // TODO: refactor and make this an error
-        "noVoidTypeReturn": "warn" // TODO: Refactor and make this an error
+        "noVoidTypeReturn": "warn", // TODO: Refactor and make this an error
+        "noUnusedImports": "error"
       },
       "style": {
         "noVar": "error",

index.css

@@ -68,6 +68,10 @@ input:-internal-autofill-selected {
   background-clip: text;
 }
 
+input:-webkit-autofill {
+  -webkit-text-fill-color: #a1a1a1;
+}
+
 /* Need adjust input font-size */
 input {
   font-size: 3.2rem;

lefthook.yml

@@ -9,12 +9,6 @@ pre-commit:
         - merge
         - rebase
       
-pre-push:
-  commands:
-    biome-lint:
-      glob: "*.{js,ts,jsx,tsx}"
-      run: npx @biomejs/biome check --write --reporter=summary {push_files} --no-errors-on-unmatched
-      
 post-merge:
   commands:
     update-submodules:

package-lock.json

@@ -29,7 +29,7 @@
         "@types/node": "^20.12.13",
         "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54",
         "@typescript-eslint/parser": "^8.0.0-alpha.54",
-        "@vitest/coverage-istanbul": "^2.1.9",
+        "@vitest/coverage-istanbul": "^3.0.9",
         "dependency-cruiser": "^16.3.10",
         "eslint": "^9.7.0",
         "eslint-plugin-import-x": "^4.2.1",
@@ -43,7 +43,7 @@
         "typescript-eslint": "^8.0.0-alpha.54",
         "vite": "^5.4.14",
         "vite-tsconfig-paths": "^4.3.2",
-        "vitest": "^2.1.9",
+        "vitest": "^3.0.9",
         "vitest-canvas-mock": "^0.3.3"
       },
       "engines": {
@@ -2312,14 +2312,14 @@
       }
     },
     "node_modules/@vitest/coverage-istanbul": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-3.0.9.tgz",
-      "integrity": "sha512-vdYE4FkC/y2lxcN3Dcj54Bw+ericmDwiex0B8LV5F/YNYEYP1mgVwhPnHwWGAXu38qizkjOuyczKbFTALfzFKw==",
+      "integrity": "sha512-/TXh2qmOhclmVPjOnPTpIO4Xr6l2P5EwyXQygenwq4/ZQ/vPsrz+GCRZF9kBeQi6xrGcHv368Si9PGImWQawVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.3",
-        "debug": "^4.3.7",
+        "debug": "^4.4.0",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-instrument": "^6.0.3",
         "istanbul-lib-report": "^3.0.1",
@@ -2327,48 +2327,48 @@
         "istanbul-reports": "^3.1.7",
         "magicast": "^0.3.5",
         "test-exclude": "^7.0.1",
-        "tinyrainbow": "^1.2.0"
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.1.9"
+        "vitest": "3.0.9"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz",
-      "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==",
+      "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.9",
+        "@vitest/spy": "3.0.9",
-        "@vitest/utils": "2.1.9",
+        "@vitest/utils": "3.0.9",
-        "chai": "^5.1.2",
+        "chai": "^5.2.0",
-        "tinyrainbow": "^1.2.0"
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz",
-      "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==",
+      "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.9",
+        "@vitest/spy": "3.0.9",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.12"
+        "magic-string": "^0.30.17"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0"
+        "vite": "^5.0.0 || ^6.0.0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -2380,51 +2380,51 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz",
-      "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==",
+      "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyrainbow": "^1.2.0"
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz",
-      "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==",
+      "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.9",
+        "@vitest/utils": "3.0.9",
-        "pathe": "^1.1.2"
+        "pathe": "^2.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz",
-      "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==",
+      "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.9",
+        "@vitest/pretty-format": "3.0.9",
-        "magic-string": "^0.30.12",
+        "magic-string": "^0.30.17",
-        "pathe": "^1.1.2"
+        "pathe": "^2.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz",
-      "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==",
+      "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2435,15 +2435,15 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz",
-      "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==",
+      "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.9",
+        "@vitest/pretty-format": "3.0.9",
-        "loupe": "^3.1.2",
+        "loupe": "^3.1.3",
-        "tinyrainbow": "^1.2.0"
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -2738,9 +2738,9 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "5.1.2",
+      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
-      "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==",
+      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5450,9 +5450,9 @@
       }
     },
     "node_modules/pathe": {
-      "version": "1.1.2",
+      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "dev": true,
       "license": "MIT"
     },
@@ -6308,9 +6308,9 @@
       }
     },
     "node_modules/tinyrainbow": {
-      "version": "1.2.0",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
-      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6677,23 +6677,23 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz",
-      "integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==",
+      "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.7",
+        "debug": "^4.4.0",
-        "es-module-lexer": "^1.5.4",
+        "es-module-lexer": "^1.6.0",
-        "pathe": "^1.1.2",
+        "pathe": "^2.0.3",
-        "vite": "^5.0.0"
+        "vite": "^5.0.0 || ^6.0.0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -6720,47 +6720,48 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.1.9",
+      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz",
-      "integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==",
+      "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "2.1.9",
+        "@vitest/expect": "3.0.9",
-        "@vitest/mocker": "2.1.9",
+        "@vitest/mocker": "3.0.9",
-        "@vitest/pretty-format": "^2.1.9",
+        "@vitest/pretty-format": "^3.0.9",
-        "@vitest/runner": "2.1.9",
+        "@vitest/runner": "3.0.9",
-        "@vitest/snapshot": "2.1.9",
+        "@vitest/snapshot": "3.0.9",
-        "@vitest/spy": "2.1.9",
+        "@vitest/spy": "3.0.9",
-        "@vitest/utils": "2.1.9",
+        "@vitest/utils": "3.0.9",
-        "chai": "^5.1.2",
+        "chai": "^5.2.0",
-        "debug": "^4.3.7",
+        "debug": "^4.4.0",
         "expect-type": "^1.1.0",
-        "magic-string": "^0.30.12",
+        "magic-string": "^0.30.17",
-        "pathe": "^1.1.2",
+        "pathe": "^2.0.3",
         "std-env": "^3.8.0",
         "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.1",
+        "tinyexec": "^0.3.2",
-        "tinypool": "^1.0.1",
+        "tinypool": "^1.0.2",
-        "tinyrainbow": "^1.2.0",
+        "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0",
+        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "2.1.9",
+        "vite-node": "3.0.9",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "@edge-runtime/vm": "*",
-        "@types/node": "^18.0.0 || >=20.0.0",
+        "@types/debug": "^4.1.12",
-        "@vitest/browser": "2.1.9",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/ui": "2.1.9",
+        "@vitest/browser": "3.0.9",
+        "@vitest/ui": "3.0.9",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -6768,6 +6769,9 @@
         "@edge-runtime/vm": {
           "optional": true
         },
+        "@types/debug": {
+          "optional": true
+        },
         "@types/node": {
           "optional": true
         },

package.json

@@ -9,10 +9,10 @@
     "build": "vite build",
     "build:beta": "vite build --mode beta",
     "preview": "vite preview",
-    "test": "vitest run --project pre && vitest run --project main",
+    "test": "vitest run",
-    "test:cov": "vitest run --project pre && vitest run --project main --coverage",
+    "test:cov": "vitest run --coverage --no-isolate",
-    "test:watch": "vitest run --project pre && vitest watch --project main --coverage",
+    "test:watch": "vitest watch --coverage --no-isolate",
-    "test:silent": "vitest run --project pre && vitest run --project main --silent",
+    "test:silent": "vitest run --silent --no-isolate",
     "typecheck": "tsc --noEmit",
     "eslint": "eslint --fix .",
     "eslint-ci": "eslint .",
@@ -36,7 +36,7 @@
     "@types/node": "^20.12.13",
     "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54",
     "@typescript-eslint/parser": "^8.0.0-alpha.54",
-    "@vitest/coverage-istanbul": "^2.1.9",
+    "@vitest/coverage-istanbul": "^3.0.9",
     "dependency-cruiser": "^16.3.10",
     "eslint": "^9.7.0",
     "eslint-plugin-import-x": "^4.2.1",
@@ -50,7 +50,7 @@
     "typescript-eslint": "^8.0.0-alpha.54",
     "vite": "^5.4.14",
     "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^2.1.9",
+    "vitest": "^3.0.9",
     "vitest-canvas-mock": "^0.3.3"
   },
   "dependencies": {

public/exp-sprites.json

@@ -13,10 +13,10 @@
     "1005",
     "1006",
     "1006",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1008-ultimate",
+    "1008-ultimate-mode-Disabled",
-    "1008-ultimate",
+    "1008-ultimate-mode-Disabled",
     "115-mega",
     "115-mega",
     "127-mega",
@@ -185,9 +185,9 @@
     "531-mega",
     "569-gigantamax",
     "569-gigantamax",
-    "6-mega",
-    "6-mega",
     "6-mega-x",
+    "6-mega-x",
+    "6-mega-y",
     "6-mega-y",
     "6058",
     "6058",
@@ -825,8 +825,8 @@
     "873",
     "874",
     "874",
-    "875-no",
+    "875-no-ice",
-    "875-no",
+    "875-no-ice",
     "875",
     "875",
     "876-female",
@@ -963,26 +963,26 @@
     "929",
     "930",
     "930",
-    "931-blue",
+    "931-blue-plumage-Disabled",
-    "931-blue",
+    "931-blue-plumage-Disabled",
-    "931-green",
+    "931-green-plumage-Disabled",
-    "931-green",
+    "931-green-plumage-Disabled",
-    "931-white",
+    "931-white-plumage-Disabled",
-    "931-white",
+    "931-white-plumage-Disabled",
-    "931-yellow",
+    "931-yellow-plumage-Disabled",
-    "931-yellow",
+    "931-yellow-plumage-Disabled",
     "932",
     "932",
     "933",
     "933",
     "934",
     "934",
-    "935",
+    "935-Disabled",
-    "935",
+    "935-Disabled",
-    "936",
+    "936-Disabled",
-    "936",
+    "936-Disabled",
-    "937",
+    "937-Disabled",
-    "937",
+    "937-Disabled",
     "938",
     "938",
     "939",
@@ -1073,6 +1073,8 @@
     "978-droopy",
     "978-stretchy",
     "978-stretchy",
+    "979-Disabled",
+    "979-Disabled",
     "980",
     "980",
     "981",
@@ -1131,10 +1133,10 @@
     "1005b",
     "1006b",
     "1006b",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1008b-ultimate",
+    "1008b-ultimate-mode-Disabled",
-    "1008b-ultimate",
+    "1008b-ultimate-mode-Disabled",
     "115b-mega",
     "115b-mega",
     "127b-mega",
@@ -1303,9 +1305,9 @@
     "531b-mega",
     "569b-gigantamax",
     "569b-gigantamax",
-    "6b-mega",
-    "6b-mega",
     "6b-mega-x",
+    "6b-mega-x",
+    "6b-mega-y",
     "6b-mega-y",
     "6058b",
     "6058b",
@@ -1943,8 +1945,8 @@
     "873b",
     "874b",
     "874b",
-    "875b-no",
+    "875b-no-ice",
-    "875b-no",
+    "875b-no-ice",
     "875b",
     "875b",
     "876b-female",
@@ -2083,26 +2085,26 @@
     "929b",
     "930b",
     "930b",
-    "931b-blue",
+    "931b-blue-plumage-Disabled",
-    "931b-blue",
+    "931b-blue-plumage-Disabled",
-    "931b-green",
+    "931b-green-plumage-Disabled",
-    "931b-green",
+    "931b-green-plumage-Disabled",
-    "931b-white",
+    "931b-white-plumage-Disabled",
-    "931b-white",
+    "931b-white-plumage-Disabled",
-    "931b-yellow",
+    "931b-yellow-plumage-Disabled",
-    "931b-yellow",
+    "931b-yellow-plumage-Disabled",
     "932b",
     "932b",
     "933b",
     "933b",
     "934b",
     "934b",
-    "935b",
+    "935b-Disabled",
-    "935b",
+    "935b-Disabled",
-    "936b",
+    "936b-Disabled",
-    "936b",
+    "936b-Disabled",
-    "937b",
+    "937b-Disabled",
-    "937b",
+    "937b-Disabled",
     "938b",
     "938b",
     "939b",
@@ -2251,10 +2253,10 @@
     "1005sb",
     "1006sb",
     "1006sb",
-    "1007sb-apex",
+    "1007sb-apex-build-Disabled",
-    "1007sb-apex",
+    "1007sb-apex-build-Disabled",
-    "1008sb-ultimate",
+    "1008sb-ultimate-mode-Disabled",
-    "1008sb-ultimate",
+    "1008sb-ultimate-mode-Disabled",
     "115sb-mega",
     "115sb-mega",
     "127sb-mega",
@@ -3063,8 +3065,8 @@
     "873sb",
     "874sb",
     "874sb",
-    "875sb-no",
+    "875sb-no-ice",
-    "875sb-no",
+    "875sb-no-ice",
     "875sb",
     "875sb",
     "876sb-female",
@@ -3203,26 +3205,26 @@
     "929sb",
     "930sb",
     "930sb",
-    "931sb-blue",
+    "931sb-blue-plumage-Disabled",
-    "931sb-blue",
+    "931sb-blue-plumage-Disabled",
-    "931sb-green",
+    "931sb-green-plumage-Disabled",
-    "931sb-green",
+    "931sb-green-plumage-Disabled",
-    "931sb-white",
+    "931sb-white-plumage-Disabled",
-    "931sb-white",
+    "931sb-white-plumage-Disabled",
-    "931sb-yellow",
+    "931sb-yellow-plumage-Disabled",
-    "931sb-yellow",
+    "931sb-yellow-plumage-Disabled",
     "932sb",
     "932sb",
     "933sb",
     "933sb",
     "934sb",
     "934sb",
-    "935sb",
+    "935sb-Disabled",
-    "935sb",
+    "935sb-Disabled",
-    "936sb",
+    "936sb-Disabled",
-    "936sb",
+    "936sb-Disabled",
-    "937sb",
+    "937sb-Disabled",
-    "937sb",
+    "937sb-Disabled",
     "938sb",
     "938sb",
     "939sb",
@@ -3376,10 +3378,10 @@
     "1005s",
     "1006s",
     "1006s",
-    "1007s-apex",
+    "1007s-apex-build-Disabled",
-    "1007s-apex",
+    "1007s-apex-build-Disabled",
-    "1008s-ultimate",
+    "1008s-ultimate-mode-Disabled",
-    "1008s-ultimate",
+    "1008s-ultimate-mode-Disabled",
     "115s-mega",
     "115s-mega",
     "127s-mega",
@@ -4188,8 +4190,8 @@
     "873s",
     "874s",
     "874s",
-    "875s-no",
+    "875s-no-ice",
-    "875s-no",
+    "875s-no-ice",
     "875s",
     "875s",
     "876s-female",
@@ -4328,26 +4330,26 @@
     "929s",
     "930s",
     "930s",
-    "931s-blue",
+    "931s-blue-plumage-Disabled",
-    "931s-blue",
+    "931s-blue-plumage-Disabled",
-    "931s-green",
+    "931s-green-plumage-Disabled",
-    "931s-green",
+    "931s-green-plumage-Disabled",
-    "931s-white",
+    "931s-white-plumage-Disabled",
-    "931s-white",
+    "931s-white-plumage-Disabled",
-    "931s-yellow",
+    "931s-yellow-plumage-Disabled",
-    "931s-yellow",
+    "931s-yellow-plumage-Disabled",
     "932s",
     "932s",
     "933s",
     "933s",
     "934s",
     "934s",
-    "935s",
+    "935s-Disabled",
-    "935s",
+    "935s-Disabled",
-    "936s",
+    "936s-Disabled",
-    "936s",
+    "936s-Disabled",
-    "937s",
+    "937s-Disabled",
-    "937s",
+    "937s-Disabled",
     "938s",
     "938s",
     "939s",
@@ -4438,6 +4440,8 @@
     "978s-droopy",
     "978s-stretchy",
     "978s-stretchy",
+    "979s-Disabled",
+    "979s-Disabled",
     "980s",
     "980s",
     "981s",
@@ -4485,11 +4489,10 @@
     "1000",
     "1001",
     "1004",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1008-ultimate-mode-Disabled",
-    "1007-apex",
+    "1008-ultimate-mode-Disabled",
-    "1008-ultimate",
     "127-mega",
     "142-mega",
     "150-mega",
@@ -4698,21 +4701,21 @@
     "933_3",
     "933_3",
     "934",
-    "935",
+    "935-Disabled",
-    "935_3",
+    "935_3-Disabled",
-    "935_3",
+    "935_3-Disabled",
-    "936_1",
+    "936_1-Disabled",
-    "936_1",
+    "936_1-Disabled",
-    "936_2",
+    "936_2-Disabled",
-    "936_2",
+    "936_2-Disabled",
-    "936_3",
+    "936_3-Disabled",
-    "936_3",
+    "936_3-Disabled",
-    "937_1",
+    "937_1-Disabled",
-    "937_1",
+    "937_1-Disabled",
-    "937_2",
+    "937_2-Disabled",
-    "937_2",
+    "937_2-Disabled",
-    "937_3",
+    "937_3-Disabled",
-    "937_3",
+    "937_3-Disabled",
     "94-mega_1",
     "94-mega_1",
     "94-mega_2",
@@ -4755,11 +4758,10 @@
     "1000b",
     "1001b",
     "1004b",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1008b-ultimate-mode-Disabled",
-    "1007b-apex",
+    "1008b-ultimate-mode-Disabled",
-    "1008b-ultimate",
     "127b-mega",
     "142b-mega",
     "150b-mega",
@@ -4920,24 +4922,24 @@
     "932b",
     "933b",
     "934b",
-    "935_1b",
+    "935_1b-Disabled",
-    "935_1b",
+    "935_1b-Disabled",
-    "935_2b",
+    "935_2b-Disabled",
-    "935_2b",
+    "935_2b-Disabled",
-    "935_3b",
+    "935_3b-Disabled",
-    "935_3b",
+    "935_3b-Disabled",
-    "936_1b",
+    "936_1b-Disabled",
-    "936_1b",
+    "936_1b-Disabled",
-    "936_2b",
+    "936_2b-Disabled",
-    "936_2b",
+    "936_2b-Disabled",
-    "936_3b",
+    "936_3b-Disabled",
-    "936_3b",
+    "936_3b-Disabled",
-    "937_1b",
+    "937_1b-Disabled",
-    "937_1b",
+    "937_1b-Disabled",
-    "937_2b",
+    "937_2b-Disabled",
-    "937_2b",
+    "937_2b-Disabled",
-    "937_3b",
+    "937_3b-Disabled",
-    "937_3b",
+    "937_3b-Disabled",
     "94b-mega",
     "948b",
     "949b",