SpaceToad 0381a4edd0 Merge branch '6.0.x' into 6.1.x ... Conflicts: build.gradle common/buildcraft/transport/render/FacadeItemRenderer.java		2014-09-06 12:32:59 +02:00
..
assets/buildcraft	Forgot to push fixed lang file	2014-09-04 20:06:47 +02:00
changelog	Merge branch '6.0.x' into 6.1.x	2014-09-06 12:32:59 +02: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
versions.txt	prepare version 6.0.18	2014-09-02 21:22:58 +02:00