diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 32dfb71d..c7e8b9fa 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,7 +11,8 @@ Bugs - Fixed Transceivers losing items when single player worlds reloaded without restarting MC - More than one stack of quartz can now be placed in alloy smelter when making fused quartz - #1150 Crash when Farming Station Error trying to plant Pam's Mob Seeds (nb, they don't work, but it wont crash) -- #1153 Item conduits crash with invalid item stacks (one without an item assigned) +- #1152 Fluids blocks missing names +- #1153 Item conduits crash with invalid item stacks (one without an item assigned) ------------------------------------------------------ Version 2.1.6 diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index f2e455a0..ea43ea9a 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -3,7 +3,7 @@ Please refer to the documentation in SAGMillRecipes_Core/_User for details on the format used. Recipes for the alloy smelter have multiple inputs (up to three) and a single output. Multiple output tags can be used as long as they are for the same item. This allows 'chance' outputs, for example, if you wanted to -output some 4 bronze ingots with a 50% chance of a fith, you would use: +output some 4 bronze ingots with a 50% chance of a fifth, you would use: diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 608428b3..78bc9a1f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -97,15 +97,20 @@ enderio.tooltip.isBeaconBase=Can be used as beacon base //Fluids fluid.nutrient_distillation=Nutrient Distillation +tile.fluid.nutrient_distillation.name=Nutrient Distillation item.bucketNutrient_distillation.name=Nutrient Distillation Bucket fluid.hootch=Hootch +tile.fluid.hootch.name=Hootch item.bucketHootch.name=Hootch Bucket fluid.fire_water=Fire Water +tile.fluid.fire_water.name=Fire Water item.bucketFire_water.name=Fire Water Bucket fluid.rocket_fuel=Rocket Fuel +tile.fluid.rocket_fuel.name=Rocket Fuel item.bucketRocket_fuel.name=Rocket Fuel Bucket fluid.eio.xpjuice=Liquid XP +tile.fluid.eio.xpjuice.name=Liquid XP item.bucketXpjuice.name=XP Bucket diff --git a/resources/assets/enderio/textures/blocks/xpjuiceflowing.png b/resources/assets/enderio/textures/blocks/xpjuiceflowing.png new file mode 100644 index 00000000..eccf64c1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/xpjuiceflowing.png differ diff --git a/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta b/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta new file mode 100644 index 00000000..034019ff --- /dev/null +++ b/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index d603045c..5b79ed25 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -26,7 +26,7 @@ public class BlockFluidEio extends BlockFluidClassic { public static BlockFluidEio create(Fluid fluid, Material material) { BlockFluidEio res = new BlockFluidEio(fluid, material); res.init(); - fluid.setBlock(res); + fluid.setBlock(res); return res; } @@ -35,6 +35,7 @@ public class BlockFluidEio extends BlockFluidClassic { protected BlockFluidEio(Fluid fluid, Material material) { super(fluid, material); this.fluid = fluid; + setBlockName(fluid.getUnlocalizedName()); } protected void init() {