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:
commit
aa8fbbb7bc
1 changed files with 1 additions and 1 deletions
|
@ -75,7 +75,7 @@ public class ContainerExtractor extends ContainerCrafting implements IContainerL
|
|||
this.player = player;
|
||||
|
||||
}
|
||||
@Nullable
|
||||
|
||||
@Override
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
|
|
Loading…
Add table
Reference in a new issue