Merge branch 'master' of github.com:SirSengir/BuildCraft

Browse source

Conflicts:
	common/net/minecraft/src/buildcraft/api/recipes/RefineryRecipe.java

...

This commit is contained in:

SirSengir 2012-07-14 14:33:55 +02:00

parent 639aceb5d9 a9674e6c24

commit 69412830a7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available