Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into MC1.6

Browse source
This commit is contained in:
DarkGuardsman 2013-07-16 19:10:25 -04:00
commit 3933ce1179
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -149,7 +149,7 @@ public class AssemblyLine
blockRejector = new BlockRejector(BLOCK_ID_PREFIX++);
blockEncoder = new BlockEncoder(BLOCK_ID_PREFIX++);
blockArmbot = new BlockArmbot(BLOCK_ID_PREFIX++);
blockMulti = new BlockMulti(BLOCK_ID_PREFIX++);
blockMulti = new BlockMulti(AssemblyLine.CONFIGURATION.getBlock("blockMulti", BLOCK_ID_PREFIX++).getInt());
blockCraneController = new BlockCraneController(BLOCK_ID_PREFIX++);
blockCraneFrame = new BlockCraneFrame(BLOCK_ID_PREFIX++);
blockTurntable = new BlockTurntable(BLOCK_ID_PREFIX++);