update

(cherry picked from commit 1ed646b147)

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.54-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }
 
 

src/main/java/forestry/Forestry.java

@@ -15,6 +15,7 @@ import net.minecraft.item.Item;
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.ModAPIManager;
@@ -79,11 +80,15 @@ public class Forestry {
 
     public static PacketHandler packetHandler;
 
+    public static boolean isDreamcraftLoaded;
+
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         checkForCoFHLib();
         packetHandler = new PacketHandler();
 
+        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
+
         // Register event handler
         EventHandlerCore eventHandlerCore = new EventHandlerCore();
         MinecraftForge.EVENT_BUS.register(eventHandlerCore);

src/main/java/forestry/api/genetics/IIndividual.java

@@ -52,4 +52,8 @@ public interface IIndividual extends INBTTagable {
     IIndividual copy();
 
     boolean isPureBred(IChromosomeType chromosomeType);
+
+    default void addLore(List<String> text) {}
+
+    default void addDiscoveredBy(List<String> text) {}
 }

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -18,6 +18,8 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -65,7 +67,6 @@ import forestry.core.errors.EnumErrorCode;
 import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.GenericRatings;
 import forestry.core.genetics.IndividualLiving;
-import forestry.core.proxy.Proxies;
 import forestry.core.utils.GeneticsUtil;
 import forestry.core.utils.Log;
 import forestry.core.utils.StringUtil;
@@ -377,6 +378,36 @@ public class Bee extends IndividualLiving implements IBee {
         return suitableBiomes;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleBeeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleBeeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
 
@@ -457,21 +488,6 @@ public class Bee extends IndividualLiving implements IBee {
         if (genome.getTolerantFlyer()) {
             list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip"));
         }
-
-        // Add lore and discovered by
-        String descTokens[] = primary.getDescription().split("\\|");
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && Proxies.common.isCtrlDown()) {
-                list.addAll(StringUtil.multilineStrings(speciesLore, 50));
-            }
-        }
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                list.add("Discovered by " + discoveredBy);
-            }
-        }
     }
 
     @Override

src/main/java/forestry/apiculture/genetics/BeeDefinition.java

@@ -331,7 +331,7 @@ public enum BeeDefinition implements IBeeDefinition {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
-                    .addProduct(PluginCore.items.ash.getItemStack(), 0.15f).setTemperature(EnumTemperature.HELLISH)
+                    .addProduct(PluginCore.items.getAsh(), 0.15f).setTemperature(EnumTemperature.HELLISH)
                     .setHumidity(EnumHumidity.ARID);
         }
 

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java

@@ -13,6 +13,7 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
@@ -107,11 +108,8 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
             }
 
             // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
-            if (!world.canMineBlock(
-                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
-                    posHousing.x,
-                    posHousing.y,
-                    posHousing.z)) {
+            EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
+            if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
                 continue;
             }
 

src/main/java/forestry/arboriculture/genetics/Tree.java

@@ -16,6 +16,8 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
@@ -298,6 +300,36 @@ public class Tree extends Individual implements ITree, IPlantable {
         return plantTypes;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleTreeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleTreeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
 

src/main/java/forestry/core/blocks/BlockResourceOre.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.core.blocks;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,7 +54,7 @@ public class BlockResourceOre extends Block {
     public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float par6, int par7) {
         super.dropBlockAsItemWithChance(world, x, y, z, metadata, par6, par7);
 
-        if (metadata == 0) {
+        if (metadata == 0 && !isDreamcraftLoaded) {
             this.dropXpOnBlockBreak(world, x, y, z, MathHelper.getRandomIntegerInRange(world.rand, 1, 4));
         }
     }
@@ -61,7 +63,7 @@ public class BlockResourceOre extends Block {
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
         ArrayList<ItemStack> drops = new ArrayList<>();
 
-        if (metadata == ResourceType.APATITE.ordinal()) {
+        if (metadata == ResourceType.APATITE.ordinal() && !isDreamcraftLoaded) {
             int fortuneModifier = world.rand.nextInt(fortune + 2) - 1;
             if (fortuneModifier < 0) {
                 fortuneModifier = 0;

src/main/java/forestry/core/genetics/ItemGE.java

@@ -72,6 +72,12 @@ public abstract class ItemGE extends ItemForestry {
         if (individual.isAnalyzed()) {
             if (Proxies.common.isShiftDown()) {
                 individual.addTooltip(list);
+                individual.addDiscoveredBy(list);
+                if (Proxies.common.isCtrlDown()) {
+                    individual.addLore(list);
+                } else {
+                    list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tml") + ">");
+                }
             } else {
                 list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">");
             }

src/main/java/forestry/core/gui/ContainerItemInventory.java

@@ -53,4 +53,13 @@ public abstract class ContainerItemInventory<I extends ItemInventory> extends Co
         inventory.onSlotClick(player);
         return result;
     }
+
+    @Override
+    public void detectAndSendChanges() {
+        if (!inventory.isParentItemEquipped()) {
+            inventory.getPlayer().closeScreen();
+            return;
+        }
+        super.detectAndSendChanges();
+    }
 }

src/main/java/forestry/core/inventory/ItemInventory.java

@@ -78,6 +78,14 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
         }
     }
 
+    public boolean isParentItemEquipped() {
+        return isSameItemInventory(player.getCurrentEquippedItem(), parent);
+    }
+
+    public EntityPlayer getPlayer() {
+        return player;
+    }
+
     public boolean isParentItemInventory(ItemStack itemStack) {
         ItemStack parent = getParent();
         return isSameItemInventory(parent, itemStack);

src/main/java/forestry/core/items/ItemRegistryCore.java

@@ -8,6 +8,10 @@
  ******************************************************************************/
 package forestry.core.items;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -63,7 +67,7 @@ public class ItemRegistryCore extends ItemRegistry {
 
     /* Peat */
     public final ItemForestry peat;
-    public final ItemForestry ash;
+    private final ItemForestry ash;
     public final ItemForestry bituminousPeat;
 
     /* Moistener */
@@ -87,19 +91,26 @@ public class ItemRegistryCore extends ItemRegistry {
         fertilizerBio = registerItem(new ItemForestry(), "fertilizerBio");
         fertilizerCompound = registerItem(new ItemForestryBonemeal(), "fertilizerCompound");
 
-        apatite = registerItem(new ItemForestry(), "apatite");
-        OreDictionary.registerOre("gemApatite", apatite);
-
         researchNote = registerItem(new ItemResearchNote(), "researchNote");
 
-        ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
-        OreDictionary.registerOre("ingotCopper", ingotCopper);
+        if (!isDreamcraftLoaded) {
+            apatite = registerItem(new ItemForestry(), "apatite");
+            OreDictionary.registerOre("gemApatite", apatite);
 
-        ingotTin = registerItem(new ItemForestry(), "ingotTin");
-        OreDictionary.registerOre("ingotTin", ingotTin);
+            ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
+            OreDictionary.registerOre("ingotCopper", ingotCopper);
 
-        ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
-        OreDictionary.registerOre("ingotBronze", ingotBronze);
+            ingotTin = registerItem(new ItemForestry(), "ingotTin");
+            OreDictionary.registerOre("ingotTin", ingotTin);
+
+            ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
+            OreDictionary.registerOre("ingotBronze", ingotBronze);
+        } else {
+            apatite = null;
+            ingotCopper = null;
+            ingotTin = null;
+            ingotBronze = null;
+        }
 
         wrench = registerItem(new ItemWrench(), "wrench");
         pipette = registerItem(new ItemPipette(), "pipette");
@@ -187,4 +198,12 @@ public class ItemRegistryCore extends ItemRegistry {
             OreDictionary.registerOre(def.getOreDict(), fruit);
         }
     }
+
+    public ItemStack getAsh() {
+        List<ItemStack> options = OreDictionary.getOres("dustAsh");
+        for (ItemStack option : options) {
+            if (option.getItem() != ash) return option.copy();
+        }
+        return ash.getItemStack();
+    }
 }

src/main/java/forestry/core/tiles/EscritoireTextSource.java

@@ -37,7 +37,8 @@ public class EscritoireTextSource {
         EnumSet<Notes> multipleTranslationNoteLevels = EnumSet
                 .of(Notes.level1, Notes.level2, Notes.level3, Notes.level4, Notes.success, Notes.failure);
         for (Notes notesLevel : multipleTranslationNoteLevels) {
-            int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
+            int levelCount = Integer.valueOf(
+                    StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count").replaceAll("§\\d", ""));
             for (int i = 1; i <= levelCount; i++) {
                 String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
                 researchNotes.put(notesLevel, note);

src/main/java/forestry/core/utils/StringUtil.java

@@ -8,9 +8,7 @@
  ******************************************************************************/
 package forestry.core.utils;
 
-import java.util.ArrayList;
 import java.util.IllegalFormatException;
-import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -118,26 +116,4 @@ public class StringUtil {
 
         return lineCount * fontRenderer.FONT_HEIGHT;
     }
-
-    public static List<String> multilineStrings(String input, int n) {
-        List<String> result = new ArrayList<>();
-
-        int start = 0;
-        while (start < input.length()) {
-            // Find the end index by starting with n characters ahead
-            int end = Math.min(start + n, input.length());
-
-            // If end is not at the end of the string, backtrack to the last space
-            if (end < input.length() && !Character.isWhitespace(input.charAt(end))) {
-                int lastSpace = input.lastIndexOf(' ', end);
-                if (lastSpace > start) {
-                    end = lastSpace;
-                }
-            }
-
-            result.add(input.substring(start, end).trim());
-            start = end;
-        }
-        return result;
-    }
 }

src/main/java/forestry/energy/tiles/TileEnginePeat.java

@@ -78,7 +78,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
                 return i;
             }
 
-            if (waste.getItem() != PluginCore.items.ash) {
+            if (waste.getItem() != PluginCore.items.getAsh().getItem()) {
                 continue;
             }
 
@@ -182,7 +182,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
         if (wasteSlot >= 0) {
             IInventoryAdapter inventory = getInternalInventory();
             if (inventory.getStackInSlot(wasteSlot) == null) {
-                inventory.setInventorySlotContents(wasteSlot, PluginCore.items.ash.getItemStack());
+                inventory.setInventorySlotContents(wasteSlot, PluginCore.items.getAsh());
             } else {
                 inventory.getStackInSlot(wasteSlot).stackSize++;
             }

src/main/java/forestry/lepidopterology/genetics/Butterfly.java

@@ -14,6 +14,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -60,6 +62,36 @@ public class Butterfly extends IndividualLiving implements IButterfly {
         this.genome = genome;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleButterflySpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleButterflySpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
         IAlleleButterflySpecies primary = genome.getPrimary();

src/main/java/forestry/plugins/PluginCore.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.plugins;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
 import java.util.ArrayList;
 
 import net.minecraft.command.ICommand;
@@ -132,14 +134,16 @@ public class PluginCore extends ForestryPlugin {
 
         // forestry items
         crateRegistry.registerCrate(items.peat, "cratedPeat");
-        crateRegistry.registerCrate(items.apatite, "cratedApatite");
         crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer");
         crateRegistry.registerCrate(items.mulch, "cratedMulch");
         crateRegistry.registerCrate(items.phosphor, "cratedPhosphor");
-        crateRegistry.registerCrate(items.ash, "cratedAsh");
-        crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
-        crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
-        crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
+        crateRegistry.registerCrateUsingOreDict(items.getAsh(), "cratedAsh");
+        if (!isDreamcraftLoaded) {
+            crateRegistry.registerCrate(items.apatite, "cratedApatite");
+            crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
+            crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
+            crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
+        }
 
         // forestry blocks
         crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.HUMUS, 1), "cratedHumus");
@@ -195,10 +199,15 @@ public class PluginCore extends ForestryPlugin {
     protected void registerRecipes() {
 
         /* SMELTING RECIPES */
-        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
-        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1), items.ingotCopper, 0.5f);
-        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
-        RecipeUtil.addSmelting(new ItemStack(items.peat), items.ash, 0.0f);
+        if (!isDreamcraftLoaded) {
+            RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
+            RecipeUtil.addSmelting(
+                    blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1),
+                    items.ingotCopper,
+                    0.5f);
+            RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
+        }
+        RecipeUtil.addSmelting(new ItemStack(items.peat), items.getAsh(), 0.0f);
 
         /* BRONZE INGOTS */
         if (Config.isCraftingBronzeEnabled()) {
@@ -382,41 +391,43 @@ public class PluginCore extends ForestryPlugin {
                 new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE));
 
         // Storage Blocks
-        RecipeUtil.addRecipe(
-                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
-                "###",
-                "###",
-                "###",
-                '#',
-                "gemApatite");
-        RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
+        if (!isDreamcraftLoaded) {
+            RecipeUtil.addRecipe(
+                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
+                    "###",
+                    "###",
+                    "###",
+                    '#',
+                    "gemApatite");
+            RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
 
-        RecipeUtil.addRecipe(
-                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
-                "###",
-                "###",
-                "###",
-                '#',
-                "ingotCopper");
-        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
+            RecipeUtil.addRecipe(
+                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
+                    "###",
+                    "###",
+                    "###",
+                    '#',
+                    "ingotCopper");
+            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
 
-        RecipeUtil.addRecipe(
-                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
-                "###",
-                "###",
-                "###",
-                '#',
-                "ingotTin");
-        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
+            RecipeUtil.addRecipe(
+                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
+                    "###",
+                    "###",
+                    "###",
+                    '#',
+                    "ingotTin");
+            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
 
-        RecipeUtil.addRecipe(
-                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
-                "###",
-                "###",
-                "###",
-                '#',
-                "ingotBronze");
-        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
+            RecipeUtil.addRecipe(
+                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
+                    "###",
+                    "###",
+                    "###",
+                    '#',
+                    "ingotBronze");
+            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
+        }
     }
 
     @Override

src/main/java/forestry/plugins/PluginFactory.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.plugins;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -644,18 +646,20 @@ public class PluginFactory extends ForestryPlugin {
                 new Object[] { " # ", " X ", " X ", '#', "ingotBronze", 'X', "stickWood" });
 
         // Reclamation
-        RecipeManagers.carpenterManager.addRecipe(
-                null,
-                PluginCore.items.ingotBronze.getItemStack(2),
-                "#",
-                '#',
-                PluginCore.items.brokenBronzePickaxe);
-        RecipeManagers.carpenterManager.addRecipe(
-                null,
-                PluginCore.items.ingotBronze.getItemStack(),
-                "#",
-                '#',
-                PluginCore.items.brokenBronzeShovel);
+        if (!isDreamcraftLoaded) {
+            RecipeManagers.carpenterManager.addRecipe(
+                    null,
+                    PluginCore.items.ingotBronze.getItemStack(2),
+                    "#",
+                    '#',
+                    PluginCore.items.brokenBronzePickaxe);
+            RecipeManagers.carpenterManager.addRecipe(
+                    null,
+                    PluginCore.items.ingotBronze.getItemStack(),
+                    "#",
+                    '#',
+                    PluginCore.items.brokenBronzeShovel);
+        }
 
         // Crating and uncrating
         if (PluginManager.Module.STORAGE.isEnabled()) {

src/main/java/forestry/plugins/PluginFluids.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.plugins;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -130,11 +132,13 @@ public class PluginFluids extends ForestryPlugin {
         }
 
         if (RecipeManagers.squeezerManager != null) {
-            RecipeManagers.squeezerManager.addContainerRecipe(
-                    10,
-                    items.canEmpty.getItemStack(),
-                    PluginCore.items.ingotTin.getItemStack(),
-                    0.05f);
+            if (!isDreamcraftLoaded) {
+                RecipeManagers.squeezerManager.addContainerRecipe(
+                        10,
+                        items.canEmpty.getItemStack(),
+                        PluginCore.items.ingotTin.getItemStack(),
+                        0.05f);
+            }
             RecipeManagers.squeezerManager.addContainerRecipe(
                     10,
                     items.waxCapsuleEmpty.getItemStack(),

src/main/java/forestry/plugins/PluginStorage.java

@@ -449,10 +449,15 @@ public class PluginStorage extends ForestryPlugin {
                     String oreName = OreDictionary.getOreName(oreId);
                     addCrating(crateStack, oreName);
                 }
+                if (oreIds.length > 0 && oreIds[0] == OreDictionary.getOreID("dustAsh")) {
+                    addUncrating(crateStack, PluginCore.items.getAsh());
+                } else {
+                    addUncrating(crateStack, uncrated);
+                }
             } else {
                 addCrating(crateStack, uncrated);
+                addUncrating(crateStack, uncrated);
             }
-            addUncrating(crateStack, uncrated);
         }
     }
 

src/main/resources/assets/forestry/lang/de_DE.lang

@@ -335,6 +335,7 @@ for.gui.temperature=Temperatur
 for.gui.tolerance=Toleranz
 for.gui.temptol=Temp.Tol
 for.gui.tooltip.tmi=Drücke die Umschalttaste für mehr Infos.
+for.gui.tooltip.tml=Drücke die Steuerungstaste für mehr Geschichte.
 for.gui.triple=Dreifache
 for.gui.unknown=Unbekannt
 for.gui.warm=Warm

src/main/resources/assets/forestry/lang/en_US.lang

@@ -341,6 +341,7 @@ for.gui.temperature=Temperature
 for.gui.tolerance=Tolerance
 for.gui.temptol=Temperature Tol.
 for.gui.tooltip.tmi=Hold shift for details
+for.gui.tooltip.tml=Hold ctrl for lore
 for.gui.triple=Triple
 for.gui.unknown=Unknown genome
 for.gui.warm=Warm
@@ -422,6 +423,122 @@ for.hints.usesofash.tag=Use your ash!
 
 for.item.crated.grammar=Crated %s
 for.item.crated.unknown=Crate with unknown content
+item.cratedAcaciaSapling.name=Crated Acacia Sapling
+item.cratedAcaciaWood.name=Crated Acacia Wood
+item.cratedApples.name=Crated Apple
+item.cratedAsh.name=Crated Ash
+item.cratedBeeswax.name=Crated Beeswax
+item.cratedBirchSapling.name=Crated Birch Sapling
+item.cratedBirchWood.name=Crated Birch Wood
+item.cratedBogearth.name=Crated Bog Earth
+item.cratedBrass.name=Crated Bronze Ingot
+item.cratedBrick.name=Crated Bricks
+item.cratedCacti.name=Crated Cactus
+item.cratedCarrots.name=Crated Carrot
+item.cratedCharcoal.name=Crated Charcoal
+item.cratedCherry.name=Crated Cherry
+item.cratedChestnut.name=Crated Chestnut
+item.cratedClay.name=Crated Clay
+item.cratedCoal.name=Crated Coal
+item.cratedCobblestone.name=Crated Cobblestone
+item.cratedCocoaComb.name=Crated Cocoa Comb
+item.cratedCookies.name=Crated Cookie
+item.cratedCrystallinePollen.name=Crated Crystalline Pollen Cluster
+item.cratedDarkOakSapling.name=Crated Dark Oak Sapling
+item.cratedDarkOakWood.name=Crated Dark Oak Wood
+item.cratedDates.name=Crated Date
+item.cratedDirt.name=Crated Dirt
+item.cratedDrippingCombs.name=Crated Dripping Comb
+item.cratedFertilizer.name=Crated Fertilizer
+item.cratedFrozenCombs.name=Crated Frozen Comb
+item.cratedGlowstone.name=Crated Glowstone Dust
+item.cratedGravel.name=Crated Gravel
+item.cratedHoneycombs.name=Crated Honey Comb
+item.cratedHoneydew.name=Crated Honeydew
+item.cratedHumus.name=Crated Humus
+item.cratedJungleSapling.name=Crated Jungle Sapling
+item.cratedJungleWood.name=Crated Jungle Wood
+item.cratedLapis.name=Crated Lapis Lazuli
+item.cratedLemon.name=Crated Lemon
+item.cratedMellowCombs.name=Crated Mellow Comb
+item.cratedMossyCombs.name=Crated Mossy Comb
+item.cratedMulch.name=Crated Mulch
+item.cratedMycelium.name=Crated Mycelium
+item.cratedMysteriousCombs.name=Crated Mysterious Comb
+item.cratedNaturaBarley.name=Crated Barley
+item.cratedNaturaBerryBlack.name=Crated Blackberry
+item.cratedNaturaBerryBlight.name=Crated Blightberry
+item.cratedNaturaBerryBlue.name=Crated Blueberry
+item.cratedNaturaBerryDusk.name=Crated Duskberry
+item.cratedNaturaBerryMalo.name=Crated Maloberry
+item.cratedNaturaBerryRasp.name=Crated Raspberry
+item.cratedNaturaBerrySky.name=Crated Skyberry
+item.cratedNaturaBerrySting.name=Crated Stingberry
+item.cratedNaturaBlockHeatsand.name=Crated Heat Sand
+item.cratedNaturaBlockTainted.name=Crated Tainted Soil
+item.cratedNaturaBlueGlowshroom.name=Crated Blue Glowshroom
+item.cratedNaturaGreenGlowshroom.name=Crated Green Glowshroom
+item.cratedNaturaLogBloodwood.name=Crated Bloodwood
+item.cratedNaturaLogDarkwood.name=Crated Darkwood
+item.cratedNaturaLogEucalyptus.name=Crated Eucalyptus Wood
+item.cratedNaturaLogFusewood.name=Crated Fusewood
+item.cratedNaturaLogGhostwood.name=Crated Ghostwood
+item.cratedNaturaLogHopseed.name=Crated Hopseed Wood
+item.cratedNaturaLogSakura.name=Crated Sakura Wood
+item.cratedNaturaLogWillow.name=Crated Willow Wood
+item.cratedNaturaPotashApple.name=Crated Potash Apple
+item.cratedNaturaPurpleGlowshroom.name=Crated Purple Glowshroom
+item.cratedNaturaSaplingBlood.name=Crated Blood Sapling
+item.cratedNaturaSaplingDarkwood.name=Crated Darkwood Sapling
+item.cratedNaturaSaplingEucalyptus.name=Crated Eucalyptus Sapling
+item.cratedNaturaSaplingFusewood.name=Crated Fusewood Sapling
+item.cratedNaturaSaplingGhostwood.name=Crated Ghostwood Sapling
+item.cratedNaturaSaplingHopseed.name=Crated Hopseed Sapling
+item.cratedNaturaSaplingMaple.name=Crated Maple Sapling
+item.cratedNaturaSaplingPurpleheart.name=Crated Amaranth Sapling
+item.cratedNaturaSaplingRedwood.name=Crated Redwood Sapling
+item.cratedNaturaSaplingSakura.name=Crated Sakura Sapling
+item.cratedNaturaSaplingSilverbell.name=Crated Silverbell Sapling
+item.cratedNaturaSaplingTiger.name=Crated Tigerwood Sapling
+item.cratedNaturaSaplingWillow.name=Crated Willow Sapling
+item.cratedNetherbrick.name=Crated Nether Brick
+item.cratedNetherrack.name=Crated Netherrack
+item.cratedNetherwart.name=Crated Nether Wart
+item.cratedObsidian.name=Crated Obsidian
+item.cratedPapaya.name=Crated Papaya
+item.cratedParchedCombs.name=Crated Parched Comb
+item.cratedPeat.name=Crated Peat
+item.cratedPhosphor.name=Crated Phosphor
+item.cratedPlum.name=Crated Plum
+item.cratedPodzol.name=Crated Podzol
+item.cratedPollen.name=Crated Pollen Cluster
+item.cratedPotatoes.name=Crated Potato
+item.cratedPowderyCombs.name=Crated Powdery Comb
+item.cratedPropolis.name=Crated Propolis
+item.cratedRedSand.name=Crated Red Sand
+item.cratedRedstone.name=Crated Redstone
+item.cratedReeds.name=Crated Sugar Canes
+item.cratedRefractoryWax.name=Crated Refractory Wax
+item.cratedResin.name=Crated Sticky Resin
+item.cratedRoyalJelly.name=Crated Royal Jelly
+item.cratedRubber.name=Crated Rubber
+item.cratedSand.name=Crated Sand
+item.cratedSandstone.name=Crated Sandstone
+item.cratedSaplings.name=Crated Oak Sapling
+item.cratedScrap.name=Crated Scrap
+item.cratedSeeds.name=Crated Seeds
+item.cratedSilkyCombs.name=Crated Silky Comb
+item.cratedSilver.name=Crated Silver Ingot
+item.cratedSimmeringCombs.name=Crated Simmering Comb
+item.cratedSoulsand.name=Crated Soul Sand
+item.cratedSpruceSapling.name=Crated Spruce Sapling
+item.cratedSpruceWood.name=Crated Spruce Wood
+item.cratedStone.name=Crated Stone
+item.cratedStringyCombs.name=Crated Stringy Comb
+item.cratedWalnut.name=Crated Walnut
+item.cratedWheat.name=Crated Wheat
+item.cratedWheatenCombs.name=Crated Wheaten Comb
+item.cratedWood.name=Crated Oak Wood
 
 for.no=No
 
@@ -492,6 +609,7 @@ item.for.habitatLocator.name=Habitat Locator
 item.for.cart.beehouse.name=Minecart with Bee House
 item.for.cart.apiary.name=Minecart with Apiary
 
+item.for.beeCombs.name=Comb
 item.for.beeCombs.cocoa.name=Cocoa Comb
 item.for.beeCombs.darkened.name=Darkened Comb
 item.for.beeCombs.dripping.name=Dripping Comb
@@ -512,6 +630,7 @@ item.for.beeCombs.wheaten.name=Wheaten Comb
 
 item.for.beeswax.name=Beeswax
 
+item.for.beverage.name=Mead
 item.for.beverage.meadCurative.name=Curative Mead
 item.for.beverage.meadShort.name=Short Mead
 item.for.beverage.mead.name=Mead
@@ -549,11 +668,13 @@ item.for.canSeedOil.name=Seed Oil Can
 item.for.canShortMead.name=Short Mead Can
 item.for.carton.name=Carton
 
+item.for.chipsets.name=Circuit Board
 item.for.circuitboard.basic.name=Basic Circuit Board
 item.for.circuitboard.enhanced.name=Enhanced Circuit Board
 item.for.circuitboard.intricate.name=Intricate Circuit Board
 item.for.circuitboard.refined.name=Refined Circuit Board
 
+item.for.craftingMaterial.name=Crafting Material
 item.for.craftingMaterial.dissipationCharge.name=Dissipation Charge
 item.for.craftingMaterial.iceShard.name=Ice Shard
 item.for.craftingMaterial.pulsatingDust.name=Pulsating Dust
@@ -584,6 +705,7 @@ for.frame.tooltip.production=Production:
 for.frame.tooltip.flowering=Flowering:
 for.frame.tooltip.geneticDecay=Genetic Decay:
 
+item.for.fruits.name=Fruit
 item.for.fruits.cherry.name=Cherry
 item.for.fruits.chestnut.name=Chestnut
 item.for.fruits.dates.name=Date
@@ -600,6 +722,7 @@ item.for.hardenedMachine.name=Hardened Casing
 
 item.for.honeydew.name=Honeydew
 
+item.for.honeyDrop.name=Drop
 item.for.honeyDrop.charged.name=Charged Drop
 item.for.honeyDrop.honey.name=Honey Drop
 item.for.honeyDrop.omega.name=Omega Drop
@@ -633,9 +756,12 @@ item.for.peat.name=Peat
 item.for.phosphor.name=Phosphor
 item.for.pipette.name=Pipette
 
+item.for.pollenFertile.name=Fertile Pollen
+item.for.pollen.name=Pollen Cluster
 item.for.pollen.crystalline.name=Crystalline Pollen Cluster
 item.for.pollen.normal.name=Pollen Cluster
 
+item.for.propolis.name=Propolis
 item.for.propolis.normal.name=Propolis
 item.for.propolis.pulsating.name=Pulsating Propolis
 item.for.propolis.silky.name=Silky Propolis
@@ -673,6 +799,7 @@ item.for.stamps.name=Stamp
 item.for.sturdyMachine.name=Sturdy Casing
 item.for.tent.name=Survivalist's Tent
 
+item.for.thermionicTubes.name=Electron Tube
 item.for.thermionicTubes.ex-0.name=Copper Electron Tube
 item.for.thermionicTubes.ex-1.name=Tin Electron Tube
 item.for.thermionicTubes.ex-2.name=Bronze Electron Tube
@@ -714,15 +841,18 @@ itemGroup.arboriculture=Arboriculture
 itemGroup.forestry=Forestry
 itemGroup.lepidopterology=Lepidopterology
 
+tile.for.core.name=Analyzer / Escritoire
 tile.for.core.0.name=Analyzer
 tile.for.core.1.name=Escritoire
 
+tile.for.engine.name=Engine
 tile.for.engine.0.name=Electrical Engine
 tile.for.engine.1.name=Peat-fired Engine
 tile.for.engine.2.name=Biogas Engine
 tile.for.engine.3.name=Bio Generator
 tile.for.engine.4.name=Clockwork Engine
 
+tile.for.factory.name=Machine
 tile.for.factory.0.name=Bottler
 tile.for.factory.1.name=Carpenter
 tile.for.factory.2.name=Centrifuge
@@ -731,23 +861,28 @@ tile.for.factory.4.name=Moistener
 tile.for.factory.5.name=Squeezer
 tile.for.factory.6.name=Still
 tile.for.factory.7.name=Rainmaker
+tile.for.factory2.name=Machine
 tile.for.factory2.0.name=Thermionic Fabricator
 tile.for.factory2.1.name=Raintank
 tile.for.factory2.2.name=Worktable
 
+tile.for.mail.name=Mailbox
 tile.for.mail.0.name=Mailbox
 tile.for.mail.1.name=Trade Station
 tile.for.mail.2.name=Stamp Collector
 
+tile.for.resources.name=Ore
 tile.for.resources.0.name=Apatite Ore
 tile.for.resources.1.name=Copper Ore
 tile.for.resources.2.name=Tin Ore
 
+tile.for.resourceStorage.name=Block
 tile.for.resourceStorage.0.name=Block of Apatite
 tile.for.resourceStorage.1.name=Block of Copper
 tile.for.resourceStorage.2.name=Block of Tin
 tile.for.resourceStorage.3.name=Block of Bronze
 
+tile.for.soil.name=Soil
 tile.for.soil.0.name=Humus
 tile.for.soil.1.name=Bog Earth
 tile.for.soil.2.name=Peat
@@ -914,6 +1049,8 @@ for.errors.wrongStacksize.help=Only single items can be used here.
 # APICULTURE
 ####################
 
+item.for.beeLarvaeGE.name=Larvae
+
 entity.Villager.apiarist=Apiarist
 
 death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit.
@@ -1128,6 +1265,7 @@ item.for.beePrincessGE.name=Princess
 item.for.beeQueenGE.name=Queen
 item.for.beeDroneGE.name=Drone
 
+tile.for.alveary.name=Alveary Part
 tile.for.alveary.0.name=Alveary
 tile.for.alveary.1.name=Alveary Entrance
 tile.for.alveary.2.name=Swarmer
@@ -1137,10 +1275,13 @@ tile.for.alveary.5.name=Alveary Hygroregulator
 tile.for.alveary.6.name=Alveary Stabiliser
 tile.for.alveary.7.name=Alveary Sieve
 
+tile.for.apiculture.name=Apiary
 tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
 tile.for.apicultureChest.0.name=Apiarist's Chest
 tile.for.apiculture.2.name=Bee House
 
+tile.for.beehives.name=Hive
 tile.for.beehives.1.name=Forest Hive
 tile.for.beehives.2.name=Meadows Hive
 tile.for.beehives.3.name=Modest Hive
@@ -1150,11 +1291,13 @@ tile.for.beehives.6.name=Wintry Hive
 tile.for.beehives.7.name=Marshy Hive
 tile.for.beehives.8.name=Swarm Hive
 
+tile.for.candle.name=Candle
 tile.for.candle.dyed.lit.name=Lit Dyed Candle
 tile.for.candle.dyed.stump.name=Unlit Dyed Candle
 tile.for.candle.lit.name=Lit Candle
 tile.for.candle.stump.name=Unlit Candle
 
+tile.for.stump.name=Candle Stump
 tile.for.stump.0.name=Candle Stump
 
 ####################
@@ -1269,8 +1412,10 @@ for.trees.grammar.germling.type=Germling
 for.trees.grammar.germling=%SPECIES %TYPE
 for.trees.grammar.pollen.type=Pollen
 for.trees.grammar.pollen=%SPECIES %TYPE
+tile.for.saplingGE.name=Sapling
 for.trees.grammar.sapling.type=Sapling
 for.trees.grammar.sapling=%SPECIES %TYPE
+tile.for.leaves.name=Leaves
 for.trees.grammar.leaves.type=Leaves
 for.trees.grammar.leaves=%SPECIES %TYPE
 
@@ -1312,10 +1457,21 @@ for.trees.species.padauk=Padauk
 for.trees.species.cocobolo=Cocobolo
 for.trees.species.zebrawood=Zebrawood
 
+tile.for.fences.name=Fence
 for.fences.grammar=%TYPE Fence
+tile.for.logs.name=Wood
+tile.for.logsFireproof.name=Wood (Fireproof)
 for.log.grammar=%TYPE Wood
+tile.for.planks.name=Wood Planks
+tile.for.planksFireproof.name=Wood Planks (Fireproof)
 for.planks.grammar=%TYPE Wood Planks
+tile.for.slabs.name=Wood Slab
+tile.for.slabsFireproof.name=Wood Slab (Fireproof)
+tile.for.slabsDouble.name=Wood Slab
+tile.for.slabsDoubleFireproof.name=Wood Slab (Fireproof)
 for.slab.grammar=%TYPE Wood Slab
+tile.for.stairs.name=Stairs
+tile.for.stairsFireproof.name=Stairs (Fireproof)
 for.stairs.grammar=%TYPE Stairs
 
 for.trees.woodType.larch=Larch
@@ -1348,15 +1504,19 @@ for.trees.woodType.padauk=Padauk
 for.trees.woodType.cocobolo=Cocobolo
 for.trees.woodType.zebrawood=Zebrawood
 
+tile.for.fencesFireproof.name=Fence (Fireproof)
 tile.for.fireproof=%s (Fireproof)
 
 item.for.grafter.name=Grafter
 item.for.grafterProven.name=Proven Grafter
 
+tile.for.arboriculture.name=Arborist's Chest
 tile.for.arboriculture.0.name=Arborist's Chest
 
+item.for.sapling.name=Sapling
 tile.for.saplingGE.0.name=Sapling
 tile.for.leaves.0.name=Leaves
+tile.for.pods.name=Pod
 tile.for.pods.0.name=Pod
 
 ####################
@@ -1410,12 +1570,14 @@ for.trigger.lowFertilizer=Fertilizer
 for.trigger.lowLiquid=Water Tank
 for.trigger.lowSoil=Soil
 
+tile.for.ffarm.name=Farm Block
 tile.for.ffarm.0.name=Farm Block
 tile.for.ffarm.2.name=Farm Gearbox
 tile.for.ffarm.3.name=Farm Hatch
 tile.for.ffarm.4.name=Farm Valve
 tile.for.ffarm.5.name=Farm Control
 
+tile.for.mushroom.name=Mushroom
 tile.for.mushroom.0.name=Mushroom
 tile.for.mushroom.1.name=Mushroom
 
@@ -1423,6 +1585,9 @@ tile.for.mushroom.1.name=Mushroom
 # LEPIDOPTEROLOGY
 ####################
 
+item.for.serumGE.name=Serum
+item.for.caterpillarGE.name=Caterpillar
+item.for.butterflyGE.name=Butterfly
 entity.Forestry.butterflyGE.name=Butterfly
 
 for.chat.command.forestry.butterfly.desc=- %s : Butterfly Commands
@@ -1481,6 +1646,7 @@ item.for.butterfly.name=Butterfly
 item.for.flutterlyzer.name=Flutterlyzer
 item.for.lepidopteristBag.name=Lepidopterist's Backpack
 item.for.moth.name=Moth
+tile.for.lepidopterology.name=Lepidopterist's Chest
 tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################

src/main/resources/assets/forestry/lang/no_NO.lang

@@ -244,6 +244,7 @@ gui.higher=Higher
 gui.highest=Highest
 gui.fecundated=Mated
 gui.tooltip.tmi=Hold shift for details
+gui.tooltip.tml=Hold ctrl for lore
 gui.worktable.clear=Click to clear Grid
 gui.escritoire.probe=Examine Specimens
 hints.beebiomes.tag=Choose your biome!