diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b1d1111..16f04c06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,10 +93,10 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/basePower-2.4.5.113021.jar - build/libs/basePower-2.4.5.113021-sources.jar - build/libs/basePower-2.4.5.113021-javadoc.jar - build/libs-dev/basePower-2.4.5.113021-deobf.jar + build/libs/basePower-2.4.6.113021.jar + build/libs/basePower-2.4.6.113021-sources.jar + build/libs/basePower-2.4.6.113021-javadoc.jar + build/libs-dev/basePower-2.4.6.113021-deobf.jar build/release/SHA256SUMS CHANGELOG.txt - name: Upload diagnostics on failure diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 18fed4f2..e2bfd416 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +2.4.6.113021 - basePower for Minecraft 1.13.2 + +- Fix an intermittent world load and save crash when basePower and Base Metals start together. + 2.4.5.113021 - basePower for Minecraft 1.13.2 - Bring basePower to Forge 1.13.2 under the basePower name. diff --git a/README.md b/README.md index c1bd5fd7..3aeaae74 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ basePower continues DrCyano's Power Advantage with conveyors, filters, fluid plumbing and the shared systems used by baseSteam and baseElectric. - Use Forge 25.0.223, Java 8, Base Metals 3.0.2.113021 and MMD OreSpawn 4.1.0.113021. The older Base Metals 3.0.1 download can crash while converting an old world. +- Use basePower 2.4.6.113021 or newer on 1.13.2. The first 1.13.2 build could hit an intermittent Forge load and save crash when starting alongside Base Metals. - Back up the world and config. Replace the old Advantage or base* jars together, then open a copy of your world first. Save it, close Minecraft completely, and reopen the copy before upgrading your main world. The upgrade understands original Advantage 1.10.2 and the released base* builds for 1.10.2 and 1.12.2. Check that the other mods in your world also support 1.13.2. diff --git a/build.gradle b/build.gradle index 7914d668..9cee0f04 100644 --- a/build.gradle +++ b/build.gradle @@ -314,7 +314,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and optional integration policy.' doLast { - if (project.mod_version != '2.4.5.113021') { + if (project.mod_version != '2.4.6.113021') { throw new GradleException("Unexpected PowerAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.13.2' @@ -349,7 +349,7 @@ tasks.register('verifyReleaseConfiguration') { String mainSource = file( 'src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java').getText('UTF-8') if (!mainSource.contains('MODID = "basepower"') - || !mainSource.contains('VERSION = "2.4.5.113021"') + || !mainSource.contains('VERSION = "2.4.6.113021"') || !mainSource.contains('@Mod(PowerAdvantage.MODID)')) { throw new GradleException('PowerAdvantage source identity changed') } diff --git a/gradle.properties b/gradle.properties index 036e9c31..7566efda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ curseforge_project_id=1780140 mod_id=basepower mod_name=basePower mod_license=LGPL-3.0-only -mod_version=2.4.5.113021 +mod_version=2.4.6.113021 mod_group=zone.moddev.mc.basepower mod_authors=DrCyano (aka Cyanobacterium) mod_description=API and shared machines for pressure, electricity, quantum power, fluids, and item transport. diff --git a/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java index 90bd81ef..b81b66b6 100644 --- a/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java +++ b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java @@ -20,6 +20,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLPaths; import zone.moddev.mc.basepower.config.PowerAdvantageConfig; @@ -42,7 +43,7 @@ public final class PowerAdvantage { public static final String MODID = "basepower"; public static final String NAME = "Power Advantage"; - public static final String VERSION = "2.4.5.113021"; + public static final String VERSION = "2.4.6.113021"; public static final Logger LOGGER = LogManager.getLogger(MODID); private static PowerAdvantage instance; @@ -75,7 +76,6 @@ public PowerAdvantage() { instance = this; AdvantageLegacyMigrations.registerPowerAdvantage(); - LegacyWorldDataHook.register(); MinecraftForge.EVENT_BUS.addListener(ConduitRegistry.getInstance()::onChunkLoad); MinecraftForge.EVENT_BUS.addListener(ConduitRegistry.getInstance()::onChunkUnload); MinecraftForge.EVENT_BUS.addListener(RecipeDiscovery::onPlayerLogin); @@ -134,6 +134,8 @@ private static void migrateLegacyConfiguration() { } private void commonSetup(FMLCommonSetupEvent event) { + // Forge stores these hooks in a shared, unsynchronized list. + DeferredWorkQueue.runLater(LegacyWorldDataHook::register); PowerAdvantageConfig.apply(); ModSupport.configureForgeEnergyConversions(); Recipes.initDistillationRecipes(PowerAdvantageConfig.distillationRecipes()); diff --git a/test-rig/README.md b/test-rig/README.md index 0ea64d1e..10cd4d18 100644 --- a/test-rig/README.md +++ b/test-rig/README.md @@ -2,6 +2,8 @@ > **Commissioning notice:** This harness builds disposable works. It is not a gameplay mod, registers no content, and must never be shipped inside a PowerAdvantage jar. +The packaged-current profile uses the [released Base Metals 3.0.2 jar](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9474008). Stage it as `.cache/BaseMetals-3.0.2.113021.jar` inside the test rig; the profile checks the exact bytes. + The rig turns the 20 cards from the Advantage Works 1.10 handbook plus a public-API fixture into one walkable superflat server world. Power Works lies west of the central concourse, Steam Works north, Electric Works east, and the drill, lift, turbine, pumping, musket, and turret proving grounds south. See the [1.13 migration guide](../docs/1.13/MIGRATION.md) for this port's qualification status. Use the [current qualification and remaining-tests checklist](../docs/1.13/CURRENT-QUALIFICATION.md) diff --git a/test-rig/build.gradle b/test-rig/build.gradle index 02b0a323..54618171 100644 --- a/test-rig/build.gradle +++ b/test-rig/build.gradle @@ -62,7 +62,7 @@ dependencies { testImplementation sourceSets.runner.output testImplementation 'junit:junit:4.13.2' compileOnly files(project.findProperty('powerAdvantageDeobfJar') - ?: '../build/libs-dev/basePower-2.4.5.113021-deobf.jar') + ?: '../build/libs-dev/basePower-2.4.6.113021-deobf.jar') } tasks.named('processResources', ProcessResources) { @@ -161,7 +161,7 @@ tasks.register('verifyHarnessIsolation') { group = 'verification' description = 'Confirms the PowerAdvantage release contains no test-harness content.' doLast { - File powerJar = file('../build/libs/basePower-2.4.5.113021.jar') + File powerJar = file('../build/libs/basePower-2.4.6.113021.jar') if (!powerJar.isFile()) { throw new GradleException("Build PowerAdvantage first: ${powerJar}") } diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java index 4f2094ff..97dba331 100644 --- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java +++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java @@ -69,7 +69,7 @@ public final class ClientResourceProbe { result.add("mod_versions", versions); require(versions.has("basepower") && zone.moddev.mc.basepower.PowerAdvantage.VERSION .equals(versions.get("basepower").getAsString()), "Power metadata does not match the compiled version"); - require("2.4.5.113021".equals(versions.get("basepower").getAsString()), "Wrong native Power candidate"); + require("2.4.6.113021".equals(versions.get("basepower").getAsString()), "Wrong native Power candidate"); for (String id : new String[]{"basesteam", "baseelectric"}) { if (versions.has(id)) require("2.2.7.113021".equals(versions.get(id).getAsString()), "Wrong native expansion candidate: " + id); } diff --git a/test-rig/client-resources/resources/META-INF/mods.toml b/test-rig/client-resources/resources/META-INF/mods.toml index 6febde2a..337f49f2 100644 --- a/test-rig/client-resources/resources/META-INF/mods.toml +++ b/test-rig/client-resources/resources/META-INF/mods.toml @@ -11,6 +11,6 @@ description='''Build-only model, texture and translation checks. Never distribut [[dependencies.advantageclientresources]] modId="basepower" mandatory=true -versionRange="[2.4.5.113021,)" +versionRange="[2.4.6.113021,)" ordering="AFTER" side="CLIENT" diff --git a/test-rig/client-resources/run.ps1 b/test-rig/client-resources/run.ps1 index 0b01cb4b..de111e4c 100644 --- a/test-rig/client-resources/run.ps1 +++ b/test-rig/client-resources/run.ps1 @@ -31,7 +31,7 @@ function Assert-NativeMetadata([string]$Metadata, [string]$Id) { if ($header -notmatch ('(?m)^modId\s*=\s*"' + [regex]::Escape($Id) + '"[ \t]*(?:#[^\r\n]*)?\r?$') -or $header -notmatch '(?m)^version\s*=\s*"[^"\r\n]*\.113\d+"[ \t]*(?:#[^\r\n]*)?\r?$' -or $Metadata -notmatch '(?m)^loaderVersion\s*=\s*"\[25,') { throw "Not a native Forge 25 candidate: $Id" } - $expected = @{ basepower = '2.4.5.113021'; basesteam = '2.2.7.113021'; baseelectric = '2.2.7.113021' } + $expected = @{ basepower = '2.4.6.113021'; basesteam = '2.2.7.113021'; baseelectric = '2.2.7.113021' } if ($expected.ContainsKey($Id) -and $header -notmatch ('(?m)^version\s*=\s*"' + [regex]::Escape($expected[$Id]) + '"[ \t]*(?:#[^\r\n]*)?\r?$')) { throw "Unexpected native candidate version for $Id; expected $($expected[$Id])" } @@ -101,7 +101,7 @@ $outputFiles = @(Get-ChildItem -LiteralPath $modOutput -Recurse -File | Sort-Obj if (@($outputFiles | Where-Object { $_.path -like '*.class' }).Count -eq 0) { throw 'Selected output has no compiled production classes.' } $outputFiles | ConvertTo-Json -Depth 6 | Set-Content -LiteralPath (Join-Path $runtime 'production-files.json') -Encoding utf8 $inputReport.production_files = Get-Record (Join-Path $runtime 'production-files.json') -if (-not $PowerCandidate) { $PowerCandidate = Join-Path $project 'build/libs-dev/basePower-2.4.5.113021-deobf.jar' } +if (-not $PowerCandidate) { $PowerCandidate = Join-Path $project 'build/libs-dev/basePower-2.4.6.113021-deobf.jar' } $PowerCandidate = (Resolve-Path -LiteralPath $PowerCandidate).Path Assert-NativeMetadata (Read-JarMetadata $PowerCandidate) 'basepower' $inputReport.power_candidate = Get-Record $PowerCandidate diff --git a/test-rig/client-resources/test-launcher.ps1 b/test-rig/client-resources/test-launcher.ps1 index 5e5a775a..8b5bdbae 100644 --- a/test-rig/client-resources/test-launcher.ps1 +++ b/test-rig/client-resources/test-launcher.ps1 @@ -68,7 +68,7 @@ modLoader="javafml" loaderVersion="[25,)" # native Forge [[mods]] # mandatory header modId="basepower" # inline comment -version="2.4.5.113021" # native candidate +version="2.4.6.113021" # native candidate [[dependencies.basepower]] modId="minecraft" mandatory=true @@ -76,15 +76,15 @@ versionRange="[1.13.2]" '@ Assert-NativeMetadata $native 'basepower' $checks++ -Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.5.113021','2.4.3.113021')) 'basepower' } -Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.5.113021','2.4.4.114041')) 'basepower' } -Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.5.113021','2.4.4.115021')) 'basepower' } +Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.6.113021','2.4.3.113021')) 'basepower' } +Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.6.113021','2.4.4.114041')) 'basepower' } +Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.6.113021','2.4.4.115021')) 'basepower' } Assert-Throws { Assert-NativeMetadata ($native.Replace('[25,)','[28,)')) 'basepower' } -Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.5.113021','${version}')) 'basepower' } +Assert-Throws { Assert-NativeMetadata ($native.Replace('2.4.6.113021','${version}')) 'basepower' } Assert-Throws { Assert-NativeMetadata $native 'baseelectric' } Assert-Throws { Assert-NativeMetadata '' 'basepower' } foreach ($id in 'basesteam','baseelectric') { - $expansion = $native.Replace('basepower', $id).Replace('2.4.5.113021','2.2.7.113021') + $expansion = $native.Replace('basepower', $id).Replace('2.4.6.113021','2.2.7.113021') Assert-NativeMetadata $expansion $id $checks++ Assert-Throws { Assert-NativeMetadata ($expansion.Replace('2.2.7.113021','2.2.5.114041')) $id } @@ -126,7 +126,7 @@ if ($StaticOnly) { return } $project = (Resolve-Path (Join-Path $PSScriptRoot '../..')).Path -$power = Join-Path $project 'build/libs-dev/basePower-2.4.5.113021-deobf.jar' +$power = Join-Path $project 'build/libs-dev/basePower-2.4.6.113021-deobf.jar' Assert-NativeMetadata (Read-JarMetadata $power) 'basepower' $checks++ [xml]$launch = Get-Content -LiteralPath (Join-Path $project 'runClientAllAdvantage.launch') -Raw diff --git a/test-rig/client-resources/test-probe-contract.ps1 b/test-rig/client-resources/test-probe-contract.ps1 index db12c489..7797b439 100644 --- a/test-rig/client-resources/test-probe-contract.ps1 +++ b/test-rig/client-resources/test-probe-contract.ps1 @@ -38,7 +38,7 @@ foreach ($name in 'ClientResourceProbe','TankVisualProbe','OilRenderProbe','Reci $pack = Get-Content -LiteralPath (Join-Path $PSScriptRoot 'resources/pack.mcmeta') -Raw | ConvertFrom-Json Assert-Contract ($pack.pack.pack_format -eq 4) 'The native 1.13 probe resource pack must keep format 4.' $metadata = Get-Content -LiteralPath (Join-Path $PSScriptRoot 'resources/META-INF/mods.toml') -Raw -foreach ($pin in 'loaderVersion="[25,)"','versionRange="[2.4.5.113021,)"') { +foreach ($pin in 'loaderVersion="[25,)"','versionRange="[2.4.6.113021,)"') { Assert-Contract ($metadata.Contains($pin)) "Missing original native probe metadata: $pin" } $runner = Get-Content -LiteralPath (Join-Path $PSScriptRoot 'run.ps1') -Raw diff --git a/test-rig/migration/native113_machine_operations.py b/test-rig/migration/native113_machine_operations.py index 1eb77b53..aecf5bde 100644 --- a/test-rig/migration/native113_machine_operations.py +++ b/test-rig/migration/native113_machine_operations.py @@ -142,7 +142,7 @@ def pin(args): if destination.exists(): raise FileExistsError(destination) destination.mkdir(parents=True) replacements = { - "poweradvantage": RIG.parent / "build/libs/basePower-2.4.5.113021.jar", + "poweradvantage": RIG.parent / "build/libs/basePower-2.4.6.113021.jar", "steamadvantage": RIG.parent.parent / "SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", "electricadvantage": RIG.parent.parent / "ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", "advantageworkstest": RIG / "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar", diff --git a/test-rig/profiles/dev-core-apocalyptic.json b/test-rig/profiles/dev-core-apocalyptic.json index 9427f8a2..f324f36c 100644 --- a/test-rig/profiles/dev-core-apocalyptic.json +++ b/test-rig/profiles/dev-core-apocalyptic.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "APOCALYPTIC", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "mods": [ { "id": "advantageworkstest", diff --git a/test-rig/profiles/dev-core-tech-progression.json b/test-rig/profiles/dev-core-tech-progression.json index ecff5da9..b214e0ef 100644 --- a/test-rig/profiles/dev-core-tech-progression.json +++ b/test-rig/profiles/dev-core-tech-progression.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "TECH_PROGRESSION", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "mods": [ { "id": "advantageworkstest", diff --git a/test-rig/profiles/dev-core.json b/test-rig/profiles/dev-core.json index 16e1201a..ac6de44a 100644 --- a/test-rig/profiles/dev-core.json +++ b/test-rig/profiles/dev-core.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "mods": [ { "id": "advantageworkstest", diff --git a/test-rig/profiles/packaged-current.json b/test-rig/profiles/packaged-current.json index b16d7cb8..bdefec40 100644 --- a/test-rig/profiles/packaged-current.json +++ b/test-rig/profiles/packaged-current.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -26,31 +26,31 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "basemetals", - "version": "3.0.1.113021", - "file": "BaseMetals-3.0.1.113021.jar", - "path": "../../../../BaseMetals/BaseMetals 113/BaseMetals/build/libs/BaseMetals-3.0.1.113021.jar", - "sha256": "4ACDD0F12ECE2258B3FA0394F9328E025AB02605B9CB0EBD17BB23F822E03542", + "version": "3.0.2.113021", + "file": "BaseMetals-3.0.2.113021.jar", + "path": ".cache/BaseMetals-3.0.2.113021.jar", + "sha256": "B7B21DB677B0B410011EDDC0542E6ECF21746CB7869C370B9430EC8E8E5A6C51", "workspaceProduced": true }, { diff --git a/test-rig/profiles/packaged-decoupled.json b/test-rig/profiles/packaged-decoupled.json index 5975f6b0..302b76a8 100644 --- a/test-rig/profiles/packaged-decoupled.json +++ b/test-rig/profiles/packaged-decoupled.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -26,24 +26,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn", diff --git a/test-rig/profiles/packaged-mineralogy.json b/test-rig/profiles/packaged-mineralogy.json index e75110a2..8cee34f1 100644 --- a/test-rig/profiles/packaged-mineralogy.json +++ b/test-rig/profiles/packaged-mineralogy.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -26,24 +26,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn", diff --git a/test-rig/profiles/packaged-optional-power.json b/test-rig/profiles/packaged-optional-power.json index 34660751..84bc1de6 100644 --- a/test-rig/profiles/packaged-optional-power.json +++ b/test-rig/profiles/packaged-optional-power.json @@ -8,7 +8,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -26,24 +26,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn", diff --git a/test-rig/profiles/worldgen-advantage.json b/test-rig/profiles/worldgen-advantage.json index 1d83e737..9d68219b 100644 --- a/test-rig/profiles/worldgen-advantage.json +++ b/test-rig/profiles/worldgen-advantage.json @@ -6,7 +6,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -24,24 +24,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn", diff --git a/test-rig/profiles/worldgen-legacy-import.json b/test-rig/profiles/worldgen-legacy-import.json index 9d0d4925..6d26a6ab 100644 --- a/test-rig/profiles/worldgen-legacy-import.json +++ b/test-rig/profiles/worldgen-legacy-import.json @@ -6,7 +6,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -24,24 +24,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn", diff --git a/test-rig/profiles/worldgen-mineralogy.json b/test-rig/profiles/worldgen-mineralogy.json index d4756458..98f00f7b 100644 --- a/test-rig/profiles/worldgen-mineralogy.json +++ b/test-rig/profiles/worldgen-mineralogy.json @@ -6,7 +6,7 @@ "stationRunSeconds": 5, "recipeMode": "NORMAL", "sourceCommit": "working-tree-from-d4ebfea", - "sourceVersion": "2.4.5.113021", + "sourceVersion": "2.4.6.113021", "forge": { "version": "1.13.2-25.0.223", "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar", @@ -24,24 +24,24 @@ }, { "id": "basepower", - "version": "2.4.5.113021", - "file": "basePower-2.4.5.113021.jar", - "path": "../build/libs/basePower-2.4.5.113021.jar", - "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF" + "version": "2.4.6.113021", + "file": "basePower-2.4.6.113021.jar", + "path": "../build/libs/basePower-2.4.6.113021.jar", + "sha256": "901CAD27BC21B7237CDDAC7B8E7A237183E60AE48B92075DD74BF011D2A18585" }, { "id": "basesteam", "version": "2.2.7.113021", "file": "baseSteam-2.2.7.113021.jar", "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar", - "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97" + "sha256": "5E04D04CE6ED3E137ECCBB269F94A2509C80FB31F87A048E0233AABAFB655F83" }, { "id": "baseelectric", "version": "2.2.7.113021", "file": "baseElectric-2.2.7.113021.jar", "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar", - "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E" + "sha256": "1170E52BB32BFD62311C325F70E9178C17EB3DE6E2D016759A848902BE1E3B50" }, { "id": "orespawn",