etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty

This commit is contained in:
Matt Caughey 2013-07-23 08:32:49 -04:00
parent a6c02fb445 4a28a8a254
commit 21098ff4e7
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/minecraft/assets/biomesoplenty/lang/en_US.xml
View File

@ -266,12 +266,8 @@
<entry key="tile.bop.leavesColorized.pine.name">Pine Leaves</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">Shroom Powder</entry>
<entry key="item.bop.sunflowerSeeds.name">Sunflower Seeds</entry>
<entry key="item.bop.food.berries.name">Berry</entry>
<entry key="item.bop.food.shroomPowder.name">Shroom Powder</entry>
<entry key="item.bop.food.shroompowder.name">Shroom Powder</entry>
<entry key="item.bop.food.wildcarrots.name">Wild Carrots</entry>
<entry key="item.bop.food.sunflowerseeds.name">Sunflower Seeds</entry>
<entry key="item.bop.food.saladfruit.name">Fruit Salad</entry>

1
src/minecraft/biomesoplenty/items/ItemBOPBucket.java
View File

@ -11,7 +11,6 @@ import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidContainerRegistry;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Fluids;
import cpw.mods.fml.relauncher.Side;

1
src/minecraft/biomesoplenty/items/ItemBOPFood.java
View File

@ -13,7 +13,6 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.ReflectionHelper;
public class ItemBOPFood extends ItemFood
{