SpaceToad 5812d4f0bf Merge branch 'BuildCraft-5.1.x' into NextGen ... Conflicts: buildcraft_resources/assets/buildcraft/lang/en_US.lang common/buildcraft/energy/BlockEngine.java common/buildcraft/factory/BlockTank.java common/buildcraft/transport/pipes/PipeItemsEmerald.java		2014-04-26 13:39:01 +02:00
..
assets/buildcraft	Merge branch 'BuildCraft-5.1.x' into NextGen	2014-04-26 13:39:01 +02:00
changelog	Version 4.2.2	2014-01-04 11:49:47 -08:00
mods/buildcraft/textures/blocks	Merge mc16 into master	2013-08-07 14:54:17 -07:00
LICENSE.txt	Fix part of issue #552	2013-01-16 19:41:57 -05:00
mcmod.info	Update mcmod.info	2014-03-08 10:58:47 -03:00