From: ponkotate <ponkotate@users.sourceforge.jp>
Date: Sat, 29 Dec 2012 02:55:38 +0000 (+0900)
Subject: Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=a201ad9b5a97fae364dc22b68f1423ae5ceee361

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

a201ad9b5a97fae364dc22b68f1423ae5ceee361
diff --cc common/chemicraft/item/ItemGasCollectingBottle.java
index c646e4a,9a0906e..b5b7836
--- a/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
--- a/common/chemicraft/util/AtomInfo.java
+++ b/common/chemicraft/util/AtomInfo.java
@@@ -1,9 -1,6 +1,8 @@@
- package chemicraft;
+ package chemicraft.util;
  
 +import cpw.mods.fml.common.Side;
 +import cpw.mods.fml.common.asm.SideOnly;
  import net.minecraft.src.EntityPlayer;
- import net.minecraft.src.ItemStack;
  import net.minecraft.src.World;
  
  /**