OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / ChemiCraftBase.java
index d93ddc0..bce1fc9 100644 (file)
@@ -134,7 +134,6 @@ public class ChemiCraftBase extends ChemiCraft {
                while (true) {
                        if (proxy != null && instance != null) {
                                this.settingProcessing((FMLPostInitializationEvent) event);
-                               this.apiProcessing((FMLPostInitializationEvent) event);
                                break;
                        }
                }
@@ -209,7 +208,7 @@ public class ChemiCraftBase extends ChemiCraft {
                                                EnumLoggingType.INFO);
 
                                LanguageRegistry.instance().addNameForObject(
-                                               new ItemStack(this.blockAtomOres[i / 16], 1, i - i / 16 * 16),
+                                               new ItemStack(this.atomOresID[i / 16], 1, i % 16),
                                                lang,
                                                names.get(i));
                        }