Merge branch 'master' into development

Browse source

* master:
  Update build number

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java

...

This commit is contained in:

aidancbrady 2016-02-26 14:31:17 -05:00

parent d6f6625d83 baf3ae6f59

commit a31bc02e83

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