Fix merge conflicts

This commit is contained in:
mDiyo committed 2014-06-30 09:22:30 -08:00
commit 145f7b9724
37 files changed
+3017 -776

No files matched your search

@@ -153,7 +153,7 @@ public class ArmorProxyClient extends ArmorProxyCommon
{
updateCounter++;
ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight);
ScaledResolution scaledresolution = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight);
int scaledWidth = scaledresolution.getScaledWidth();
int scaledHeight = scaledresolution.getScaledHeight();
int xBasePos = scaledWidth / 2 - 91;