Skip to content

Commit

Permalink
Fixes #334 #333 and #330
Browse files Browse the repository at this point in the history
  • Loading branch information
TheCricket committed Jun 21, 2015
1 parent 57901ae commit e582719
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private static void loadThaumcraftAspects() {
}

private static void loadEE3Values(){
FMLLog.log(Chisel.MOD_ID, Level.INFO, "Oooh is that Equivalent Exchange I see?");
FMLLog.log(Chisel.MOD_ID, Level.INFO, "[Chisel 2] Oooh is that Equivalent Exchange I see?");
EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselItems.ballomoss, 1), 16);

EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 1), 8);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@ public void updateItems() {

activeVariations = 0;
while (activeVariations < normalSlots && activeVariations < list.size()) {
inventory[activeVariations] = list.get(activeVariations);
activeVariations++;
if(Block.blockRegistry.getNameForObject(list.get(activeVariations)) != null) {
inventory[activeVariations] = list.get(activeVariations);
activeVariations++;
}
}

container.onChiselSlotChanged();
Expand Down

0 comments on commit e582719

Please sign in to comment.