update ci/fixup linting

Author: apple1417

.github/workflows/jekyll.yml

@@ -13,6 +13,10 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    # inputs:
+    #   skip-htmlproofer:
+    #     description: 'Skips running htmlproofer'
+    #     type: boolean
 
   pull_request:
 
@@ -36,6 +40,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
         with:
@@ -48,22 +57,22 @@ jobs:
         uses: actions/configure-pages@v5
 
       - name: Build with Jekyll
-        # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        run: ./_jekyll.py merge
         env:
           JEKYLL_ENV: production
 
-      - name: Run HTMLProofer
-        run: |
-          base_path="${{ steps.pages.outputs.base_path }}"
-          base_url="${{ steps.pages.outputs.base_url }}"
-
-          bundle exec htmlproofer _site --swap-urls "^$base_path/:/,^${base_url/:/\\:}/:/" --ignore-files "/_site\\/mods/"
+      # - name: Run HTMLProofer
+      #   if: ${{ !inputs.skip-htmlproofer }}
+      #   run: >
+      #     bundle exec htmlproofer _merged_site
+      #     --ignore-files "/_merged_site\\/(oak|willow2)-mod-db\\/mods/"
+      #     --swap-urls "https\://bl-sdk.github.io/:/"
 
       - name: Upload artifact
-        if: github.ref == 'refs/heads/master' && github.repository == 'bl-sdk/willow2-mod-db'
-        # Automatically uploads an artifact from the './_site' directory by default
+        if: github.ref == 'refs/heads/master' && github.repository == 'bl-sdk/bl-sdk.github.io'
         uses: actions/upload-pages-artifact@v3
+        with:
+          path: _merged_site/
 
   spelling:
     runs-on: ubuntu-latest
@@ -81,7 +90,7 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository == 'bl-sdk/willow2-mod-db'
+    if: github.ref == 'refs/heads/master' && github.repository == 'bl-sdk/bl-sdk.github.io'
 
     needs:
     - build

.typos.toml

@@ -1,4 +1,5 @@
 [files]
 extend-exclude = [
-    "_mods/"
+    "_oak_mods/",
+    "_willow2_mods/",
 ]

Readme.md

@@ -6,7 +6,7 @@ bundle exec jekyll serve
 ```
 
 However, as you'll notice this only builds the dev docs. The final site actually consists of three
-seperate jekyll projects, with one set of interwoven source files, the developer docs being the
+separate jekyll projects, with one set of interwoven source files, the developer docs being the
 default. You can build the others by appending an extra config file:
 
 ```sh

_config.yml

@@ -73,7 +73,7 @@ nav_external_links:
   - title: BL2/TPS/AoDK Mods
     url: willow2-mod-db/
   - title: BL3/WL Mods
-    url: oak-mods-db/
+    url: oak-mod-db/
   - title: Modding Support Discord
     url: https://discord.gg/bXeqV8Ef9R
   - title: SDK Developer Discord

_jekyll.py

@@ -122,7 +122,7 @@ To add your mod, you'll need to add a markdown file to either the `_oak_mods` or
 folders in [this site's repo](https://github.com/bl-sdk/bl-sdk.github.io).
 
 ### Simplest Configuration
-The simplest possibile file is the following. Make sure the url points at an auto-updating link,
+The simplest possible file is the following. Make sure the url points at an auto-updating link,
 instead of a specific commit.
 
 ```md

developing/index.md

@@ -46,7 +46,7 @@ To fix this, simply copy the inner folder and move it up a level. To avoid runni
 future, always drag the folder directly out of the zip file.
 
 ## Why do some SDK mods disable when I restart the game, when others stay enabled?
-In legacy mods, the mod author had to explictly turn on auto-enabling. It may simply never have been
+In legacy mods, the mod author had to explicitly turn on auto-enabling. It may simply never have been
 updated to turn it on.
 
 In modern mods, auto-enabling is on by default, so if a mod doesn't auto-enable, the author must