Merge pull request #1217 from Glassmaker/patch-1

Adds getLocalizedName and getUnlocalizedName to FluidStack

src/main/java/net/minecraftforge/fluids/Fluid.java

@@ -205,6 +205,14 @@ public class Fluid
         return s == null ? "" : StatCollector.translateToLocal(s);
     }
 
+    /**
+     * A FluidStack sensitive version of getUnlocalizedName
+     */
+    public String getUnlocalizedName(FluidStack stack)
+    {
+        return this.getUnlocalizedName();
+    }
+
     /**
      * Returns the unlocalized name of this fluid.
      */

src/main/java/net/minecraftforge/fluids/FluidStack.java

@@ -100,6 +100,16 @@ public class FluidStack
         return FluidRegistry.getFluid(fluidID);
     }
 
+    public String getLocalizedName()
+    {
+        return this.getFluid().getLocalizedName(this);
+    }
+
+    public String getUnlocalizedName()
+    {
+        return this.getFluid().getUnlocalizedName(this);
+    }
+
     /**
      * @return A copy of this FluidStack
      */