tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Whoops! Fixed crash…

Browse source
This commit is contained in:
Aidan Brady 2014-01-18 00:50:56 -05:00
parent f5c607bef0
commit 6eb72a7e44
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/common/Mekanism.java
View file

@ -1131,7 +1131,6 @@ public class Mekanism
MekanismAPI.addBoxBlacklist(Block.bed.blockID, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Block.bed.blockID, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Block.doorWood.blockID, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Block.doorWood.blockID, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Block.doorIron.blockID, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Block.doorIron.blockID, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(MultipartProxy.block().blockID, OreDictionary.WILDCARD_VALUE);
registerOreDict(); registerOreDict();
@ -1187,6 +1186,8 @@ public class Mekanism
proxy.loadSoundHandler(); proxy.loadSoundHandler();
hooks.hook(); hooks.hook();
MekanismAPI.addBoxBlacklist(MultipartProxy.block().blockID, OreDictionary.WILDCARD_VALUE);
addIntegratedItems(); addIntegratedItems();
OreDictManager.init(); OreDictManager.init();