Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
index 653365f..aafca7e 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EntityDamageSource;
 import net.minecraftforge.oredict.OreDictionary;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.util.Formula;
@@ -42,7 +43,7 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister {
                // 鉱石
                this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Block.oreCoal), new Formula("C"));
                this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Item.coal), new Formula("C"));
-               this.mod.api.addChemicalCombinationRecipe(new ItemStack(Item.diamond), 
+               this.mod.api.addChemicalCombinationRecipe(new ItemStack(Item.diamond),
                                new Formula("C64Si16"));
                this.mod.api.addReversibleOfPyrolysis(new ItemStack(Item.emerald), new Formula("Be3Al2Si6O18"));