Merge branch '1.7.10' into development

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
This commit is contained in:
Ben Spiers committed 2014-07-07 15:43:53 +01:00
1 parent 786d399c2c
commit f0ad905c07
10 files changed
+43 -36

No files matched your search

@@ -81,7 +81,7 @@ public class RenderTickHandler
{
ItemStack stack = player.getEquipmentInSlot(3);
ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int x = scaledresolution.getScaledWidth();
int y = scaledresolution.getScaledHeight();
@@ -182,4 +182,4 @@ public class RenderTickHandler
mc.effectRenderer.addEffect(fx);
}
}
}