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

diff --cc common/chemicraft/ChemiCraft.java
Simple merge

diff --cc common/chemicraft/item/ItemGasCollectingBottle.java
index c646e4a,9a0906e..b5b7836
--- 1/common/chemicraft/ItemGasCollectingBottle.java
--- 2/common/chemicraft/item/ItemGasCollectingBottle.java
+++ b/common/chemicraft/item/ItemGasCollectingBottle.java
@@@ -1,11 -1,11 +1,12 @@@
- package chemicraft;
+ package chemicraft.item;
  
- import java.util.Random;
- 
- import net.minecraft.src.*;
+ import net.minecraft.src.EntityPlayer;
+ import net.minecraft.src.ItemStack;
+ import net.minecraft.src.World;
+ import chemicraft.ChemiCraft;
  
 -public class ItemGasCollectingBottle extends ItemAtomInfoContainer {
 +public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 +{
  
        public ItemGasCollectingBottle(int id) {
                super(id);

diff --cc common/chemicraft/util/AtomInfo.java
index b7921b0,89b99fc..2473ff9
--- 1/common/chemicraft/AtomInfo.java
--- 2/common/chemicraft/util/AtomInfo.java
+++ b/common/chemicraft/util/AtomInfo.java
@@@ -1,9 -1,6 +1,8 @@@
- package chemicraft;\r
+ package chemicraft.util;\r
  \r
 +import cpw.mods.fml.common.Side;\r
 +import cpw.mods.fml.common.asm.SideOnly;\r
  import net.minecraft.src.EntityPlayer;\r
- import net.minecraft.src.ItemStack;\r
  import net.minecraft.src.World;\r
  \r
  /**\r