Merge remote-tracking branch 'origin/master'

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

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...