SkyBlade1978 · Nov 12, 2026 · Nov 11, 2026 · Nov 11, 2026 · Nov 11, 2026 · Nov 11, 2026
diff --git a/.github/verify-published-pins.sh b/.github/verify-published-pins.sh
@@ -18,10 +18,10 @@ done
 require_merged() {
     local repo="$1" ref="$2" status
     [[ "$ref" =~ ^[a-f0-9]{40}$ ]]
-    status="$(gh api "repos/MinecraftModDevelopmentMods/$repo/compare/$ref...master-1.21.1" --jq '.status')"
+    status="$(gh api "repos/MinecraftModDevelopmentMods/$repo/compare/$ref...master-1.21.11" --jq '.status')"
     case "$status" in
         identical|ahead) ;;
-        *) echo "::error::$repo $ref is not on upstream master-1.21.1 ($status)."; exit 1 ;;
+        *) echo "::error::$repo $ref is not on upstream master-1.21.11 ($status)."; exit 1 ;;
     esac
 }
 
@@ -48,7 +48,7 @@ require_merged basePower "$power_ref"
 require_merged BaseMetals "$(value basemetals_source_commit)"
 require_merged OreSpawn "$orespawn_ref"
 
-inputs="${RUNNER_TEMP:?}/forge52-release-dependencies"
+inputs="${RUNNER_TEMP:?}/forge61-release-dependencies"
 mkdir -p "$inputs"
 power="$inputs/basePower-$(value poweradvantage_version).jar"
 metals="$inputs/BaseMetals-$(value basemetals_version).jar"
@@ -57,8 +57,8 @@ public_jar basePower 1780140 "$(value poweradvantage_public_file_id)" "$(value p
 public_jar BaseMetals 240967 "$(value basemetals_public_file_id)" "$(value basemetals_deobf_sha256)" "$metals"
 public_jar OreSpawn 245586 "$(value orespawn_public_file_id)" "$(value orespawn_deobf_sha256)" "$orespawn"
 
-installer="$inputs/forge-1.21.1-52.1.0-installer.jar"
-download 'https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.1-52.1.0/forge-1.21.1-52.1.0-installer.jar' \
+installer="$inputs/forge-1.21.11-61.1.0-installer.jar"
+download 'https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.11-61.1.0/forge-1.21.11-61.1.0-installer.jar' \
     "$(value forge_installer_sha256)" "$installer"
 {
     printf 'power_ref=%s\n' "$power_ref"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,16 +1,16 @@
-name: baseElectric 1.21.1 CI
+name: baseElectric 1.21.11 CI
 
 on:
   push:
-    branches: [master-1.21.1, 'feature/**']
+    branches: [master-1.21.11, 'feature/**']
   pull_request:
-    branches: [master-1.21.1]
+    branches: [master-1.21.11]
 
 permissions:
   contents: read
 
 concurrency:
-  group: baseelectric-1.21.1-${{ github.workflow }}-${{ github.ref }}
+  group: baseelectric-1.21.11-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -62,7 +62,7 @@ jobs:
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
-      - name: Verify the Forge 52 build inputs
+      - name: Verify the Forge 61 build inputs
         shell: bash
         env:
           ORESPAWN_REF: ${{ steps.public-pins.outputs.orespawn_ref }}
@@ -74,33 +74,33 @@ jobs:
           test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_REF"
           test "$(git -C "$power" rev-parse HEAD)" = "$POWER_REF"
           mavenizer="$orespawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar"
-          printf '%s  %s\n' '019032A4A26ECB473D403EF017054D5892CE59A9904E8831B452287CD756397E' "$mavenizer" | sha256sum -c -
+          printf '%s  %s\n' 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' "$mavenizer" | sha256sum -c -
           echo "MAVENIZER=$mavenizer" >> "$GITHUB_ENV"
       - name: Build and audit release artifacts
         shell: bash
         run: |
           ./gradlew $MMD_GRADLE_TOOLCHAINS clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts \
             writeReleaseChecksums verifyEclipseProductionClasspath --no-build-cache --no-daemon --stacktrace \
-            "-Pforge52MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
+            "-Pforge61MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
             "-PbaseMetalsDeobfJar=$METALS_PLAYER" "-PoreSpawnDeobfJar=$ORESPAWN_PLAYER" \
             "-PforgeInstallerJar=$FORGE_INSTALLER"
       - name: Upload audited release candidate
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: baseElectric-1.21.1-${{ github.sha }}
+          name: baseElectric-1.21.11-${{ github.sha }}
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/baseElectric-2.2.15.121011.jar
-            build/libs/baseElectric-2.2.15.121011-sources.jar
-            build/libs/baseElectric-2.2.15.121011-javadoc.jar
+            build/libs/baseElectric-2.2.16.121111.jar
+            build/libs/baseElectric-2.2.16.121111-sources.jar
+            build/libs/baseElectric-2.2.16.121111-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.txt
       - name: Upload diagnostics on failure
         if: failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: baseElectric-1.21.1-diagnostics-${{ github.sha }}
+          name: baseElectric-1.21.11-diagnostics-${{ github.sha }}
           if-no-files-found: ignore
           retention-days: 14
           path: |

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,17 +2,17 @@ name: CodeQL
 
 on:
   push:
-    branches: [master-1.21.1, 'feature/**']
+    branches: [master-1.21.11, 'feature/**']
   pull_request:
-    branches: [master-1.21.1]
+    branches: [master-1.21.11]
 
 permissions:
   contents: read
   actions: read
   security-events: write
 
 concurrency:
-  group: baseelectric-1.21.1-${{ github.workflow }}-${{ github.ref }}
+  group: baseelectric-1.21.11-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -64,7 +64,7 @@ jobs:
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
-      - name: Verify the Forge 52 build inputs
+      - name: Verify the Forge 61 build inputs
         shell: bash
         env:
           ORESPAWN_REF: ${{ steps.public-pins.outputs.orespawn_ref }}
@@ -76,7 +76,7 @@ jobs:
           test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_REF"
           test "$(git -C "$power" rev-parse HEAD)" = "$POWER_REF"
           mavenizer="$orespawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar"
-          printf '%s  %s\n' '019032A4A26ECB473D403EF017054D5892CE59A9904E8831B452287CD756397E' "$mavenizer" | sha256sum -c -
+          printf '%s  %s\n' 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' "$mavenizer" | sha256sum -c -
           echo "MAVENIZER=$mavenizer" >> "$GITHUB_ENV"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
@@ -87,7 +87,7 @@ jobs:
         shell: bash
         run: |
           ./gradlew $MMD_GRADLE_TOOLCHAINS classes verifyReleaseDependencies --rerun-tasks --no-build-cache --no-daemon --stacktrace \
-            "-Pforge52MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
+            "-Pforge61MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
             "-PbaseMetalsDeobfJar=$METALS_PLAYER" "-PoreSpawnDeobfJar=$ORESPAWN_PLAYER"
       - name: Analyze
         uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml
@@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
 on:
   push:
     branches:
-      - master-1.21.1
+      - master-1.21.11
       - 'feature/**'
   pull_request:
     branches:
-      - master-1.21.1
+      - master-1.21.11
 
 permissions:
   contents: read

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,14 @@
+baseElectric 2.2.16.121111 (Minecraft 1.21.11 / Forge)
+
+- Port to Forge 61.1.0 with basePower 2.4.15.121111 and Java 21.
+- Preserve machine state, legacy aliases, battery charge and recipe progression.
+- Use native render extraction, item definitions and per-PackType Forge resources.
+- Keep the released 1.21.1 recipes, progression and world upgrade behavior.
+- Require Base Metals 3.1.2.121111 on both client and server in Forge metadata.
+- Use the verified public basePower and Base Metals releases.
+- Retain the combined machine, upgrade, graphical and two-world endurance results under their original tested jar hashes.
+- Run native resource checks without an interactive terminal while retaining strict warning and error checks.
+
 baseElectric 2.2.15.121011 (Minecraft 1.21.1 / Forge)
 
 - Bring baseElectric to Minecraft 1.21.1 with basePower 2.4.14.121011.

diff --git a/README.md b/README.md
@@ -4,13 +4,22 @@ baseElectric continues DrCyano's Electric Advantage. It adds electric machines,
 generation, storage, automation and defence to basePower. Its equipment appears
 in the shared basePower creative tab.
 
-This version targets Minecraft **1.21.1**, Forge **52.1.0**, official mappings
-with MCP **20240808.132146**, ForgeGradle **7.0.34**, Gradle **9.6.1**, and Java
-**21**. The version is **2.2.15.121011**. It requires basePower **2.4.14.121011**.
-The coordinated dependencies are Base Metals **3.1.2.121011** and OreSpawn
-**4.1.0.121011**. All three dependency pins use merged source and verified public
-downloads. CurseForge, Maven and GitHub releases use the same checked player jar.
-See the [1.21.1 notes](docs/NATIVE1211.md) for compatibility and verification status.
+baseElectric **2.2.16.121111** runs on Minecraft **1.21.11**, Forge **61.1.0**,
+official mappings with MCP **20251223.124241**, ForgeGradle **7.0.34**, Gradle
+**9.6.1**, and Java **21**. It requires
+[basePower **2.4.15.121111**](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9566998).
+[Base Metals **3.1.2.121111**](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9566738)
+is also **REQUIRED** on both client and server;
+Forge enforces this dependency. The coordinated OreSpawn version is
+**4.1.0.121111**. This version has been accepted for release but is not yet published.
+See the [1.21.11 notes](docs/NATIVE12111.md) for compatibility and verification status.
+
+Combined machine, upgrade, graphical and two-world 30-minute endurance checks
+passed before the released dependency retarget. The full record and its manual-test limits are in
+basePower's `docs/1.21.11/QUALIFICATION.md`. Those limits still apply.
+Publication is waiting for the final combined restart/endurance checks and
+baseSteam's public release. The released dependency pins are recorded in
+`gradle.properties`.
 
 Back up your world and try the upgrade on a copy. Replace Electric Advantage
 and Power Advantage with baseElectric and basePower; do not install both sets.
@@ -30,33 +39,36 @@ node tools/verify-native-port.js
 node tools/generate-recipe-unlocks.js --check
 ```
 
-For a full local build, supply files matching the exact coordinated source
-and jar pins recorded in `gradle.properties`. The current basePower pin is an
-approved local commit, not merged or publicly released:
+For a full local build, use the exact dependency jars recorded in
+`gradle.properties`. The sibling paths are the defaults and these flags are
+optional path overrides:
 
 ```text
--PpowerAdvantageRuntimeJar=/path/to/basePower-2.4.14.121011.jar
--PbaseMetalsRuntimeJar=/path/to/BaseMetals-3.1.2.121011.jar
--PforgeInstallerJar=/path/to/forge-1.21.1-52.1.0-installer.jar
+-PpowerAdvantageRuntimeJar=/path/to/basePower-2.4.15.121111.jar
+-PbaseMetalsRuntimeJar=/path/to/BaseMetals-3.1.2.121111.jar
+-PforgeInstallerJar=/path/to/forge-1.21.11-61.1.0-installer.jar
 ```
 
-Forge 52 uses the ordinary native jar for both play and development. The former
+Forge 61 uses the ordinary native jar for both play and development. The former
 `*DeobfJar` path flags remain aliases for the same bytes. OreSpawn and the
-Mavenizer fixture default to the sibling `MinecraftMineralogy/OS1211/OreSpawn`
-checkout. Use `-PoreSpawnRuntimeJar` and `-Pforge52MavenizerJar` to override paths.
+Mavenizer fixture default to the sibling `MinecraftMineralogy/OS12111/OreSpawn`
+checkout. Use `-PoreSpawnRuntimeJar` and `-Pforge61MavenizerJar` to override paths.
 For the prepared cache, use `--offline` with `ORESPAWN_MAVENIZER_OFFLINE=true`.
 
 ```text
 ./gradlew check build javadoc verifyLocalRuntimeInputs writeReleaseChecksums verifyEclipseProductionClasspath --no-build-cache
 ```
 
 Use `gradlew.bat` on Windows. Output jars go to `build/libs`. Dependencies
-remain separate mods. The 1.21.1 CI and CodeQL jobs require merged source pins
+remain separate mods. The 1.21.11 CI and CodeQL jobs require merged source pins
 and checksum-matching public dependencies before checkout or compilation.
 Local jars do not satisfy that gate.
 
 ## Verification
 
+The current local checks pass 114 unit tests, 25 native resource tests and
+114 tests from fresh Eclipse compiler output, with no failures or skips.
+
 Run `runGameTestServer` with the same pinned mod inputs, an existing accepted
 EULA passed as `-PelectricGameTestEula=<path>`, and a new directory passed as
 `-PelectricGameTestRunDirectory=build/port-evidence/<run>`. The test code and