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

+3 -2
View File
@@ -5,6 +5,7 @@ import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.PatternBuilder.MaterialSet;
import tconstruct.library.util.IPattern;
@@ -69,9 +70,9 @@ public class Pattern extends CraftingItem implements IPattern
if (cost > 0)
{
if (cost - (int) cost < 0.1)
list.add("Material Cost: " + (int) cost);
list.add(StatCollector.translateToLocal("pattern1.tooltip") + (int) cost);
else
list.add("Material Cost: " + cost);
list.add(StatCollector.translateToLocal("pattern2.tooltip") + cost);
}
}