update to tcon 1.5.1RC1 commits

resources/assets/tinker/lang/en_US.lang

@@ -389,6 +389,7 @@ item.tconstruct.Fletching.blueslime.name=Slime Fletching
 item.tconstruct.manual.beginner.name=Materials and You
 item.tconstruct.manual.toolstation.name=Materials and You
 item.tconstruct.manual.smeltery.name=Mighty Smelting
+item.tconstruct.manual.diary.name=Diary of a Tinker
 
 item.tconstruct.bucket.Iron.name=Molten Iron Bucket
 item.tconstruct.bucket.Gold.name=Molten Gold Bucket
@@ -594,9 +595,9 @@ achievement.tconstruct.enemySlayer.desc=Slay a mob
 achievement.tconstruct.dualConvenience.desc=Kill a mob with a frying pan, and then cook their meat in it
 
 knapsack.tooltip=A Knapsack to hold your things.
-strangefood1.tooltip=\u00a7b\u00a7oIt smells terrible, but if you=
-strangefood2.tooltip=\u00a7b\u00a7ohave nothing else to eat...=
-hambone1.tooltip=\u00A74Hambone!
+strangefood1.tooltip=It smells terrible, but if you
+strangefood2.tooltip=have nothing else to eat...
+hambone1.tooltip=Hambone!
 hambone2.tooltip=Usable for Beacon bases
 metalblock.tooltip=Usable for Beacon bases
 craftedsoil1.tooltip=Heals Undead
@@ -617,9 +618,9 @@ speedblock1.tooltip=You run pretty fast on it
 speedblock2.tooltip=You run a bit faster on it
 speedblock.slab1.tooltip=You run pretty fast on it
 speedblock.slab2.tooltip=You run a bit faster on it
-manual1.tooltip=\u00a7oBy: Skyla
-manual2.tooltip=\u00a7oBy: Skyla
-manual3.tooltip=\u00a7oBy: Thruul M'gon
+manual1.tooltip=By: Skyla
+manual2.tooltip=By: Skyla
+manual3.tooltip=By: Thruul M'gon
 searedtank1.tooltip=Contains
 searedtank2.tooltip=Keeps any fluids it has when harvested
 oreberries1.tooltip=Sweet Irony
@@ -637,8 +638,8 @@ landmine1.tooltip=everything
 landmine2.tooltip=mobs, players and redstone
 landmine3.tooltip=players and redstone
 landmine4.tooltip=redstone only
-goldenhead1.tooltip=\u00a75\u00a7oSome say consuming the head of a
-goldenhead2.tooltip=\u00a75\u00a7ofallen foe strengthens the blood
+goldenhead1.tooltip=Some say consuming the head of a
+goldenhead2.tooltip=fallen foe strengthens the blood
 oreberrybush1.tooltip=Sweet Irony
 oreberrybush2.tooltip=Pure Luster
 oreberrybush3.tooltip=Tastes like metal
@@ -649,3 +650,8 @@ barricade.tooltip=Stacks up to 4 times
 pattern1.tooltip=Material Cost: 
 pattern2.tooltip=Material Cost: 
 potionlauncher.tooltip=Test Item
+smeltery.controller.tooltip=Brain of the Smeltery
+smeltery.drain.tooltip1=Works both as input and output for
+smeltery.drain.tooltip2=fluids in the Smeltery
+smeltery.brick.tooltip1=Smeltery structure block
+smeltery.brick.tooltip2=(Safe for decoration)

resources/assets/tinker/manuals/firstday.xml

@@ -37,19 +37,6 @@ You can then shape a material in a part builder with the pattern, then combine p
 Together these make the Tool Workshop. It is recommended you keep all of these nearby when using any of them.</text>
 </page>
 
-<page type="text">
-<text>Oreberry Bushes
-
-Sometime in your travels you will happen upon the bush known as the Oreberry. They grow underground in dark areas, and require close to complete darkness to produce anything. 
-
-The berries can be melted down into nuggets and ingots, making them an invaluable source of metals.</text>
-</page>
-
-<page type="picture">
-<text>Oreberries in their natural environment</text>
-<location>tinker:manuals/oreberries.png</location>
-</page>
-
 <page type="crafting">
 <text>Blank Pattern</text>
 <recipe>
@@ -98,6 +85,49 @@ The berries can be melted down into nuggets and ingots, making them an invaluabl
 </recipe>
 </page>
 
+<page type="crafting">
+<text>Drying Rack</text>
+<recipe>
+ <name>dryingrack</name>
+ <size>three</size>
+</recipe>
+</page>
+
+<page type="text">
+<text>Oreberry Bushes
+
+Sometime in your travels you will happen upon the bush known as the Oreberry. They grow underground in dark areas, and require close to complete darkness to produce anything. 
+
+The berries can be melted down into nuggets and ingots, making them an invaluable source of metals.</text>
+</page>
+
+<page type="picture">
+<text>Oreberries in their natural environment</text>
+<location>tinker:manuals/oreberries.png</location>
+</page>
+
+<page type="text">
+<text>Slime Channels
+
+Slime channels are useful for moving items or entities around. They are used as a sort of easily placeable water and can be paired with bounce pads for best effect.</text>
+</page>
+
+<page type="crafting">
+<text>Slime Channel</text>
+<recipe>
+ <name>slimechannel</name>
+ <size>two</size>
+</recipe>
+</page>
+
+<page type="crafting">
+<text>Bounce Pad</text>
+<recipe>
+ <name>bouncepad</name>
+ <size>two</size>
+</recipe>
+</page>
+
 <page type="text">
 <text>A few traps or blockades may help with your early survival experience</text>
 </page>

resources/assets/tinker/manuals/materials.xml

@@ -673,13 +673,27 @@ Class: Ranged Projectile Launcher</text>
 <page type="materialstats">
 <title>Steel</title>
 <icon>steelsword</icon>
-<text>An Iron alloy. The method for obtaining this is unknown. Enemy chainmail seems to be made of it.
+<text>An Iron alloy. The method for obtaining this is unknown.
 - Requires the Smeltery</text>
 <material>
  <main>steelingot</main>
 </material>
 </page>
 
+<page type="materialstats">
+<title>Pig Iron</title>
+<icon>pigironsword</icon>
+<toolmaterial>PigIron</toolmaterial>
+<text>An Iron alloy. It seems to be made of blood, iron, and emeralds.
+- Requires the Smeltery</text>
+<material>
+ <main>pigironingot</main>
+</material>
+</page>
+
+<page type="blank">
+</page>
+
 <page type="sectionpage">
 <title>Diamond</title>
 <text>Adding a diamond to the edge of a tool seems to make it more resilient.

resources/assets/tinker/manuals/smeltery.xml

@@ -48,6 +48,10 @@ The main structure for melting metals is called the Smeltery. It is larger than
 <page type="text">
 <text>When working with the Smeltery, there are a few things to keep in mind:
 
+* The Smeltery functions as a large liquid tank. It is capable of melting metals and mixing various things.
+
+* Drains function as input/output for the tank. If you need to get liquids back into the structure, simply pour them into a drain.
+
 * Ores naturally have more material than processed versions, such as ingots. The Smeltery will preserve the full value of the ores - roughly twice as much as a regular furnace would provide.
 
 * Mixing two or more metals in the Smeltery may result in an alloy. The process happens automatically.
@@ -127,6 +131,34 @@ Other liquid removal objects will work, but are frowned upon. An example picture
  <text>Alumite, made from Aluminum(5), Iron(2), and Obsidian(2)</text>
  <icon>alumiteingot</icon>
 </item>
+<item>
+ <text>Pig Iron, made from Iron(1), Blood(1), and Emeralds(1)</text>
+ <icon>pigironingot</icon>
+</item>
+</page>
+
+<page type="sidebar">
+<text>There exist a few liquids that are gained through strange means. Currently known liquids are:</text>
+<item>
+ <text>Blood, damaging entities in the Smeltery</text>
+ <icon>bloodbucket</icon>
+</item>
+<item>
+ <text>Liquified Emeralds, melting down emeralds or villagers</text>
+ <icon>emeraldbucket</icon>
+</item>
+<item>
+ <text>Glue, melting down horses in the Smeltery</text>
+ <icon>gluebucket</icon>
+</item>
+<item>
+ <text>Slime, found on slime islands. It functions as a spawner</text>
+ <icon>slimebucket</icon>
+</item>
+<item>
+ <text>Ender, either melting down ender pearls or endermen</text>
+ <icon>enderbucket</icon>
+</item>
 </page>
 
 <page type="text">
@@ -253,4 +285,10 @@ Part casts must be created by pouring metal around existing parts, like a pickax
 <recipe>endstone</recipe>
 </page>
 
+<page type="blockcast">
+<text>Glueball</text>
+<recipe>glueball</recipe>
+</page>
+
+
 </book>