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

diff --cc common/chemicraft/ChemiCraft.java
index c1f226a,5b6adbb..8a54a1c
--- 1/common/chemicraft/ChemiCraft.java
--- 2/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@@ -284,8 -282,14 +284,14 @@@ public class ChemiCraft 
                        new Character('A'), new ItemStack(this.itemAtoms, 1, 0),\r
                });\r
  \r
+               // 化合物を追加します\r
+               ChemiCraftAPI.instance.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+ \r
+               // 化合物のレシピを追加します\r
+               ChemiCraftAPI.instance.addChemicalCombinationRecipe(new ItemStack[]{new ItemStack(this.itemAtoms, 5), new ItemStack(this.itemAtoms, 7)}, new ItemStack(this.itemCompounds, 0));\r
+ \r
                //手榴弾の追加\r
 -              ChemiCraftAPI.instance.addMaterialRecipe(new ItemStack[]{new ItemStack(Item.gunpowder)}, new ItemStack(this.itemAtomGrenade, 16, 0), new NBTRecipeGrenade());\r
 +              ChemiCraftAPI.instance.addSharplessMaterialRecipe(new ItemStack[]{new ItemStack(Item.gunpowder)}, new ItemStack(this.itemAtomGrenade, 16, 0), new NBTRecipeGrenade());\r
  \r
        }\r
  \r