Merge remote-tracking branch 'origin/master'

Conflicts: src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
2015-04-18 20:38:20 -04:00 · 2015-04-18 20:38:20 -04:00 · 72b1904f6b
commit 72b1904f6b
parent 31f552fe2d d423ea5807
3 changed files with 9 additions and 4 deletions
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
+++ b/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;