Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty
This commit is contained in:
commit
21098ff4e7
3 changed files with 1 additions and 7 deletions
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue