SkyBlade1978 · Nov 9, 2026 · Nov 9, 2026 · Nov 9, 2026 · Nov 9, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,16 +1,16 @@
-name: baseSteam 1.17 CI
+name: baseSteam 1.18 CI
 
 on:
   push:
-    branches: [master-1.17.1, 'feature/**']
+    branches: [master-1.18.2, feature/basesteam-1.18.2-port]
   pull_request:
-    branches: [master-1.17.1]
+    branches: [master-1.18.2]
 
 permissions:
   contents: read
 
 concurrency:
-  group: basesteam-1.17-${{ github.workflow }}-${{ github.ref }}
+  group: basesteam-1.18-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -28,22 +28,29 @@ jobs:
           power_ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')
           power_hash=$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')
           if [[ ! "$power_ref" =~ ^[a-f0-9]{40}$ || ! "$power_hash" =~ ^[A-F0-9]{64}$ ]]; then
-            echo "::error::The exact basePower 1.17 dependency pin is pending."
+            echo "::error::The exact basePower 1.18 dependency pin is pending."
             exit 1
           fi
           bm_ref=$(sed -n 's/^basemetals_source_commit=//p' gradle.properties | tr -d '\r')
           bm_hash=$(sed -n 's/^basemetals_deobf_sha256=//p' gradle.properties | tr -d '\r')
           if [[ ! "$bm_ref" =~ ^[a-f0-9]{40}$ || ! "$bm_hash" =~ ^[A-F0-9]{64}$ ]]; then
-            echo "::error::The exact Base Metals 1.17 dependency pin is pending."
+            echo "::error::The exact Base Metals 1.18 dependency pin is pending."
             exit 1
           fi
+          os_ref=$(sed -n 's/^orespawn_source_commit=//p' gradle.properties | tr -d '\r')
+          os_hash=$(sed -n 's/^orespawn_deobf_sha256=//p' gradle.properties | tr -d '\r')
+          if [[ ! "$os_ref" =~ ^[a-f0-9]{40}$ || ! "$os_hash" =~ ^[A-F0-9]{64}$ ]]; then
+            echo "::error::The exact OreSpawn 1.18 dependency pin is pending."
+            exit 1
+          fi
+          echo "ORESPAWN_SOURCE_REF=$os_ref" >> "$GITHUB_ENV"
           echo "POWERADVANTAGE_SOURCE_REF=$power_ref" >> "$GITHUB_ENV"
           echo "BASEMETALS_SOURCE_REF=$bm_ref" >> "$GITHUB_ENV"
       - name: Check out pinned OreSpawn
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/OreSpawn
-          ref: b56e2b62a1a6ea4d1dd96f8646a87801a817dbdf
+          ref: ${{ env.ORESPAWN_SOURCE_REF }}
           path: .ci-dependencies/OreSpawn
       - name: Use canonical LF dependency inputs
         # Use the same source bytes on hosted and local dependency builds.
@@ -54,7 +61,7 @@ jobs:
           repository: MinecraftModDevelopmentMods/BaseMetals
           ref: ${{ env.BASEMETALS_SOURCE_REF }}
           path: .ci-dependencies/BaseMetals
-      - name: Check out basePower 1.17.1
+      - name: Check out basePower 1.18.2
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/basePower
@@ -70,11 +77,6 @@ jobs:
         with:
           distribution: temurin
           java-version: '8.0.502+7'
-      - name: Install pinned Java 16 production toolchain
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '16.0.2+7'
       - name: Install Java 17 for Gradle
         uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
@@ -84,35 +86,38 @@ jobs:
         # These are Gradle project properties, not JVM system properties.
         shell: bash
         run: >-
-          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_16_X64,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
+          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
           -Porg.gradle.java.installations.auto-detect=false
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
-      - name: Build 1.17.1 dependency chain
+      - name: Build 1.18.2 dependency chain
         id: dependencies
         shell: bash
         run: |
           set -euo pipefail
           orespawn="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn"
           basemetals="$GITHUB_WORKSPACE/.ci-dependencies/BaseMetals"
           power="$GITHUB_WORKSPACE/.ci-dependencies/basePower"
+          test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_SOURCE_REF"
           test "$(git -C "$power" rev-parse HEAD)" = "$POWERADVANTAGE_SOURCE_REF"
           test "$(git -C "$basemetals" rev-parse HEAD)" = "$BASEMETALS_SOURCE_REF"
           chmod +x "$orespawn/gradlew" "$basemetals/gradlew" "$power/gradlew"
           (cd "$orespawn" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
           (cd "$basemetals" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
-          osjar="$orespawn/build/libs-dev/OreSpawn-4.1.0.117011-deobf.jar"
-          bmjar="$basemetals/build/libs-dev/BaseMetals-3.1.1.117011-deobf.jar"
+          osjar="$orespawn/build/libs-dev/OreSpawn-4.1.0.118021-deobf.jar"
+          bmjar="$basemetals/build/libs-dev/BaseMetals-3.1.2.118021-deobf.jar"
           (cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar unitBootstrapJar verifyReleaseDependencies \
             -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
             --no-daemon --stacktrace)
-          powerjar="$power/build/libs-dev/basePower-2.4.9.117011-deobf.jar"
+          powerjar="$power/build/libs-dev/basePower-2.4.10.118021-deobf.jar"
           bootstrap="$power/build/unit-bootstrap/forge-native-unit-bootstrap.jar"
           test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" && test -f "$bootstrap"
-          release="$RUNNER_TEMP/basePower-2.4.9.117011.jar"
+          version="$(sed -n 's/^poweradvantage_version=//p' gradle.properties | tr -d '\r')"
+          [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.118021$ ]]
+          release="$RUNNER_TEMP/basePower-$version.jar"
           curl --fail --silent --show-error --location --retry 3 --output "$release" \
-            'https://maven.moddev.zone/releases/zone/moddev/mc/basepower/basePower/2.4.9.117011/basePower-2.4.9.117011.jar'
+            "https://maven.moddev.zone/releases/zone/moddev/mc/basepower/basePower/$version/basePower-$version.jar"
           power_release_sha=$(sed -n 's/^poweradvantage_player_sha256=//p' gradle.properties | tr -d '\r')
           printf '%s  %s\n' "$power_release_sha" "$release" | sha256sum --check
           echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
@@ -131,20 +136,20 @@ jobs:
       - name: Upload audited release candidate
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: baseSteam-1.17.1-${{ github.sha }}
+          name: baseSteam-1.18.2-${{ github.sha }}
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/baseSteam-2.2.10.117011.jar
-            build/libs/baseSteam-2.2.10.117011-sources.jar
-            build/libs/baseSteam-2.2.10.117011-javadoc.jar
+            build/libs/baseSteam-2.2.11.118021.jar
+            build/libs/baseSteam-2.2.11.118021-sources.jar
+            build/libs/baseSteam-2.2.11.118021-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.txt
       - name: Upload diagnostics on failure
         if: failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: baseSteam-1.17.1-diagnostics-${{ github.sha }}
+          name: baseSteam-1.18.2-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,9 +2,9 @@ name: CodeQL
 
 on:
   push:
-    branches: [master-1.17.1, 'feature/**']
+    branches: [master-1.18.2, feature/basesteam-1.18.2-port]
   pull_request:
-    branches: [master-1.17.1]
+    branches: [master-1.18.2]
   schedule:
     - cron: '53 7 * * 4'
 
@@ -28,22 +28,29 @@ jobs:
           power_ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')
           power_hash=$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')
           if [[ ! "$power_ref" =~ ^[a-f0-9]{40}$ || ! "$power_hash" =~ ^[A-F0-9]{64}$ ]]; then
-            echo "::error::The exact basePower 1.17 dependency pin is pending."
+            echo "::error::The exact basePower 1.18 dependency pin is pending."
             exit 1
           fi
           bm_ref=$(sed -n 's/^basemetals_source_commit=//p' gradle.properties | tr -d '\r')
           bm_hash=$(sed -n 's/^basemetals_deobf_sha256=//p' gradle.properties | tr -d '\r')
           if [[ ! "$bm_ref" =~ ^[a-f0-9]{40}$ || ! "$bm_hash" =~ ^[A-F0-9]{64}$ ]]; then
-            echo "::error::The exact Base Metals 1.17 dependency pin is pending."
+            echo "::error::The exact Base Metals 1.18 dependency pin is pending."
             exit 1
           fi
+          os_ref=$(sed -n 's/^orespawn_source_commit=//p' gradle.properties | tr -d '\r')
+          os_hash=$(sed -n 's/^orespawn_deobf_sha256=//p' gradle.properties | tr -d '\r')
+          if [[ ! "$os_ref" =~ ^[a-f0-9]{40}$ || ! "$os_hash" =~ ^[A-F0-9]{64}$ ]]; then
+            echo "::error::The exact OreSpawn 1.18 dependency pin is pending."
+            exit 1
+          fi
+          echo "ORESPAWN_SOURCE_REF=$os_ref" >> "$GITHUB_ENV"
           echo "POWERADVANTAGE_SOURCE_REF=$power_ref" >> "$GITHUB_ENV"
           echo "BASEMETALS_SOURCE_REF=$bm_ref" >> "$GITHUB_ENV"
       - name: Check out pinned OreSpawn
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/OreSpawn
-          ref: b56e2b62a1a6ea4d1dd96f8646a87801a817dbdf
+          ref: ${{ env.ORESPAWN_SOURCE_REF }}
           path: .ci-dependencies/OreSpawn
       - name: Use canonical LF dependency inputs
         # Use the same source bytes on hosted and local dependency builds.
@@ -54,7 +61,7 @@ jobs:
           repository: MinecraftModDevelopmentMods/BaseMetals
           ref: ${{ env.BASEMETALS_SOURCE_REF }}
           path: .ci-dependencies/BaseMetals
-      - name: Check out basePower 1.17.1
+      - name: Check out basePower 1.18.2
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/basePower
@@ -70,11 +77,6 @@ jobs:
         with:
           distribution: temurin
           java-version: '8.0.502+7'
-      - name: Install pinned Java 16 production toolchain
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '16.0.2+7'
       - name: Install Java 17 for Gradle
         uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
@@ -84,30 +86,31 @@ jobs:
         # These are Gradle project properties, not JVM system properties.
         shell: bash
         run: >-
-          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_16_X64,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
+          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
           -Porg.gradle.java.installations.auto-detect=false
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
-      - name: Build 1.17.1 dependency chain
+      - name: Build 1.18.2 dependency chain
         id: dependencies
         shell: bash
         run: |
           set -euo pipefail
           orespawn="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn"
           basemetals="$GITHUB_WORKSPACE/.ci-dependencies/BaseMetals"
           power="$GITHUB_WORKSPACE/.ci-dependencies/basePower"
+          test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_SOURCE_REF"
           test "$(git -C "$power" rev-parse HEAD)" = "$POWERADVANTAGE_SOURCE_REF"
           test "$(git -C "$basemetals" rev-parse HEAD)" = "$BASEMETALS_SOURCE_REF"
           chmod +x "$orespawn/gradlew" "$basemetals/gradlew" "$power/gradlew"
           (cd "$orespawn" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
           (cd "$basemetals" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
-          osjar="$orespawn/build/libs-dev/OreSpawn-4.1.0.117011-deobf.jar"
-          bmjar="$basemetals/build/libs-dev/BaseMetals-3.1.1.117011-deobf.jar"
+          osjar="$orespawn/build/libs-dev/OreSpawn-4.1.0.118021-deobf.jar"
+          bmjar="$basemetals/build/libs-dev/BaseMetals-3.1.2.118021-deobf.jar"
           (cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar unitBootstrapJar verifyReleaseDependencies \
             -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
             --no-daemon --stacktrace)
-          powerjar="$power/build/libs-dev/basePower-2.4.9.117011-deobf.jar"
+          powerjar="$power/build/libs-dev/basePower-2.4.10.118021-deobf.jar"
           bootstrap="$power/build/unit-bootstrap/forge-native-unit-bootstrap.jar"
           test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" && test -f "$bootstrap"
           echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"

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.17.1
-      - 'feature/**'
+      - master-1.18.2
+      - feature/basesteam-1.18.2-port
   pull_request:
     branches:
-      - master-1.17.1
+      - master-1.18.2
 
 permissions:
   contents: read

diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@
 *.class
 *.jar
 !/gradle/wrapper/gradle-wrapper.jar
+!/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar
 *.zip
 
 # Machine-specific agent context

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,10 @@
-baseSteam 2.2.10.117011 (Minecraft 1.17.1)
+baseSteam 2.2.11.118021 (Minecraft 1.18.2)
+
+- Bring baseSteam to Minecraft 1.18.2, with the same recipes and steam machines.
+- Keep saved inventories, steam, drill state and musket wear when upgrading.
+- Use the released basePower 2.4.10.118021 and Base Metals 3.1.2 save hook.
+
+baseSteam 2.2.10.117011 (local Minecraft 1.17.1 candidate)
 
 - Steam Advantage is now baseSteam. Install it with basePower 2.4.9.117011 and find its blocks and items in the shared basePower creative tab.
 - Recognize older Steam Advantage world IDs while keeping baseSteam registry paths, machine data and legacy save repairs.
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ @@
     *.class
     *.jar
     !/gradle/wrapper/gradle-wrapper.jar
+    !/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar
     *.zip
     # Machine-specific agent context
@@ Expand Down @@