manual update of all master commits up to ca86fa8

This commit is contained in:
Progwml6 committed 2013-11-25 14:08:18 -05:00
1 parent 14d357ccf6
commit 983c91c2c9
48 files changed
+680 -158

No files matched your search

@@ -14,6 +14,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -179,6 +180,6 @@ public class PotionLauncher extends Item
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
list.add("Test Item");
list.add(StatCollector.translateToLocal("potionlauncher.tooltip"));
}
}