Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/assets/alchemicalwizardry/lang/en_US.lang

build.properties

@@ -1,12 +1,12 @@
 #
-#Wed Mar 04 17:54:09 EST 2015
+#Thu Apr 16 11:30:08 EDT 2015
 mod_name=BloodMagic
 forge_version=10.13.2.1232
 ccc_version=1.0.4.29
 nei_version=1.0.3.64
 //=Dependency Information
 package_group=com.wayoftime.bloodmagic
-mod_version=1.3.1
+mod_version=1.3.2
 minetweaker_version=Dev-1.7.10-3.0.9B
+build_number=1
 mc_version=1.7.10
-build_number=8

src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java

@@ -257,6 +257,11 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
         {
             verticalOffset--;
         }
+        
+        if (world.isRemote)
+        {
+            verticalOffset--;
+        }
 
         int posX = (int) Math.round(player.posX - 0.5f);
         int posY = (int) player.posY;

src/main/resources/assets/alchemicalwizardry/lang/en_US.lang

@@ -452,4 +452,4 @@ message.routerfocus.limit=Focus' Item Limit set to:
 
 #Achievements
 achievement.alchemicalwizardy:firstPrick=Your first prick!
-achievement.alchemicalwizardy:firstPrick.desc=The first drop of life into the Altar...
+achievement.alchemicalwizardy:firstPrick.desc=The first drop of life into the Altar...