MinecraftForge/FML@b362e8a273 At the request of AbrarSyed.
MinecraftForge/FML@e344303ec7 Merge pull request #346 from Jezzadabomb338/master MinecraftForge/FML@a4686b1261 Added basic Mojang account authentication support for development time login. MinecraftForge/FML@dd17979a2f Fix bukkit connectivity issue.
This commit is contained in:
parent
3c8bd6346f
commit
c71b7554e0
3 changed files with 6 additions and 4 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -19,3 +19,5 @@
|
||||||
#Patch rejects
|
#Patch rejects
|
||||||
*.rej
|
*.rej
|
||||||
/patches-/
|
/patches-/
|
||||||
|
# FML changelog
|
||||||
|
changelog.txt
|
||||||
|
|
2
fml
2
fml
|
@ -1 +1 @@
|
||||||
Subproject commit 5da6dcc7e3607e5f107f6a7d39a4b4e1eb7fb306
|
Subproject commit dd17979a2f6f02ac4a9dda09b52c96365cc5fec9
|
|
@ -1,6 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
||||||
+++ ../src-work/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.ISaveHandler;
|
||||||
import net.minecraft.world.storage.MapData;
|
import net.minecraft.world.storage.MapData;
|
||||||
import net.minecraft.world.storage.MapStorage;
|
import net.minecraft.world.storage.MapStorage;
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@@ -673,7 +675,11 @@
|
@@ -675,7 +677,11 @@
|
||||||
|
|
||||||
public void func_147251_a(S02PacketChat p_147251_1_)
|
public void func_147251_a(S02PacketChat p_147251_1_)
|
||||||
{
|
{
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_147279_a(S0BPacketAnimation p_147279_1_)
|
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());
|
tileentity.func_145839_a(p_147273_1_.func_148857_g());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue