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

Merge branch '5.0.x' into 6.0.x

Browse source 
Conflicts:
	common/buildcraft/transport/PipeConnectionBans.java
This commit is contained in:
SpaceToad 2014-05-05 19:35:24 +02:00
commit 27f858e2b5
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/buildcraft/transport/PipeConnectionBans.java
View file

@ -36,6 +36,10 @@ public final class PipeConnectionBans {
banConnection(PipeFluidsStone.class, PipeFluidsCobblestone.class);
banConnection(PipeFluidsWood.class);
banConnection(PipeFluidsEmerald.class);
banConnection(PipeFluidsWood.class, PipeFluidsEmerald.class);
banConnection(PipeFluidsEmerald.class);
@ -46,10 +50,12 @@ public final class PipeConnectionBans {
banConnection(PipeItemsEmerald.class);
banConnection(PipeItemsObsidian.class);
banConnection(PipeItemsEmzuli.class);
banConnection(PipeItemsWood.class, PipeItemsEmerald.class, PipeItemsEmzuli.class);
banConnection(PipeItemsObsidian.class);
// Power Pipes
banConnection(PipePowerWood.class);
}