Merge branch 'johni/1.7.10' into johni/develop

2018-04-02 11:53:06 +02:00
parent feb39f02ec 277e55a241
commit fb1254ce12
142 changed files with 2721 additions and 498 deletions
--- a/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java
+++ b/src/main/java/com/replaymod/compat/optifine/DisableFastRender.java
@@ -2,8 +2,14 @@ package com.replaymod.compat.optifine;

 import com.replaymod.render.events.ReplayRenderEvent;
 import net.minecraft.client.Minecraft;
+
+//#if MC>=10800
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#else
+//$$ import cpw.mods.fml.client.FMLClientHandler;
+//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+//#endif

 public class DisableFastRender {