From 764e6cae9bb7c20f3e96ade1f8de36637db5677e Mon Sep 17 00:00:00 2001
From: ponkotate <ponkotate@users.sourceforge.jp>
Date: Sun, 31 Mar 2013 09:22:10 +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=E3=83=90=E3=82=B0=E6=BD=B0=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 common/pcc/chemicraft/base/ChemiCraftBaseAPI.java           |  7 ++++++-
 .../chemicraft/base/ChemiCraftRegisterChemicalRecipe.java   | 13 ++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
index 0d1c47c..5d17a5b 100644
--- a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
@@ -62,7 +62,12 @@ public class ChemiCraftBaseAPI
 						par5Frequency,
 						par6PosY));
 		atomOresFormulasHash.put(par1Name, par2Formula);
-		addAtomOresLanguage(par1Name, par1Name, "en_US");
+
+		String var7 = par1Name;
+		if (!var7.contains(" Ore")){
+			var7 = var7.concat(" Ore");
+		}
+		addAtomOresLanguage(par1Name, var7, "en_US");
 	}
 
 
diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
index 6030c7b..9d895a9 100644
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
@@ -24,33 +24,32 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister
 		{
 			if (AtomInfo.isSolid(i + 1) && !AtomInfo.isLanthanoid(i + 1) && !AtomInfo.isActinoid(i + 1))
 			{
-				String var1 = ChemiCraftCore.ATOMSNAME[i] + " Ore";
 				this.mod.apiBase.addAtomOres(
-						var1,
+						ChemiCraftCore.ATOMSNAME[i],
 						new Formula(this.mod.chemicalData.ATOMSLIST[i]),
 						this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
 						EnumOreSpawnFrequency.NORMAL);
-				this.mod.apiBase.addAtomOresLanguage(var1, ChemiCraftCore.ATOMSNAMEJP[i] + "鉱石", "ja_JP");
+				this.mod.apiBase.addAtomOresLanguage(ChemiCraftCore.ATOMSNAME[i], ChemiCraftCore.ATOMSNAMEJP[i] + "鉱石", "ja_JP");
 			}
 		}
 
 		// ランタノイド鉱石
 		this.mod.apiBase.addAtomOres(
-				"Lanthanoid Ore",
+				"Lanthanoid",
 				new Formula("LaCePrNdPmSmEuGdTbDyHoErTmYbLu"),
 				this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
 				EnumOreSpawnFrequency.RARE);
 		// LaCePrNdPmSmEuGdTbDyHoErTmYbLu
-		this.mod.apiBase.addAtomOresLanguage("LanthanoidOre", "ランタノイド鉱石", "ja_JP");
+		this.mod.apiBase.addAtomOresLanguage("Lanthanoid", "ランタノイド鉱石", "ja_JP");
 
 		// アクチノイド鉱石
 		this.mod.apiBase.addAtomOres(
-				"Actinoid Ore",
+				"Actinoid",
 				new Formula("AcThPaUNpPuAmCmBkCfEsFmMdNoLr"),
 				this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
 				EnumOreSpawnFrequency.RARE);
 		// AcThPaUNpPuAmCmBkCfEsFmMdNoLr
-		this.mod.apiBase.addAtomOresLanguage("ActinoidOre", "アクチノイド鉱石", "ja_JP");
+		this.mod.apiBase.addAtomOresLanguage("Actinoid", "アクチノイド鉱石", "ja_JP");
 
 	}
 
-- 
2.11.0