From: ponkotate <ponkotate@users.sourceforge.jp>
Date: Sun, 7 Apr 2013 07:21:46 +0000 (+0900)
Subject: Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=91359869cc19297302b40ad13be82adab863ef8d

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

Conflicts:
	common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
	common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
---

91359869cc19297302b40ad13be82adab863ef8d
diff --cc common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 54b6613,8f918bd..02cd35c
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@@ -6,10 -6,11 +6,12 @@@ import net.minecraft.block.Block
  import net.minecraft.block.material.Material;
  import net.minecraft.client.renderer.texture.IconRegister;
  import net.minecraft.creativetab.CreativeTabs;
+ import net.minecraft.entity.player.EntityPlayer;
  import net.minecraft.item.ItemStack;
  import net.minecraft.util.Icon;
+ import net.minecraft.world.World;
  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;
diff --cc common/pcc/chemicraft/core/ChemiCraftCore.java
index 989e9d7,50c49c2..1c27401
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@@ -148,13 -148,7 +148,12 @@@ public class ChemiCraftCore extends Che
  	 */
  	public static final ChemiCraftLogging logger = new ChemiCraftLogging(System.getProperty("user.dir"));
  
 +	/**
 +	 * the Textures
 +	 */
 +	public static final String CCTABLE = ChemiCraft.TEXTURE + "ChemiCraftTable_";
 +
  	public ChemiCraftCore() {
- 		ChemiCraftAPI.getCompoundsName().entrySet();
  		this.api.getCompoundsName().createHash("en_US");
  		this.registerItem = new ChemiCraftRegisterItem(this);
  		this.registerBlock = new ChemiCraftRegisterBlock(this);