From d49fb6e7f561b4bdd2d19a4b43a15896280f6386 Mon Sep 17 00:00:00 2001
From: ponkotate <ponkotate@users.sourceforge.jp>
Date: Fri, 12 Apr 2013 20:26:06 +0900
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=83=BB=E5=A4=89=E6=9B=B4=20?=
 =?utf8?q?=E3=83=BB=E5=90=8D=E5=89=8D=E3=81=AE=E3=81=A4=E3=81=A5=E3=82=8A?=
 =?utf8?q?=E3=81=8C=E3=81=82=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?=
 =?utf8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3=20?=
 =?utf8?q?=E3=83=BB=E9=89=B1=E7=9F=B3=E3=83=86=E3=82=AF=E3=82=B9=E3=83=81?=
 =?utf8?q?=E3=83=A3=E3=81=AE=E5=AE=9F=E8=A3=85(=E3=83=A9=E3=83=B3=E3=82=BF?=
 =?utf8?q?=E3=83=8E=E3=82=A4=E3=83=89=E3=83=BB=E3=82=A2=E3=82=AF=E3=83=81?=
 =?utf8?q?=E3=83=8E=E3=82=A4=E3=83=89=E3=81=AF=E6=9C=AA=E5=AE=9F=E8=A3=85)?=
 =?utf8?q?=20=E3=83=BB=E9=9B=BB=E8=A7=A3=E5=8F=B0=E3=81=AE=E3=82=A4?=
 =?utf8?q?=E3=83=B3=E3=83=99=E3=83=B3=E3=83=88=E3=83=AA=E5=90=8D=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=20=E3=83=BBSlot=E3=81=AE=E4=BF=AE=E6=AD=A3=20?=
 =?utf8?q?=E3=83=BBFormula=E3=82=AF=E3=83=A9=E3=82=B9=E3=81=AE=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 common/pcc/chemicraft/base/ChemiCraftBase.java          |   2 +-
 common/pcc/chemicraft/base/ChemiCraftRegisterItem.java  |   2 +-
 common/pcc/chemicraft/base/ore/BlockAtomOres.java       |  11 ++++++++---
 common/pcc/chemicraft/core/ChemiCraftCore.java          |   3 ++-
 common/pcc/chemicraft/core/ChemiCraftRegisterItem.java  |   3 +--
 .../core/inventory/InventoryElectrolysisFuel.java       |   2 +-
 .../core/inventory/InventoryElectrolysisMaterial.java   |   2 +-
 .../core/inventory/InventoryElectrolysisResult.java     |   2 +-
 common/pcc/chemicraft/core/item/ItemAtoms.java          |  11 +----------
 .../pcc/chemicraft/core/slot/SlotElectrolysisFuel.java  |  16 ++++++++++++++++
 .../chemicraft/core/slot/SlotPyrolysisTableFuel.java    |  16 ++++++++++++++++
 common/pcc/chemicraft/util/Formula.java                 |  14 +++++++++-----
 .../mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png    | Bin 606 -> 0 bytes
 .../textures/blocks/AtomsOre_未カット/AtomsOre.png  | Bin 2388 -> 0 bytes
 .../textures/blocks/AtomsOre_未カット/colors.txt    |   1 -
 15 files changed, 58 insertions(+), 27 deletions(-)
 delete mode 100644 resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png
 delete mode 100644 resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png
 delete mode 100644 resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index bce1fc9..cc2abdb 100644
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -101,7 +101,7 @@ public class ChemiCraftBase extends ChemiCraft {
 	/**
 	 * the Textures
 	 */
-	public static final String ORE = ChemiCraft.TEXTURE + "AtomsOre_";
+	public static final String ORE = ChemiCraft.TEXTURE + "atoms_ore_";
 
 	public ChemiCraftBase() {
 		this.registerCompounds = new ChemiCraftRegisterCompounds(this);
diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
index a9e5163..98b51e3 100644
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
@@ -34,7 +34,7 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
 		this.mod.nameAuxiliary.addName(this.mod.itemDust, "ja_JP", "粉塵");
 		this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "RadiationGun");
 		this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃");
-		this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBallet");
+		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", "黒煙");
diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 54b6613..db8b59e 100644
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -1,5 +1,6 @@
 package pcc.chemicraft.base.ore;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -10,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import pcc.chemicraft.base.ChemiCraftBase;
 import pcc.chemicraft.base.ChemiCraftBaseAPI;
-import pcc.chemicraft.core.ChemiCraftCore;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -31,11 +31,16 @@ public class BlockAtomOres extends Block {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister par1IconRegister) {
-		this.iconArray = new Icon[ChemiCraftCore.ATOMSNAME.length];
+		ArrayList<String> atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName();
+		this.iconArray = new Icon[atomNames.size()];
 
 		for (int i = 0; i < this.iconArray.length; i++){
-			this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+			this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + atomNames.get(i));
 		}
+
+		// WIP
+		this.iconArray[iconArray.length - 1] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+		this.iconArray[iconArray.length - 2] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
 	}
 
 	@Override
diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java
index 1c27401..5c7c043 100644
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@ -66,7 +66,7 @@ public class ChemiCraftCore extends ChemiCraft{
 	 * 元素名日本語版配列
 	 */
 	public static final String[] ATOMSNAMEJP = {
-		"水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
+		"水素", "ヘリウム", "リチウム", "ベリリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
 		"チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
 		"ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
 		"ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
@@ -277,6 +277,7 @@ public class ChemiCraftCore extends ChemiCraft{
 		NetworkRegistry.instance().registerGuiHandler(instance, proxy);
 
 		this.api.addPyrolysisDecompositionFuel(new ItemStack(Item.coal), 2000*8);
+		this.api.addElectrolysisDecompositionFuel(new ItemStack(this.itemChemicalCells), 1000*8);
 	}
 
 
diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
index 6d26999..1863941 100644
--- a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
@@ -32,14 +32,13 @@ public class ChemiCraftRegisterItem extends ChemiCraftCoreRegister {
 				}
 			}.setCreativeTab(CreativeTabs.tabFood).setUnlocalizedName(ChemiCraft.TEXTURE + "Pear");
 
-			//名前登録&Minecraftに登録
+		//名前登録&Minecraftに登録
 		this.mod.nameAuxiliary.addName(this.mod.itemAtoms, ChemiCraftCore.ATOMSNAME);
 		this.mod.nameAuxiliary.addName(this.mod.itemAtoms, "ja_JP", ChemiCraftCore.ATOMSNAMEJP);
 		this.mod.nameAuxiliary.addName(this.mod.itemGasCollectingBottle, "GasCollectingBottle");
 		this.mod.nameAuxiliary.addName(this.mod.itemGasCollectingBottle, "ja_JP", "集気瓶");
 		this.mod.nameAuxiliary.addName(this.mod.itemChemicalCells, "ChemicalCell");
 		this.mod.nameAuxiliary.addName(this.mod.itemChemicalCells, "ja_JP",  "化学電池");
-		this.mod.api.addElectrolysisDecompositionFuel(new ItemStack(this.mod.itemChemicalCells), 1000);
 		this.mod.nameAuxiliary.addName(this.mod.itemPear, "Pear");
 		this.mod.nameAuxiliary.addName(this.mod.itemPear, "ja_JP",  "梨");
 
diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
index 3a0f57c..ff8e369 100644
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
@@ -62,7 +62,7 @@ public class InventoryElectrolysisFuel implements IInventory
 	@Override
 	public String getInvName()
 	{
-		return "ChemicalCraftingInventory";
+		return "ElectrolysisTableInventory";
 	}
 
 	@Override
diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
index b4fbd1f..65ffc5b 100644
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
@@ -62,7 +62,7 @@ public class InventoryElectrolysisMaterial implements IInventory
 	@Override
 	public String getInvName()
 	{
-		return "ChemicalCraftingInventory";
+		return "ElectrolysisTableInventory";
 	}
 
 	@Override
diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
index dbf35f8..4475c98 100644
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
@@ -62,7 +62,7 @@ public class InventoryElectrolysisResult implements IInventory
 	@Override
 	public String getInvName()
 	{
-		return "ChemicalCraftingInventory";
+		return "ElectrolysisTableInventory";
 	}
 
 	@Override
diff --git a/common/pcc/chemicraft/core/item/ItemAtoms.java b/common/pcc/chemicraft/core/item/ItemAtoms.java
index da85e5e..9962ffc 100644
--- a/common/pcc/chemicraft/core/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/core/item/ItemAtoms.java
@@ -74,16 +74,7 @@ public class ItemAtoms extends Item {
 
 	@Override
 	public String getUnlocalizedName(ItemStack par1ItemStack){
-		return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+		return super.getUnlocalizedName() + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
 	}
 
-
-
-	/* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
-	@Override
-	public String getTextureFile(){
-		return ChemiCraft.ITEM_ATOMS_TEXTURE;
-	}
-	 */
-
 }
\ No newline at end of file
diff --git a/common/pcc/chemicraft/core/slot/SlotElectrolysisFuel.java b/common/pcc/chemicraft/core/slot/SlotElectrolysisFuel.java
index c3b633d..aa14479 100644
--- a/common/pcc/chemicraft/core/slot/SlotElectrolysisFuel.java
+++ b/common/pcc/chemicraft/core/slot/SlotElectrolysisFuel.java
@@ -1,7 +1,11 @@
 package pcc.chemicraft.core.slot;
 
+import java.util.Iterator;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import pcc.chemicraft.core.ChemiCraftAPI;
 
 public class SlotElectrolysisFuel extends Slot
 {
@@ -10,4 +14,16 @@ public class SlotElectrolysisFuel extends Slot
 		super(par1iInventory, par2, par3, par4);
 	}
 
+	@Override
+	public boolean isItemValid(ItemStack par1ItemStack) {
+		Iterator<ItemStack> itFuel = ChemiCraftAPI.getElectrolysisFuelList().keySet().iterator();
+		while (itFuel.hasNext()) {
+			ItemStack fuel = itFuel.next();
+			if (par1ItemStack != null && par1ItemStack.itemID == fuel.itemID) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableFuel.java b/common/pcc/chemicraft/core/slot/SlotPyrolysisTableFuel.java
index 72fbb99..3ab1389 100644
--- a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableFuel.java
+++ b/common/pcc/chemicraft/core/slot/SlotPyrolysisTableFuel.java
@@ -1,7 +1,11 @@
 package pcc.chemicraft.core.slot;
 
+import java.util.Iterator;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import pcc.chemicraft.core.ChemiCraftAPI;
 
 public class SlotPyrolysisTableFuel extends Slot {
 
@@ -9,4 +13,16 @@ public class SlotPyrolysisTableFuel extends Slot {
 		super(par1IInventory, par2, par3, par4);
 	}
 
+	@Override
+	public boolean isItemValid(ItemStack par1ItemStack) {
+		Iterator<ItemStack> itFuel = ChemiCraftAPI.getPyrolysisFuelList().keySet().iterator();
+		while (itFuel.hasNext()) {
+			ItemStack fuel = itFuel.next();
+			if (par1ItemStack != null && par1ItemStack.itemID == fuel.itemID) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/common/pcc/chemicraft/util/Formula.java b/common/pcc/chemicraft/util/Formula.java
index 2a9faba..148c7cd 100644
--- a/common/pcc/chemicraft/util/Formula.java
+++ b/common/pcc/chemicraft/util/Formula.java
@@ -26,12 +26,13 @@ public class Formula {
 		this.amonts = par2;
 	}
 
+	// 今後ソースの整頓をする予定 -WIP-
 	public void run(String par1) {
-		char[] var2 = par1.toCharArray();
-		String var3 = null;
-		int var4 = 0;
-		int var5 = 1;
-		Formula var6 = null;
+		char[] var2 = par1.toCharArray(); // par1のchar配列
+		String var3 = null; // setAtomの第一引数に送る
+		int var4 = 0; // setAtomの第二引数に送る
+		int var5 = 1; // 倍率
+		Formula var6 = null; // Formula格納用
 
 		for (int i = 0; i < var2.length; i++) {
 			if (Character.isLetter(var2[i])) {
@@ -81,6 +82,9 @@ public class Formula {
 			}
 		}
 		if (var3 != null) {
+			if (var4 < 0) {
+				var4 = 1;
+			}
 			this.setAtom(var3,  var4 * var5);
 		}
 	}
diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png
deleted file mode 100644
index dc856154ae0ff73867d8bc841631c4d97c4a7c47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*h$
z5Ewc9#dtda0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~0005C
zNkl<ZILmF5A#dYA5QV=~WgD=}z(2sS{Rc(MgF=i-DwkcPq$-HyoD^_MEII6sC8Xrg
z@<oS2Pi6iAZk3W-VB;L{?bPyRiM^wFPjBA59p!m`ZrhgrQA(k;2B4}ck|e=<&!xWW
zAz*mM<1qkQYqZu>RYep<0JLq}5u8pZthE9%#>jsh$JBL=QVM|M@yMT#5AGixJ{2TM
zBCLThiXyDF(j4Rm^0sYJN-^?h&ih>nKwZ~DvfLJ|7ju@|LTdY6$^Dm^+@Bvat^&||
z&vIL!l)^bDP30;F;O_Q@a<c(oy_oa-nDOoVkB%UYV*v!&06$+|q#kOaKS>gR&I9i~
zv(;DDi#fl3chaF?nx-=QG)@1(3mKza<sE^wme~rLrulEr)>@VWmBBNu=|%|7hMiv;
zr`&AB<nZ<0b5*W#mfM2;uEaUV-R+IsjWN8wy#w(2_AV-vQh4tH7-d;@4jHi4VvNB#
z$7C{*1Oglm2QhQ@^dvDKU3v@s(_d+S6Vo*POk#+ub54>M(q@d2bp}vh*(lHRb6~xs
sWC-ZLN~ILnLr~K+5|Uul5ZEXF3*#H<09@6cR{#J207*qoM6N<$f)!>3@Bjb+

diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png
deleted file mode 100644
index 91bed07a422bb25e584df950ad25e2fcd2b1f134..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2388
zcmeH}YfMvT7{^a(p|w&$+zsuh+X9<Irp$3$OOGy?c?E|XprU0_G()6ZhEVBsGhW7G
zW564A)MYM^ARL4tAlL$%RH)@_>9lTKiqz7zg;sh>D{ap?D{hO~$7%M>PtW`Q-#1U5
z|L=L;<UP49^+OtUDHQ+!+Qtnj=>S0RF9`r8$RDzc>-Ph|f@K?1)_q)lae5^76kQb_
zIDUh$H;PJ6G}11wU7Yr9H9(9cy<%HT8S5?HBn}N;z>);)KgJ^xPn92ytw_QzUAw1k
zUDM^V&w44W&^4`$6{(pwES3n(9jgv1gZA9Ge#UCGj>;0a1&)cEl`{P~(_NwM9>PC{
zJFJ@`xJ`MXzY^rF^gm{1-d)}=`SF0)MpzlL4N$LZ%)p&yZR1&J-8M3cnBcAu2AduM
zV@O)2Oz1|cWbzBB&8UWWj(x*+(S8?Po6Ov&UImHVPIC+njq16%Y8_1Xy75P-TPEZQ
z24Zp7w9D(p&^sEKj&y-oH;M^(s9cGe>+xZ(lIv0W96Fgi$;ZQqUuM~M0Ht3gEIPq!
zf$Kzw<?5trKzN!F<&6|xoI3ZYsD(4(7fv$X^scw-&kZOZq${^LYo=6uH*l8xwm8qT
zcLy{1iloov@jG&_6!YTlwR<!c4r~u`-tUZzE6+fMMy2t%Db@37bm2p-D@Uyx1U)mI
z+l3?4YI!?(mm&lEMGAl8Xmdz~JXS$Syk3b8imd3eTBgzZp2%4mzj~gQKX)EdG_k4<
zJ+t%$b(_RE(;YD4;6(9qFH9NsC?mL@`|qzcuC8}W+xfeRSy4y6=O>RjkT!7<#PLg8
z9kC@V^5=3VbPu3vk=tf9Xxv<I;Gi6|&00HSlv{i?K7$$0q7DI=vbba6>ZYKQ{>qet
z(fy*|;g^H(VG$@ADGSNri393CQDz)91Nv^oH8MRD%Pr;1dUf$=vqNM!Zj#RJoYi62
zkwa>oMKP(%z<!&La!@3!is3Y1HIQ!JpGD!p>@ejTztMJ3c*w}mCX0;(>Ub6+9hOKL
z;MkGIAb4^xIY01jK}fArdw4t><dTPG>-;-M++4KD!($e@ya|W=8ge*C^H*J2=^EwK
ztg4}})RO=$EwPwXcd%>_a;Xg^ej*)CyFAmo8AA<hJPd4d`Fq=@{7Kq??w)UD#Y;Vp
z2AX!#CM6${1xasY4UsIJH){>nfcvqW24DG%UDnuFWl*q5Kls?*nSWGBc$l@M!>I>3
z6qXJimbB{e&zOZx@^<1o0c<S4fRMMW*|$>&F$tUdB`rpsE%@tpN}A_7ySe4nj!Fjj
zS|XQhoA_IvYhw}(F@4(=w&2@k6q^sDl?6>s_w446hGz{g%4QPFok{%A`Y3O?6$<KY
zvA|Wr?C?c(a;=JQ3QIKCN#`PbgO@o7qT;Ket)4hg?~!dDua<LBO=RI9%s^t4@#aju
z(!5t;)J35+a&U5&u-5sVJ)*|}1U9#YU7?+yi(~8jFgp(rZj<>~;jOEL;{2Z<?od<!
z>g0u&yx=7!-Z3_vlCEVFx>~yztP*u75?T0pftNIu>L!fOrRx0$S^-e5(6*=b*gj_f
zwRY$9l4j;8S!`nd|JT4<q_ESf@aVT-az$Vd(z}Q7kl&mMuozP>0{>ld<47e*MICz9
zJdX<yFvJ@QFFsQ}PmJiv%fsjgp4QisJoAjk+=LS(Rrpiz`FEbjtla|O_1>bOXGZ@V
l+0za1^C|n!Zyu*r1*fenK3{v?|62k!u1`&A`XJ|vKLMjNpuzwE

diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt
deleted file mode 100644
index 1a62e54..0000000
--- a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt
+++ /dev/null
@@ -1 +0,0 @@
-‹â”’ “º Ô • ŠD”’ ˆÃŠD ‰© ‰©‹à ‹âŠD
\ No newline at end of file
-- 
2.11.0