Solve merge conflicts?

This commit is contained in:
Anton 2015-04-30 15:18:55 +03:00
parent 47e7cad9e9
commit 0bec104bf6

View file

@ -512,7 +512,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
{ {
if(AlchemicalWizardry.causeHungerChatMessage && !player.isPotionActive(Potion.hunger.id)) if(AlchemicalWizardry.causeHungerChatMessage && !player.isPotionActive(Potion.hunger.id))
{ {
player.addChatComponentMessage(new ChatComponentTranslation("message.altar.hunger")); player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("message.altar.hunger")));
} }
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2)); player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2));
} }