From 0bec104bf666c5362028f8e7669c7ecab86c0e2d Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 30 Apr 2015 15:18:55 +0300 Subject: [PATCH] Solve merge conflicts? --- .../WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java index 930bcf36..4b1fe190 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java @@ -512,7 +512,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I { 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)); }