Merge pull request #1269 from Adaptivity/Update

Some fixes
This commit is contained in:
boni committed 2014-12-28 17:20:05 +01:00
commit 2f4ea07f98
6 files changed
+14 -14

No files matched your search

+2 -2
View File
@@ -737,7 +737,7 @@ tconstruct.nei.melting=Smeltery Melting
gui.smeltery.fuel=Fuel
gui.smeltery.emerald=Emeralds:
gui.smeltery.glass.block=Blocks:
gui.smeltery.glass.pannel=Pannels:
gui.smeltery.glass.pannel=Panels:
gui.smeltery.metal.ingot=Ingots:
gui.smeltery.metal.nugget=Nuggets:
gui.smeltery.molten.check=Molten
@@ -813,7 +813,7 @@ gui.toolstation.crossbow.desc=The crossbow is a precise ranged weapon. It loads
gui.toolstation.boltammo.desc=Bolts are projectiles fired from Crossbows.\n\nRequired Parts:\n- Bolt Core\n- Fletching\n\nBolt cores are obtained by pouring metal over a tool rod in a Casting Table.
gui.toolstation.throwingknife.desc=Mid ranged throwing weapon. Hold to take aim, release to throw.\n\nDamage: Medium\nCapacity: Medium
gui.toolstation.shuriken.desc=Short ranged throwing weapon. Thrown instantly.\n\nDamage: Low\nCapacity: High
gui.toolstation.javelin.desc=Ranged Melee weapon hybrid. Potent as a melee weapon, devasting at range.\n\nDamage: High\nCapacity: Low
gui.toolstation.javelin.desc=Ranged Melee weapon hybrid. Potent as a melee weapon, devastating at range.\n\nDamage: High\nCapacity: Low
material.wood=Wood
+3 -3
View File
@@ -803,7 +803,7 @@ gui.toolstation.hammer.desc=Молот - это инструмент для до
gui.toolstation.lumberaxe.desc=Большой топор - это инструмент для рубки по площади. Он валит деревья целиком или добывает древесину в широком диапазоне.\n\nОбычные функции:\nОбласть действия\n- Валит деревья\n- (3x3x3)\n\nПрочность: Средняя
gui.toolstation.excavator.desc=Копалка - это инструмент для копания по площади. Она собирает почву и снего в широком диапазоне.\n\nОбычная функция:\n- Область действия\n- (3x3)\n\nПрочность: Средняя
gui.toolstation.scythe.desc=Коса - это инструмент для жатвы по площади. Она эффективна для сбора растений и атаки врагов в широком диапазоне.\n\nОбычная функция:\nОбласть действия\n- (3x3x3)\n\nПрочность: Средняя\nУрон: Низкий, по площади
gui.toolstation.cleaver.desc=Тесак - это тяжёлое оборонительное оружие. Он наносит тяжёлые удары, но его трудно держать в руках.\n\nОсобая функция: Блокирование\nОбычная функция:\n- Палач\n\nУрон: Высокий\nПрочность: Средняя
gui.toolstation.cleaver.desc=Тесак - это тяжёлое оборонительное оружие. Он наносит тяжёлые удары, но его трудно держать в руках.\n\nОсобая функция: Блокирование\nОбычная функция:\n- Усекновение\n\nУрон: Высокий\nПрочность: Средняя
gui.toolstation.battleaxe.desc=Боевой топор - это тяжёлое наступательное оружие. Он подходит для рубки маленьких деревьев и может отбросить врагов.\n\nОсобая функция: Блокирование\nОбычные функции:" + "\n- Отброс\n- Область действия\n- (1x9)\n\nУрон: Средний\nПрочность: Средняя
gui.toolstation.shortbow.desc=Короткий лук - это стрелковое оружие. Он быстро выпускает стрелы и точно поражает врагов.\n\nСкорость натяжения: Быстрая\n\nТребуются части:\n- Плечо лука\n- Оперение\n- Плечо лука
@@ -872,7 +872,7 @@ modifier.tool.flux=Флакс
modifier.tool.lapis=Удача
modifier.tool.piston=Отдача
modifier.tool.redstone=Ускорение
modifier.tool.reinforced=Неразрушимость
modifier.tool.reinforced=Усиление
modifier.tool.unbreaking=
modifier.tool.smite=Небесная кара
modifier.tool.diamond=Прочность +500
@@ -880,7 +880,7 @@ modifier.tool.emerald=Прочность +50%
modifier.tool.moss=Авто-восстановление
modifier.tool.lava=Авто-плавка
modifier.tool.necro=Вампиризм
modifier.tool.beheading=Палач
modifier.tool.beheading=Усекновение
creativeModLock.tooltip=Применяется на:
@@ -106,7 +106,7 @@ One of the villagers was kind enough to give me some random things. Each one loo
<page type="text">
<text>Tinker's Log #19:
After some heavy experimentation, I've ended up with some things that look amazing and others that look less useful than they actually are. A diamond tip on a pickaxe makes for a wondefully hard mining tool, and an emerald on a sword hilt somehow makes it stay together longer, but some things don't do anything.
After some heavy experimentation, I've ended up with some things that look amazing and others that look less useful than they actually are. A diamond tip on a pickaxe makes for a wonderfully hard mining tool, and an emerald on a sword hilt somehow makes it stay together longer, but some things don't do anything.
Adding flowers to a tool does nothing; they don't even stay on the thing. Mushrooms have a similar effect, and adding more material to a tool just makes it heavier. You wouldn't think redstone would do anything. I've coated a shovel so much that it looks deep red. However, it slides through dirt as if the dirt wasn't there.</text>
</page>
@@ -273,7 +273,7 @@ Class: Utility Tool</text>
<text>Natural Abilities:
- Area of Effect, Mines a 3x3 area. The direction depends on which face is pounded.
- Smite II, Does 2-4 extra hearts of damage against undead.
- Huge Durability, this tool has very high durability to make up for the constant beating it will recieve.
- Huge Durability, this tool has very high durability to make up for the constant beating it will receive.
Class: Broad Mining Tool</text>
<icon>hammericon</icon>
@@ -381,7 +381,7 @@ Class: Broad Melee Weapon</text>
<page type="toolpage">
<title>Cleaver</title>
<text>The Cleaver is a heavy defensive weapon. The sword is unwieldly, but the sheer weight of the tool crushes foes.</text>
<text>The Cleaver is a heavy defensive weapon. The sword is unwieldy, but the sheer weight of the tool crushes foes.</text>
<text>Right-click: Block
- Blocking cuts a wide variety of damage types in half.
@@ -857,7 +857,7 @@ Stackable: Yes</text>
<page type="sectionpage">
<title>Necrotic</title>
<text>Placing the bone of a Wither Skelton on a tool gives it nefarious life-stealing powers.
<text>Placing the bone of a Wither Skeleton on a tool gives it nefarious life-stealing powers.
Effects:
- Heals the player every time a monster is attacked
@@ -874,7 +874,7 @@ Stackable: Yes</text>
<page type="sectionpage">
<title>Silky</title>
<text>Adding a large glob of alunimum brass or gold and a bunch of string seems to give the tool silky-smooth properties.
<text>Adding a large glob of aluminum brass or gold and a bunch of string seems to give the tool silky-smooth properties.
Effects:
- Allows blocks to be harvested directly
@@ -107,7 +107,7 @@ The structure must be a 5x5 shell due to the amount of heat lava gives off. Ther
When you are ready to pour liquid metal from the Smeltery, put a faucet on a drain and a casting table below it.
Other liquid removal objects will work, but are frowned upon. An example picture is provided for your convienence.</text>
Other liquid removal objects will work, but are frowned upon. An example picture is provided for your convenience.</text>
</page>
<page type="picture">
@@ -62,7 +62,7 @@ Projectiles:
Throwing Knifes:
These knifes are crafted from a knife blade and a handle.
Hold rightclick to take aim, and release it to throw a knife.
Hold right-click to take aim, and release it to throw a knife.
Throwing knifes stack up to a moderate amount, and deal moderate damage.
Shuriken:
@@ -82,7 +82,7 @@ The throwing has a small windup. Because of their size you can only carry a few,
<text>Projectile Weapons
Shortbow:
Put together from two bow limbs and a bowstring, this weapon is a fast and handy bow. Keep in mind that inflexible materials like stone can hardly be drawn back and can't accelerate projectiles well. Organic materials are favoured for quick bows, while metals require lots of strengt to draw back, but provide more power.
Put together from two bow limbs and a bowstring, this weapon is a fast and handy bow. Keep in mind that inflexible materials like stone can hardly be drawn back and can't accelerate projectiles well. Organic materials are favoured for quick bows, while metals require lots of strength to draw back, but provide more power.
The bow requires arrows as ammo.
Offensive modifiers on bows do not count for arrows. The only modifiers affecting its ranged performance are Redstone and lapis.</text>
</page>
@@ -101,7 +101,7 @@ The longbow is constructed from two bow limbs, a bowstring and a large plate.</t
Crossbow:
Those pesky metals are such a pain to pull back. Luckily a tinkerer knows how to help himself! The crossbow allows you to pre-load it with a bolt, and have it ready instantly to fire. Since this allows for much more power, it can shoot heavier projectiles, resulting in more damage and armor penetration.
To load a crossbow simply rightclick and wait until the animation is done. The loading process can be stopped by pressing rightclick while sneaking. The crossbow can be unloaded in the same way.</text>
To load a crossbow simply right-click and wait until the animation is done. The loading process can be stopped by pressing right-click while sneaking. The crossbow can be unloaded in the same way.</text>
</page>
<page type="text">