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

Conflicts:
	common/chemicraft/ChemiCraft.java

diff --cc common/chemicraft/ChemiCraft.java
index 357baa7,fe7ebf5..94ad8f5
--- 1/common/chemicraft/ChemiCraft.java
--- 2/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@@ -15,9 -15,10 +15,8 @@@ import chemicraft.compounds.CompoundWat
  import chemicraft.debug.CommandDeleteItem;\r
  import chemicraft.debug.CommandGenDebugRoom;\r
  import chemicraft.debug.CommandSetTile;\r
--import chemicraft.entity.EntityAtomsGrenade;\r
--import chemicraft.item.ItemAtomGrenade;\r
  import chemicraft.item.ItemAtoms;\r
+ import chemicraft.item.ItemAtomsGrenade;\r
  import chemicraft.item.ItemCompounds;\r
  import chemicraft.item.ItemGasCollectingBottle;\r
  import chemicraft.system.CommonProxy;\r
@@@ -38,7 -39,7 +37,6 @@@ import cpw.mods.fml.common.event.FMLPre
  import cpw.mods.fml.common.event.FMLServerStartingEvent;\r
  import cpw.mods.fml.common.network.NetworkMod;\r
  import cpw.mods.fml.common.network.NetworkRegistry;\r
--import cpw.mods.fml.common.registry.EntityRegistry;\r
  import cpw.mods.fml.common.registry.GameRegistry;\r
  \r
  /**\r
@@@ -301,17 -302,15 +299,21 @@@ public class ChemiCraft 
                });\r
  \r
                // 化合物を追加します\r
-               api.addLangCompound("ja_JP", "Water", "水");\r
 +              api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
++              api.addLangCompound("ja_JP", "Water", "水");
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");\r
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "Water", "水");\r
++
  \r
                //化合物のHandlerを設定します\r
 -              ChemiCraftAPI.getInstance().settingCompoundHandler("Water", new CompoundWater());\r
 +              api.settingCompoundHandler("Water", new CompoundWater());\r
 +\r
 +              //化合物のレシピを追加します\r
 +              api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, 1));\r
  \r
                //手榴弾の追加\r
 -              ChemiCraftAPI.getInstance().addMaterialRecipe(\r
 +              api.addMaterialRecipe(\r
                                new ItemStack[]{\r
                                                null,\r
                                                new ItemStack(Block.stone),\r