コミット: 2617d62773b12970c364c88dcd0bdf6bba33813e - chemicraft_hoshu (git)

炎上起こしたのでソースバックアップ用

コミットメタ情報

• リビジョン: 2617d62773b12970c364c88dcd0bdf6bba33813e (tree)
• 日時: 2013-03-05 09:41:56
• 作者: mozipi <mozipi@user...>
• コミッター: mozipi

ログメッセージ

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft into Change(Sys)

変更サマリ

• modified: common/pcc/chemicraft/ChemiCraft.java

差分

--- a/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@ -403,7 +403,7 @@ public class ChemiCraft implements Runnable {
 		api.addAtomOresLanguage("Chrysoberyl", "金緑石", "ja_JP");
 
 		// ホウ素
-		api.addAtomOres("Ulexite", new String[]{"Na", "Ca", "B", "O"}, new Integer[]{1, 1, 5, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50);   // NaCaB5O6(OH)6・5H2O
+		api.addAtomOres("Ulexite", new String[]{"Na", "Ca", "B", "O", "H"}, new Integer[]{1, 1, 5, 17, 16}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50);   // NaCaB5O6(OH)6・5H2O
 		api.addAtomOresLanguage("Ulexite", "ウレキサイト", "ja_JP");
 
 		// フッ素
@@ -417,13 +417,13 @@ public class ChemiCraft implements Runnable {
 		api.addAtomOresLanguage("RockSalt", "岩塩", "ja_JP");
 
 		// マグネシウム
-		api.addAtomOres("Dolomite", new String[]{"Ca", "Mg"}, new Integer[]{1, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaMg(CO3)2
+		api.addAtomOres("Dolomite", new String[]{"Ca", "Mg", "C", "O"}, new Integer[]{1, 1, 2, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaMg(CO3)2
 		api.addAtomOresLanguage("Dolomite", "苦灰石", "ja_JP");
 		api.addAtomOres("Magnesite", new String[]{"Mg", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // MgCO3
 		api.addAtomOresLanguage("Magnesite", "菱苦土石", "ja_JP");
 
 		// アルミニウム
-		api.addAtomOres("Gibbsite", new String[]{"Al"}, new Integer[]{3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al(OH)3
+		api.addAtomOres("Gibbsite", new String[]{"Al", "O", "H"}, new Integer[]{3, 3, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al(OH)3
 		api.addAtomOresLanguage("Gibbsite", "ギブス石", "ja_JP");
 		api.addAtomOres("Ruby", new String[]{"Al", "O"}, new Integer[]{2, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al2O3
 		api.addAtomOresLanguage("Ruby", "ルビー", "ja_JP");
@@ -435,11 +435,11 @@ public class ChemiCraft implements Runnable {
 		api.addAtomOresLanguage("Quartz", "石英", "ja_JP");
 
 		// リン
-		api.addAtomOres("Fluorapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3F
+		api.addAtomOres("Fluorapatite", new String[]{"Ca", "P", "O", "F"}, new Integer[]{5, 3, 12, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3F
 		api.addAtomOresLanguage("Fluorapatite", "フッ素リン灰石", "ja_JP");
-		api.addAtomOres("Chlorapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3Cl
+		api.addAtomOres("Chlorapatite", new String[]{"Ca", "P", "O", "Cl"}, new Integer[]{5, 3, 12, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3Cl
 		api.addAtomOresLanguage("Chlorapatite", "塩素燐灰石", "ja_JP");
-		api.addAtomOres("Hydroxylapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3(OH)
+		api.addAtomOres("Hydroxylapatite", new String[]{"Ca", "P", "O", "H"}, new Integer[]{5, 3, 13, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3(OH)
 		api.addAtomOresLanguage("Hydroxylapatite", "水酸燐灰石", "ja_JP");
 
 		// カリウム