Merge branch 'development' into 1.8

Browse source

Conflicts:
	src/main/java/mekanism/common/CommonProxy.java

...

This commit is contained in:

Aidan C. Brady 2014-08-15 16:22:44 -04:00

parent d3b5676e43 db3c7863fe

commit f08601af9c

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