Checkin before moving Apiary stuff to branch.

This commit is contained in:
MysteriousAges committed 2013-03-04 13:02:15 -08:00
1 parent 29069e7e9f
commit 85a2723ef8
6 files changed
+7 -6

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@
<property name="mc.version" value="1.4.7"/>
<property name="forge.version" value="6.6.0.507"/>
<property name="thaumicbees.version" value="1.4.1"/>
<property name="thaumicbees.version" value="1.4.2"/>
<!-- for local deployment only, not used by main -->
<property name="deploy.type" value="previews" />
@@ -4,6 +4,7 @@
<!-- Item names -->
<entry key="item.jellyBabies.name">Handful of Jelly Babies</entry>
<entry key="item.tb.thaumiumScoop.name">Thaumium Scoop</entry>
<entry key="item.tb.thaumiumGrafter.name">Thaumium Grafter</entry>
<!-- Block names -->
<entry key="tile.tb.planks.greatwood.name">Greatwood Planks</entry>
@@ -115,7 +115,7 @@ Like other capsules, they are fragile and are typically single-use. They have pr
<project id="THAUMIUMSCOOP">
<name>Thaumium Scoop</name>
<popupText>Stronger, Faster, Bee-tter</popupText>
<popupText>Stronger, Faster, Bee-ter</popupText>
<longText>It is possible to improve the durability of the scoop by creating them out of sterner materials. While you're at it, it may be helpful to enable them to be enchanted with restorative magics.</longText>
<page type="text">This improved scoop is more durable than the plain one your non-magical beekeeping friends are liable to use. It is good for three times as long as the average scoop at the cost of using some thaumium instead.
@@ -42,7 +42,7 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
@Override
public float getStrVsBlock(ItemStack itemStack, Block block, int metadata)
{
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4f : getStrVsBlock(itemStack, block);
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : getStrVsBlock(itemStack, block);
}
@Override
@@ -34,7 +34,7 @@ public class ItemThaumiumScoop extends Item implements IVisRepairable
@Override
public float getStrVsBlock(ItemStack itemStack, Block block, int metadata)
{
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4f : getStrVsBlock(itemStack, block);
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : getStrVsBlock(itemStack, block);
}
@Override
+2 -2
View File
@@ -163,8 +163,8 @@ public class Config
blockIdBase++; // Stair
magicApiary = new BlockMagicApiary(tbConfig.getBlock("magicApiary", blockIdBase++).getInt());
GameRegistry.registerBlock(magicApiary, "tb.magicApiary");
/*magicApiary = new BlockMagicApiary(tbConfig.getBlock("magicApiary", blockIdBase++).getInt());
GameRegistry.registerBlock(magicApiary, "tb.magicApiary");*/
}
public void registerTileEntities()