diff --git a/.gitignore b/.gitignore index 4d2693cc03..2cf0497e94 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ #Patch rejects *.rej /patches-/ +# FML changelog +changelog.txt diff --git a/fml b/fml index 5da6dcc7e3..dd17979a2f 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 5da6dcc7e3607e5f107f6a7d39a4b4e1eb7fb306 +Subproject commit dd17979a2f6f02ac4a9dda09b52c96365cc5fec9 diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch index 497dca2314..898ad38783 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -190,6 +190,8 @@ +@@ -191,6 +191,8 @@ import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapStorage; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -673,7 +675,11 @@ +@@ -675,7 +677,11 @@ public void func_147251_a(S02PacketChat p_147251_1_) { @@ -22,7 +22,7 @@ } public void func_147279_a(S0BPacketAnimation p_147279_1_) -@@ -1113,6 +1119,10 @@ +@@ -1115,6 +1121,10 @@ { tileentity.func_145839_a(p_147273_1_.func_148857_g()); }