keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

fixed merge

This commit is contained in:
MachineMuse 2013-09-05 18:43:27 -06:00
parent 65551ce233
commit 7a0a7bf8e0
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/net/minecraftforge/client/ForgeHooksClient.java
View File

@ -6,13 +6,9 @@ import java.util.TreeSet;
import javax.imageio.ImageIO;
<<<<<<< HEAD
import net.minecraftforge.client.event.MouseEvent;
=======
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraftforge.client.event.FOVUpdateEvent;
>>>>>>> 96e716f... Added field of view hook
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
@ -27,11 +23,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockFluid;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;