Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

This commit is contained in:
Aidan C. Brady committed 2015-03-22 00:48:44 -05:00
commit d6c48a6e71
6 files changed
+12 -13

No files matched your search

@@ -1194,7 +1194,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
public boolean isEnabled()
{
return machines.isEnabled(this);
return machines.isEnabled(this.name);
}
public void addRecipes(Collection<MekanismRecipe> recipes)