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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / ChemiCraftBase.java

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index ee4b742..ffb1368 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -69,6 +69,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public int dustID;
        public int radiationGunID;
        public int radiationBalletID;
        public int dustID;
        public int radiationGunID;
        public int radiationBalletID;

+       public int raditionGunDataChipID;

 
        /**
         * the BlockID.
 
        /**
         * the BlockID.


@@ -90,6 +91,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public Item itemRadiationGun;
        public Item itemRadiationBallet;
        public Item itemOreSearcher;
        public Item itemRadiationGun;
        public Item itemRadiationBallet;
        public Item itemOreSearcher;

+       public Item itemRaditionGunDataChip;

 
        /**
         * the Register Instances.
 
        /**
         * the Register Instances.


@@ -103,7 +105,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public ChemiCraftRegister registerEntitys;
 
        /**
        public ChemiCraftRegister registerEntitys;
 
        /**

-        * the Textures
+        * the Textures.

         */
        public static final String INGOT = ChemiCraft.TEXTURE + "atom_ingots_";
        public static final String ORE = ChemiCraft.TEXTURE + "atom_ores_";
         */
        public static final String INGOT = ChemiCraft.TEXTURE + "atom_ingots_";
        public static final String ORE = ChemiCraft.TEXTURE + "atom_ores_";