Merged in kieranmenor/magic-bees (pull request #1)

Conflicts:
	magicbees_src/magicbees/world/feature/FeatureHive.java
This commit is contained in:
MysteriousAges committed 2014-01-15 18:45:50 -08:00
commit 7082436190
3 files changed
+213 -202

No files matched your search

@@ -147,7 +147,12 @@ public class ThaumcraftHelper
public static void init()
{
//if (isActive()) { }
if (isActive())
{
aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { Aspect.VOID, Aspect.ORDER },
new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.TEXTURE + "aspects/tempus.png"), 1);
}
}
public static void postInit()
@@ -158,8 +163,6 @@ public class ThaumcraftHelper
getBlocks();
getItems();
aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { Aspect.VOID, Aspect.ORDER },
new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.TEXTURE + "aspects/tempus.png"), 1);
//addItemsToBackpack();
setupItemAspects();