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

Conflicts:
	common/pcc/chemicraft/base/ChemiCraftBase.java
	common/pcc/chemicraft/base/ChemiCraftRegisterItem.java

diff --cc common/pcc/chemicraft/base/ChemiCraftBase.java
index ee4b742,2aad596..ffb1368
--- 1/common/pcc/chemicraft/base/ChemiCraftBase.java
--- 2/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@@ -69,6 -67,8 +69,7 @@@ public class ChemiCraftBase extends Che
        public int dustID;
        public int radiationGunID;
        public int radiationBalletID;
 -      public int oreSerarcherID;
+       public int raditionGunDataChipID;
  
        /**
         * the BlockID.
@@@ -103,10 -103,9 +105,10 @@@
        public ChemiCraftRegister registerEntitys;
  
        /**
-        * the Textures
+        * the Textures.
         */
 -      public static final String ORE = ChemiCraft.TEXTURE + "atoms_ore_";
 +      public static final String INGOT = ChemiCraft.TEXTURE + "atom_ingots_";
 +      public static final String ORE = ChemiCraft.TEXTURE + "atom_ores_";
  
        public ChemiCraftBase() {
                this.registerCompounds = new ChemiCraftRegisterCompounds(this);

diff --cc common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
Simple merge

diff --cc common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
index b057e5b,2b71caa..d460d91
--- 1/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
--- 2/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
@@@ -21,13 -25,18 +24,19 @@@ public class ChemiCraftRegisterItem ext
        @Override
        public void start() {
                //アイテムを変数に代入
 +              this.mod.itemAtomIngots = new ItemAtomIngots(this.mod.atomIngotsID).setUnlocalizedName("atomIngots");
                this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setUnlocalizedName("AtomsGrenade");
 +              this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
                this.mod.itemDust = new ItemDust(this.mod.dustID).setUnlocalizedName("dust");
 +              this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
                this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun");
                this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet");
 -              this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
 -              this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
+               this.mod.itemRaditionGunDataChip = new Item(this.mod.raditionGunDataChipID) {
+                       @Override
+                       public void updateIcons(IconRegister par1IconRegister) {
+                               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "RaditionGunDataChip");
+                       }
+               }.setUnlocalizedName("RaditionGunDataChip");
  
                //名前を登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "AtomGrenade");
@@@ -42,6 -47,12 +51,8 @@@
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBullet");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線弾");
 -              this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke");
 -              this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙");
 -              this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher");
 -              this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機");
+               this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "RaditionGunDataChip");
+               this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "ja_JP", "放射線銃データチップ");
        }
  
  }