Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor

Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
	buildcraft_client/net/minecraft/src/mod_BuildCraftCore.java
	buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
	common/net/minecraft/src/BuildCraftTransport.java
	common/net/minecraft/src/buildcraft/transport/PipeRenderState.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
This commit is contained in:
Krapht 2012-07-13 22:05:38 +02:00
commit db1619c416

Diff content is not available