Merge branch '6.0.x' into 6.1.x

Browse source

Conflicts:
	common/buildcraft/transport/TileGenericPipe.java

...

This commit is contained in:

SpaceToad 2014-06-25 22:55:55 +02:00

parent 35c592f041 286737b4ad

commit e7f342ce40

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