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

Conflicts:
	common/chemicraft/ChemiCraft.java
	common/chemicraft/item/ItemAtomsGrenade.java
	common/chemicraft/render/RenderAtomsGrenade.java

diff --cc common/chemicraft/ChemiCraft.java
index 98ee592,2bd896c..fe7ebf5
--- 1/common/chemicraft/ChemiCraft.java
--- 2/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@@ -15,8 -16,8 +16,9 @@@ import chemicraft.debug.CommandDeleteIt
  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
@@@ -307,12 -300,12 +301,13 @@@ public class ChemiCraft 
                        Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),\r
                });\r
  \r
-               //\r
-               ChemiCraftAPI.getInstance().addDecompositionRecipe(new ItemStack(Block.dirt), new ItemStack[]{new ItemStack(Block.stone)});\r
- \r
                // 化合物を追加します\r
 +              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
  \r
                //手榴弾の追加\r
                ChemiCraftAPI.getInstance().addMaterialRecipe(\r

diff --cc common/chemicraft/item/ItemAtomsGrenade.java
index 7e6c43a,06d31c3..1dcfda9
--- 1/common/chemicraft/item/ItemAtomsGrenade.java
--- 2/common/chemicraft/item/ItemAtomGrenade.java
+++ b/common/chemicraft/item/ItemAtomsGrenade.java
@@@ -10,10 -9,13 +10,13 @@@ import net.minecraft.src.ItemStack
  import net.minecraft.src.NBTTagCompound;
  import net.minecraft.src.NBTTagList;
  import net.minecraft.src.World;
+ import net.minecraft.src.WorldClient;
+ import net.minecraft.src.WorldServer;
+ import chemicraft.entity.EntityAtomsGrenade;
  
 -public class ItemAtomGrenade extends Item {
 +public class ItemAtomsGrenade extends Item {
  
 -      public ItemAtomGrenade(int par1) {
 +      public ItemAtomsGrenade(int par1) {
                super(par1);
        }