Meduris/CraftingKeys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
0xSeb
2015-06-26 18:40:11 +02:00
parent 1a356ec6bf a0d280d55d
commit 010649f323
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java
+1 -1
View File
@@ -27,4 +27,4 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
}
}
}
src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
+3 -3
View File
@@ -2,8 +2,8 @@ package de.skate702.craftingkeys.proxies;
import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* The common proxy.
@@ -42,4 +42,4 @@ public class CraftingKeysProxy {
}
}
}