From aea412f592556fdf81c1dcea87f0bb9f75e9c18c Mon Sep 17 00:00:00 2001 From: Silfryi Kalsandryn Date: Wed, 13 Jan 2021 13:27:18 -0500 Subject: [PATCH] Fix #171 and misdone localization - Changes incorrect 33x steel scaffolding slabs to 30x - Changes incorrect localization for biomedict blacklist to be "spawns in all biomes but [biome]" instead of "spawns in [biome]" --- .../common/blocks/metal/TileEntityDistillationTower.java | 4 ++-- .../blocks/multiblocks/MultiblockDistillationTower.java | 2 +- src/main/resources/assets/immersivepetroleum/lang/en_us.lang | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/flaxbeard/immersivepetroleum/common/blocks/metal/TileEntityDistillationTower.java b/src/main/java/flaxbeard/immersivepetroleum/common/blocks/metal/TileEntityDistillationTower.java index 0d306e2f..34682a16 100644 --- a/src/main/java/flaxbeard/immersivepetroleum/common/blocks/metal/TileEntityDistillationTower.java +++ b/src/main/java/flaxbeard/immersivepetroleum/common/blocks/metal/TileEntityDistillationTower.java @@ -212,7 +212,7 @@ else if (inventory.get(3).isEmpty()) lastFluidOut = null; if (targetFluidStack != null) { - FluidStack out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 80), false); + FluidStack out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 100), false); int accepted = output.fill(out, false); if (accepted > 0) { @@ -227,7 +227,7 @@ else if (inventory.get(3).isEmpty()) while (iterator.hasNext()) { targetFluidStack = iterator.next(); - out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 80), false); + out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 100), false); accepted = output.fill(out, false); if (accepted > 0) { diff --git a/src/main/java/flaxbeard/immersivepetroleum/common/blocks/multiblocks/MultiblockDistillationTower.java b/src/main/java/flaxbeard/immersivepetroleum/common/blocks/multiblocks/MultiblockDistillationTower.java index 96abb228..a5f801b6 100644 --- a/src/main/java/flaxbeard/immersivepetroleum/common/blocks/multiblocks/MultiblockDistillationTower.java +++ b/src/main/java/flaxbeard/immersivepetroleum/common/blocks/multiblocks/MultiblockDistillationTower.java @@ -331,7 +331,7 @@ else if (h == 1) static final IngredientStack[] materials = new IngredientStack[]{ new IngredientStack("scaffoldingSteel", 25), - new IngredientStack(new ItemStack(IEContent.blockMetalDecorationSlabs1, 33, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta())), + new IngredientStack(new ItemStack(IEContent.blockMetalDecorationSlabs1, 30, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta())), new IngredientStack(new ItemStack(IEContent.blockMetalDevice1, 17, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta())), new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 1, BlockTypes_MetalDecoration0.RS_ENGINEERING.getMeta())), new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 4, BlockTypes_MetalDecoration0.HEAVY_ENGINEERING.getMeta())), diff --git a/src/main/resources/assets/immersivepetroleum/lang/en_us.lang b/src/main/resources/assets/immersivepetroleum/lang/en_us.lang index 13eda3a9..a7e929ab 100644 --- a/src/main/resources/assets/immersivepetroleum/lang/en_us.lang +++ b/src/main/resources/assets/immersivepetroleum/lang/en_us.lang @@ -88,7 +88,7 @@ ie.manual.entry.oilDimInvalid=%3$s §l%1$s§r is a type of fluid reservoir that ie.manual.entry.oilDimAny=%2$s §l%1$s§r is a type of fluid reservoir that can be found in any Dimension. ie.manual.entry.oilReplenish=
After the reservoir is depleted, %1$d mB/tick of trace %2$s can be extracted by a single Pumpjack. ie.manual.entry.oilBiomeValid=This reservoir will generate in %s Biomes. -ie.manual.entry.oilBiomeInvalid=This reservoir will generate in %s Biomes. +ie.manual.entry.oilBiomeInvalid=This reservoir will generate in any biome but %s Biomes. ie.manual.entry.oilBiomeAny=This reservoir will generate in any Biome. ie.manual.entry.asphalt.name=Asphalt Concrete