Commit graph

7 commits

Author SHA1 Message Date
SpaceToad
1791c485af Merge branch '5.0.x' into 6.0.x
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java
2014-07-11 08:49:38 +02:00
Parker Young
341ff4e972 Updated to 1.7.10
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
2014-06-28 11:57:16 -04:00
Raul Tambre
1fe4200a7d No need to commit some Eclipse preferences 2014-05-05 19:33:33 +03:00
Cisien
b039726ef1 addFacade with an ItemStack of 0 would create a facade recipe without a block
fixed some spelling mistakes in build.grade
added IDEA project files to .gitignore
2014-02-23 15:24:49 -08:00
AbrarSyed
507eb014af Step 2: The Rebirth 2014-02-17 01:24:19 -06:00
Ross Allan
1cf75590cf Updated /build.xml for 1.4.7, allows recompiling without full forge setup.
Signed-off-by: Ross Allan <rallanpcl@gmail.com>
2013-01-04 02:21:25 +00:00
Christian
58c7dd3d1e Item Facades now use the IMC comms system to know about custom facade
block types. Send your blocks through the API (FacadeManager) or 
the IMC system (use key "add-facade" and value "blockid@meta")
2012-10-24 21:57:31 -04:00