Skip to content

Commit

Permalink
Fix Flaxbeard#171 and misdone localization
Browse files Browse the repository at this point in the history
 - 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]"
  • Loading branch information
voidsong-dragonfly committed Jan 13, 2021
1 parent 7961df1 commit aea412f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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=<br>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
Expand Down

0 comments on commit aea412f

Please sign in to comment.