Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing conflict resolutions derps.

Browse source
This commit is contained in:
Kyprus 2012-06-07 18:54:28 -04:00
parent e984ac27a0
commit 59ee83677b
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/net/minecraft/src/buildcraft/core/EntityLaser.java
View file

@ -184,8 +184,5 @@ public class EntityLaser extends Entity implements ISpawnHandler {
}
@Override
protected void writeEntityToNBT(NBTTagCompound nbttagcompound) {
}
protected void writeEntityToNBT(NBTTagCompound nbttagcompound) {}
}

1
common/net/minecraft/src/buildcraft/core/EntityRobot.java
View file

@ -227,7 +227,6 @@ public class EntityRobot extends Entity implements ISpawnHandler {
// Defensive code against errors in implementers
t.printStackTrace();
ModLoader.getLogger().throwing("EntityRobot", "update", t);
"update", t);
}
}