Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4

# Conflicts:
#	src/main/java/techreborn/client/container/ContainerExtractor.java
This commit is contained in:
al132 2016-07-19 00:21:18 -05:00
commit aa8fbbb7bc

View file

@ -75,7 +75,7 @@ public class ContainerExtractor extends ContainerCrafting implements IContainerL
this.player = player;
}
@Nullable
@Override
public EntityPlayer getPlayer() {
return player;