Skip to content

Commit

Permalink
Small change to targetLock
Browse files Browse the repository at this point in the history
  • Loading branch information
Adaptivity committed Jan 2, 2015
1 parent f5f84af commit 9b514ad
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 4 deletions.
29 changes: 28 additions & 1 deletion resources/assets/tinker/lang/en_US.lang
Expand Up @@ -163,6 +163,34 @@ item.InfiTool.Shortbow.name=Shortbow
item.InfiTool.Arrow.name=Arrow
item.InfiTool.Mattock.name=Mattock

infitool.pickaxe=Pickaxe
infitool.shovel=Shovel
infitool.axe=Hatchet
infitool.broadsword=Broadsword
infitool.longsword=Longsword
infitool.rapier=Rapier
infitool.frypan=Frying Pan
infitool.battlesign=Battlesign
infitool.dagger=Dagger
infitool.chisel=Chisel
infitool.scythe=Scythe
infitool.lumberaxe=Lumber Axe
infitool.cleaver=Cleaver
infitool.excavator=Excavator
infitool.hammer=Hammer
infitool.battleaxe=Battleaxe
infitool.cutlass=Cutlass
infitool.arrow=Arrow
infitool.mattock=Mattock
infitool.shortbow=Shortbow
infitool.longbow=Longbow
infitool.crossbow=Crossbow
infitool.arrowammo=Arrows
infitool.boltammo=Bolts
infitool.shuriken=Shuriken
infitool.throwingknife=Throwing Knife
infitool.javelin=Javelin

item.tconstruct.PotionLauncher.name=Potion Launcher

item.tool.randomarrow=Random Streamer
Expand Down Expand Up @@ -956,7 +984,6 @@ manual.page.material9=Splintering level
tool.glassarrows=Glass Arrows
tool.glassarrows.lore=Crafted by a legendary Glassmaker
tool.baneofpigs=Bane of Pigs
tool.infiminer=InfiMiner

armor.core.broken=Broken
armor.core.protection=Protection:
Expand Down
33 changes: 32 additions & 1 deletion resources/assets/tinker/lang/ru_RU.lang
Expand Up @@ -163,6 +163,34 @@ item.InfiTool.Shortbow.name=Короткий лук
item.InfiTool.Arrow.name=Стрела
item.InfiTool.Mattock.name=Мотыготопор

infitool.pickaxe=Кирку
infitool.shovel=Лопату
infitool.axe=Топорик
infitool.broadsword=Палаш
infitool.longsword=Полуторный меч
infitool.rapier=Рапиру
infitool.frypan=Сковороду
infitool.battlesign=Боевую табличку
infitool.dagger=Кинжал
infitool.chisel=Стамеску
infitool.scythe=Косу
infitool.lumberaxe=Большой топор
infitool.cleaver=Тесак
infitool.excavator=Копалку
infitool.hammer=Молот
infitool.battleaxe=Боевой топор
infitool.cutlass=Саблю
infitool.arrow=Стрелу
infitool.mattock=Мотыготопор
infitool.shortbow=Короткий лук
infitool.longbow=Длинный лук
infitool.crossbow=Арбалет
infitool.arrowammo=Стрелы
infitool.boltammo=Болты
infitool.shuriken=Сюрикэн
infitool.throwingknife=Метательный нож
infitool.javelin=Копьё

item.tconstruct.PotionLauncher.name=Метатель зелий

item.tool.randomarrow=Случайный серпантин
Expand Down Expand Up @@ -587,6 +615,7 @@ toolpart.CrossbowLimb=%%material плечо арбалета
toolpart.CrossbowBody=%%material основа арбалета
toolpart.BowLimb=%%material плечо лука
toolpart.Bolt=%%material болт
toolpart.Shaft=%%material стержень стрелы

# Now with translations of specific material and part combinations:
#toolpart.ToolRod.wood=Wooden Tool Rod
Expand Down Expand Up @@ -950,10 +979,12 @@ manual.page.material5=+1 модификатор
manual.page.material6=Особенность материала: Усиление
manual.page.material7=Уровень усиления
manual.page.material8=Уровень силы камня
manual.page.material9=Splintering level
manual.page.material9=Уровень зазубренности

tool.glassarrows=Стеклянные стрелы
tool.glassarrows.lore=Созданы легендой по имени Glassmaker
tool.baneofpigs=Бич свиней
tool.infiminer=Бесконечный добыватель

armor.core.broken=Сломан.
armor.core.protection=Защита:
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/tinker/manuals/ru_RU/materials.xml
Expand Up @@ -240,7 +240,7 @@ Shift+ПКМ: Поставить предмет
Класс: Оружие смертельной шутки</text>
<icon>battlesignicon</icon>
<item>
<text>Board</text>
<text>Доска</text>
<icon>board</icon>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/tools/items/CreativeModifier.java
Expand Up @@ -57,7 +57,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
{
String targetLock = "None";
targetLock = stack.getTagCompound().getString("TargetLock");
targetLock = StatCollector.translateToLocal("tool." + targetLock.toLowerCase());
targetLock = StatCollector.translateToLocal("infitool." + targetLock.toLowerCase());
list.add(StatCollector.translateToLocal("creativeModLock.tooltip") + targetLock);
}
}
Expand Down

0 comments on commit 9b514ad

Please sign in to comment.