asiekierka 24441a1ae5 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x ... Conflicts: build.gradle common/buildcraft/transport/BlockGenericPipe.java common/buildcraft/transport/pipes/PipeFluidsWood.java		2015-04-03 23:18:40 +02:00
..
buildcraft/api	Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x	2015-04-03 23:18:40 +02:00
cofh/api	update license copyright year, fix #2470	2015-02-26 16:57:49 +01:00