update

Speed up forge event registration (#98 )
update
2026-11-15 09:34:57 +00:00 · 2025-07-18 10:15:39 +07:00 · 2025-07-17 18:49:32 +00:00 · 2025-07-10 11:11:16 +02:00 · 2025-07-09 22:28:25 +00:00 · 2025-06-20 23:40:15 +02:00
86 changed files with 1236 additions and 269 deletions
@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json
@@ -2,10 +2,10 @@

 dependencies {
    api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha31:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.23-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta51:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.66-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
    compileOnly('curse.maven:craftguide-75557:2459320')
 }
@@ -14,7 +14,7 @@ modId = Forestry
 modGroup = forestry

 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false

 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -80,11 +80,16 @@ apiPackage = api
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile =
+accessTransformersFile = forestry_at.cfg

 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false

+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false

@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true

-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true

+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
@@ -140,7 +151,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =

 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -17,7 +17,7 @@ pluginManagement {
 }

 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
 }


@@ -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);
@@ -12,11 +12,15 @@ public interface IClimateControlled {

    /**
     * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
     */
    void addTemperatureChange(float change, float boundaryDown, float boundaryUp);

    /**
     * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
     */
    void addHumidityChange(float change, float boundaryDown, float boundaryUp);
 }
@@ -9,33 +9,37 @@ import net.minecraft.item.ItemStack;

 public class RainSubstrate {

+    public enum WeatherState {
+        CLEAR,
+        RAIN,
+        STORM
+    }
+
    /**
     * Rain substrate capable of activating the rainmaker.
     */
    public ItemStack item;
    /**
-     * Duration of the rain shower triggered by this substrate in Minecraft ticks.
+     * Duration of the weather event triggered by this substrate in Minecraft ticks.
     */
    public int duration;
    /**
     * Speed of activation sequence triggered.
     */
    public float speed;
+    /**
+     * The type of weather triggered.
+     */
+    public WeatherState weather;

-    public boolean reverse;
-
-    public RainSubstrate(ItemStack item, int duration, float speed) {
-        this(item, duration, speed, false);
+    public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
+        this(item, 0, speed, weather);
    }

-    public RainSubstrate(ItemStack item, float speed) {
-        this(item, 0, speed, true);
-    }
-
-    public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
+    public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
        this.item = item;
        this.duration = duration;
        this.speed = speed;
-        this.reverse = reverse;
+        this.weather = weather;
    }
 }
@@ -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) {}
 }
@@ -49,6 +49,14 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
         * @param alveary   the climate controlled alveary
         */
        void changeClimate(int tickCount, IClimateControlled alveary);
+
+        /**
+         * Get the priority of this climatiser. Called when alveary is constructed.
+         * {@link #changeClimate(int, IClimateControlled)} are run in descending priority.
+         */
+        default int getPriority() {
+            return 0;
+        }
    }

    /**
@@ -9,6 +9,8 @@ import net.minecraft.util.ChunkCoordinates;

 import com.mojang.authlib.GameProfile;

+import forestry.core.inventory.IInventoryAdapter;
+
 /**
 * Basic interface for a multiblock machine component. Implemented by TileEntities.
 */
@@ -45,4 +47,15 @@ public interface IMultiblockComponent {
     * Called when the machine is broken for game reasons, e.g. a player removed a block or an explosion occurred.
     */
    void onMachineBroken();
+
+    /**
+     * A component with a separate inventory, like the Alveary Swarmer or Alveary Sieve.
+     */
+    interface HasInventory {
+
+        /**
+         * Called when this part is destroyed to drop its contents.
+         */
+        IInventoryAdapter getInternalInventory();
+    }
 }
@@ -97,7 +97,7 @@ public class BlockAlveary extends BlockStructure {
    /* TILE ENTITY CREATION */
    @Override
    public TileEntity createTileEntity(World world, int metadata) {
-        if (metadata < 0 || metadata > Type.VALUES.length) {
+        if (metadata < 0 || metadata >= Type.VALUES.length) {
            return null;
        }

@@ -213,6 +213,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe

    private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<Flower> acceptedFlowers,
            World world, int x, int y, int z) {
+        if (!world.blockExists(x, y, z)) return false;
        Block block = world.getBlock(x, y, z);

        final int meta;
@@ -24,7 +24,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
    @Override
    public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual,
            int x, int y, int z) {
-        if (!world.isAirBlock(x, y, z)) {
+        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
            return false;
        }

@@ -39,7 +39,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {

    @Override
    public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) {
-        if (!world.isAirBlock(x, y, z)) {
+        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
            return false;
        }

@@ -34,6 +34,10 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule {
    }

    private static boolean growFlower(String flowerType, World world, int x, int y, int z) {
+        if (!world.blockExists(x, y, z)) {
+            return false;
+        }
+
        TileEntity tile = world.getTileEntity(x, y, z);
        if (!(tile instanceof TileEntityFlowerPot)) {
            return false;
@@ -8,6 +8,9 @@
 ******************************************************************************/
 package forestry.apiculture.genetics;

+import static forestry.core.utils.MathUtil.safeAdd;
+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -15,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;
@@ -373,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) {

@@ -699,9 +734,9 @@ public class Bee extends IndividualLiving implements IBee {

            // boost chance for researched mutations
            if (breedingTracker.isResearched(beeMutation)) {
-                float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f);
+                float mutationBoost = safeMultiply(chance, Config.researchMutationBoostMultiplier - 1.0f);
                mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost);
-                chance += mutationBoost;
+                chance = safeAdd(chance, mutationBoost);
            }

            if (chance > world.rand.nextFloat() * 100) {
@@ -738,6 +773,9 @@ public class Bee extends IndividualLiving implements IBee {
        for (int i = 0; i < 20; i++) {
            Vect randomPos = Vect.getRandomPositionInArea(random, area);
            Vect blockPos = Vect.add(housingPos, randomPos, offset);
+            if (!world.blockExists(blockPos.x, blockPos.y, blockPos.z)) {
+                continue;
+            }
            TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z);

            if (tile instanceof IPollinatable) {
@@ -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);
        }

@@ -8,6 +8,8 @@
 ******************************************************************************/
 package forestry.apiculture.genetics;

+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;

@@ -49,8 +51,8 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
        IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
        IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();

-        processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
-        processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
+        processedChance = safeMultiply(processedChance, beeHousingModifier.getMutationModifier(genome0, genome1, 1.0F));
+        processedChance = safeMultiply(processedChance, beeModeModifier.getMutationModifier(genome0, genome1, 1.0F));

        return processedChance;
    }
@@ -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;
@@ -21,7 +22,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.apiculture.blocks.BlockAlveary;
+import forestry.apiculture.multiblock.AlvearyController;
 import forestry.core.utils.DamageSourceForestry;
 import forestry.core.utils.vect.Vect;

@@ -36,8 +37,13 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
    @Override
    public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
        harmEntities(genome, housing);
+        if (isMobGriefingEnabled(housing)) destroyEnvironment(genome, housing);

-        return destroyEnvironment(genome, storedData, housing);
+        return storedData;
+    }
+
+    private boolean isMobGriefingEnabled(IBeeHousing housing) {
+        return housing.getWorld().getGameRules().getGameRuleBooleanValue("mobGriefing");
    }

    private void harmEntities(IBeeGenome genome, IBeeHousing housing) {
@@ -56,7 +62,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
        }
    }

-    private static IEffectData destroyEnvironment(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+    private static void destroyEnvironment(IBeeGenome genome, IBeeHousing housing) {
        World world = housing.getWorld();
        Random rand = world.rand;

@@ -65,43 +71,66 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
        Vect offset = area.multiply(-1 / 2.0f);
        Vect posHousing = new Vect(housing.getCoordinates());

+        boolean isAlveary = housing instanceof AlvearyController;
+
        for (int i = 0; i < 20; i++) {
            Vect randomPos = Vect.getRandomPositionInArea(rand, area);
-            Vect posBlock = randomPos.add(posHousing);
-            posBlock = posBlock.add(offset);
+            Vect posBlock = randomPos.add(posHousing).add(offset);

-            if (posBlock.y <= 1 || posBlock.y >= housing.getWorld().getActualHeight()) {
+            // Don't destroy blocks in the protected 3x3x4 area if housing is an Alveary.
+            // Stops the bee destroying itself. Silly behaviour.
+            if (isInAlvearyProtectedArea(posHousing, posBlock)) {
                continue;
            }

-            // Don't destroy ourselves or blocks below us.
-            if (posBlock.x == posHousing.x && posBlock.z == posHousing.z && posBlock.y <= posHousing.y) {
-                continue;
-            }
-
-            if (world.isAirBlock(posBlock.x, posBlock.y, posBlock.z)) {
-                continue;
+            // Don't destroy the block directly below the bee.
+            if (isAlveary) {
+                if (posBlock.y == posHousing.y - 3) {
+                    continue;
+                }
+            } else {
+                if (posBlock.y == posHousing.y - 1) {
+                    continue;
+                }
            }

            Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z);

-            if (block instanceof BlockAlveary) {
-                continue;
-            }
-
+            // Never delete a tile entity. Allows far too much griefing and abuse otherwise.
            TileEntity tile = world.getTileEntity(posBlock.x, posBlock.y, posBlock.z);
-            if (tile instanceof IBeeHousing) {
+            if (tile != null) {
                continue;
            }

+            // Don't let us delete blocks that are not supposed to be breakable by players.
            if (block.getBlockHardness(world, posBlock.x, posBlock.y, posBlock.z) < 0) {
                continue;
            }

+            // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
+            EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
+            if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
+                continue;
+            }
+
            world.setBlockToAir(posBlock.x, posBlock.y, posBlock.z);
            break;
        }
+    }

-        return storedData;
+    private static boolean isInAlvearyProtectedArea(Vect posHousing, Vect posBlock) {
+        // Alveary protection area is a 3x3x4 area centered on the top middle, down one block.
+        int startX = posHousing.x - 1;
+        int endX = posHousing.x + 1;
+        int startZ = posHousing.z - 1;
+        int endZ = posHousing.z + 1;
+        int startY = posHousing.y - 2;
+        int endY = posHousing.y + 1;
+
+        return posBlock.x >= startX && posBlock.x <= endX
+                && posBlock.z >= startZ
+                && posBlock.z <= endZ
+                && posBlock.y >= startY
+                && posBlock.y <= endY;
    }
 }
@@ -71,9 +71,8 @@ public class ItemHabitatLocator extends ItemWithGui {
    public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
        BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords((int) player.posX, (int) player.posZ);

-        float temperatureValue = currentBiome
-                .getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
-        EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
+        EnumTemperature temperature = EnumTemperature
+                .getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
        EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);

        list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);
@@ -9,8 +9,10 @@
 package forestry.apiculture.multiblock;

 import java.io.IOException;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;

 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -59,7 +61,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
    // PARTS
    private final Set<IBeeModifier> beeModifiers = new HashSet<>();
    private final Set<IBeeListener> beeListeners = new HashSet<>();
-    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new TreeSet<>(
+            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
+                    .reversed());
    private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();

    // CLIENT
@@ -233,26 +237,24 @@ public class AlvearyController extends RectangularMultiblockControllerBase
            beekeepingLogic.doWork();
        }

+        tempChange = 0;
+        humidChange = 0;
        for (IAlvearyComponent.Climatiser climatiser : climatisers) {
            climatiser.changeClimate(tickCount, this);
        }

-        tempChange = equalizeChange(tempChange);
-        humidChange = equalizeChange(humidChange);
-
        return canWork;
    }

-    private static float equalizeChange(float change) {
-        if (change == 0) {
-            return 0;
+    private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
+            float boundaryUp) {
+        float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
+                - base;
+        if (extraChange > 0) {
+            return Math.max(currentChange, boundedNewChange);
+        } else {
+            return Math.min(currentChange, boundedNewChange);
        }
-
-        change *= 0.95f;
-        if (change <= 0.001f && change >= -0.001f) {
-            change = 0;
-        }
-        return change;
    }

    @Override
@@ -410,19 +412,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
        ChunkCoordinates coordinates = getCoordinates();

        float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-
-        tempChange += change;
-        tempChange = Math.max(boundaryDown - temperature, tempChange);
-        tempChange = Math.min(boundaryUp - temperature, tempChange);
+        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
    }

    @Override
    public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
        float humidity = getBiome().rainfall;
-
-        humidChange += change;
-        humidChange = Math.max(boundaryDown - humidity, humidChange);
-        humidChange = Math.min(boundaryUp - humidity, humidChange);
+        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
    }

    /* GUI */
@@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler;

 import forestry.api.core.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearyHygroregulator;
 import forestry.apiculture.gui.GuiAlvearyHygroregulator;
@@ -31,8 +32,8 @@ import forestry.core.fluids.tanks.FilteredTank;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.tiles.ILiquidTankTile;

-public class TileAlvearyHygroregulator extends TileAlveary
-        implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler,
+        IAlvearyComponent.Climatiser, IMultiblockComponent.HasInventory {

    private final HygroregulatorRecipe[] recipes;

@@ -56,9 +57,9 @@ public class TileAlvearyHygroregulator extends TileAlveary
        this.tankManager = new TankManager(this, liquidTank);

        this.recipes = new HygroregulatorRecipe[] {
-                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f),
-                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
-                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
+                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.005f),
+                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
+                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.01f) };
    }

    @Override
@@ -111,6 +112,11 @@ public class TileAlvearyHygroregulator extends TileAlveary
        }
    }

+    @Override
+    public int getPriority() {
+        return 100;
+    }
+
    /* SAVING & LOADING */
    @Override
    public void readFromNBT(NBTTagCompound nbttagcompound) {
@@ -18,6 +18,7 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySieve;
 import forestry.apiculture.gui.GuiAlvearySieve;
@@ -25,7 +26,8 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;

-public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
+public class TileAlvearySieve extends TileAlveary
+        implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {

    private final IBeeListener beeListener;
    private final InventoryAlvearySieve inventory;
@@ -22,6 +22,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IBee;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySwarmer;
 import forestry.apiculture.gui.GuiAlvearySwarmer;
@@ -37,7 +38,8 @@ import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
 import forestry.core.utils.ItemStackUtil;

-public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
+public class TileAlvearySwarmer extends TileAlveary
+        implements ISidedInventory, IActivatable, IAlvearyComponent.Active, IMultiblockComponent.HasInventory {

    private final InventorySwarmer inventory;
    private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();
@@ -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) {

@@ -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;
@@ -116,6 +116,12 @@ public abstract class BlockStructure extends BlockForestry {
                    InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z);
                }
            }
+
+            if (tile instanceof IMultiblockComponent.HasInventory) {
+                IMultiblockComponent.HasInventory hasInventory = (IMultiblockComponent.HasInventory) tile;
+
+                InventoryUtil.dropInventory(hasInventory.getInternalInventory(), world, x, y, z);
+            }
        }
        super.breakBlock(world, x, y, z, block, meta);
    }
@@ -109,6 +109,7 @@ public class Constants implements IForestryConstants {
    public static final int MACHINE_MAX_ENERGY = 5000;

    public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
+    public static final int RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE = 10000;

    public static final int STILL_DESTILLATION_DURATION = 100;
    public static final int STILL_DESTILLATION_INPUT = 10;
@@ -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") + ">");
            }
@@ -8,6 +8,8 @@
 ******************************************************************************/
 package forestry.core.genetics.mutations;

+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -126,7 +128,9 @@ public abstract class Mutation implements IMutationCustom {
            IGenome genome1, IClimateProvider climate) {
        float mutationChance = chance;
        for (IMutationCondition mutationCondition : mutationConditions) {
-            mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
+            mutationChance = safeMultiply(
+                    mutationChance,
+                    mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate));
            if (mutationChance == 0) {
                return 0;
            }
@@ -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();
+    }
 }
@@ -25,6 +25,8 @@ import forestry.core.network.packets.PacketAccessUpdate;
 import forestry.core.network.packets.PacketErrorUpdate;
 import forestry.core.network.packets.PacketGuiEnergy;
 import forestry.core.network.packets.PacketGuiUpdate;
+import forestry.core.network.packets.PacketTileConfiguration;
+import forestry.core.tiles.IConfigurable;
 import forestry.core.tiles.IPowerHandler;
 import forestry.core.tiles.TilePowered;
 import forestry.core.tiles.TileUtil;
@@ -34,6 +36,7 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores

    protected final T tile;
    private final IAccessHandler accessHandler;
+    private boolean configurationChanged;

    protected ContainerTile(T tile) {
        this.tile = tile;
@@ -43,6 +46,10 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
        } else {
            accessHandler = FakeAccessHandler.getInstance();
        }
+
+        if (tile instanceof IConfigurable) {
+            configurationChanged = true;
+        }
    }

    protected ContainerTile(T tileForestry, InventoryPlayer playerInventory, int xInv, int yInv) {
@@ -128,6 +135,15 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
                sendPacketToCrafters(packet);
            }
        }
+
+        if (tile instanceof IConfigurable && configurationChanged) {
+            configurationChanged = false;
+            sendPacketToCrafters(new PacketTileConfiguration(tile));
+        }
+    }
+
+    protected void markConfigurationDirty() {
+        configurationChanged = true;
    }

    public void onGuiEnergy(int energyStored) {
@@ -138,6 +138,10 @@ public abstract class Ledger {
        return false;
    }

+    public boolean acceptMouseButton(int mouseButton) {
+        return mouseButton == 0;
+    }
+
    public boolean intersectsWith(int mouseX, int mouseY) {
        return mouseX >= currentShiftX && mouseX <= currentShiftX + currentWidth
                && mouseY >= currentShiftY
@@ -159,29 +159,28 @@ public class LedgerManager {
    }

    public void handleMouseClicked(int x, int y, int mouseButton) {
+        Ledger ledger = this.getAtPosition(x, y);
+        if (ledger == null || !ledger.acceptMouseButton(mouseButton)) {
+            return;
+        }

-        if (mouseButton == 0) {
+        // Default action only if the mouse click was not handled by the
+        // ledger itself.
+        if (!ledger.handleMouseClicked(x, y, mouseButton)) {

-            Ledger ledger = this.getAtPosition(x, y);
-
-            // Default action only if the mouse click was not handled by the
-            // ledger itself.
-            if (ledger != null && !ledger.handleMouseClicked(x, y, mouseButton)) {
-
-                List<? extends Ledger> toggleLedgers;
-                if (ledgers.contains(ledger)) {
-                    toggleLedgers = ledgers;
-                } else {
-                    toggleLedgers = errorLedgers;
-                }
-
-                for (Ledger other : toggleLedgers) {
-                    if (other != ledger && other.isOpen()) {
-                        other.toggleOpen();
-                    }
-                }
-                ledger.toggleOpen();
+            List<? extends Ledger> toggleLedgers;
+            if (ledgers.contains(ledger)) {
+                toggleLedgers = ledgers;
+            } else {
+                toggleLedgers = errorLedgers;
            }
+
+            for (Ledger other : toggleLedgers) {
+                if (other != ledger && other.isOpen()) {
+                    other.toggleOpen();
+                }
+            }
+            ledger.toggleOpen();
        }
    }

@@ -0,0 +1,78 @@
+package forestry.core.gui.ledgers;
+
+import java.util.Locale;
+
+import net.minecraft.util.IIcon;
+
+import forestry.core.render.TextureManager;
+import forestry.core.tiles.IIngredientsSearchController;
+import forestry.core.tiles.IngredientsStorage;
+import forestry.core.utils.StringUtil;
+
+public class SearchIngregientsLedger extends Ledger {
+
+    private final IIngredientsSearchController ingredientsSearch;
+
+    public SearchIngregientsLedger(LedgerManager manager, IIngredientsSearchController ingredientsSearch) {
+        super(manager, "search_ingredients");
+        this.ingredientsSearch = ingredientsSearch;
+        this.maxHeight = 36;
+    }
+
+    private boolean isSwitchButton(int mouseX, int mouseY) {
+        int shiftX = currentShiftX + 20;
+        int shiftY = currentShiftY + 8;
+        return mouseX >= shiftX && mouseX <= currentShiftX + currentWidth && mouseY >= shiftY && mouseY <= shiftY + 24;
+    }
+
+    @Override
+    public void draw(int x, int y) {
+        // Draw background
+        drawBackground(x, y);
+
+        // Draw icon
+        IIcon icon = TextureManager.getInstance().getDefault(
+                "misc/search_ingredients."
+                        + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH));
+        drawIcon(icon, x + 3, y + 4);
+
+        // Draw description
+        if (!isFullyOpened()) {
+            return;
+        }
+
+        drawHeader(StringUtil.localize("gui.search_ingredients"), x + 22, y + 8);
+        drawText(
+                StringUtil.localize(
+                        "gui.search_ingredients."
+                                + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH)),
+                x + 22,
+                y + 20);
+    }
+
+    @Override
+    public String getTooltip() {
+        return StringUtil.localize("gui.search_ingredients") + ": "
+                + StringUtil.localize(
+                        "gui.search_ingredients."
+                                + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH));
+    }
+
+    @Override
+    public boolean handleMouseClicked(int x, int y, int mouseButton) {
+        if (isSwitchButton(x, y)) {
+            IngredientsStorage ingredientsStorage = ingredientsSearch.getIngredientsStorage();
+            IngredientsStorage newIngredientsStorage = mouseButton == 0 ? ingredientsStorage.next()
+                    : ingredientsStorage.previous();
+            ingredientsSearch.setIngredientsStorage(newIngredientsStorage);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean acceptMouseButton(int mouseButton) {
+        return mouseButton == 0 || mouseButton == 1;
+    }
+}
@@ -20,12 +20,14 @@ public class SlotCrafter extends SlotCrafting {

    private final IInventory craftMatrix;
    private final ICrafterWorktable crafter;
+    private final EntityPlayer player;

    public SlotCrafter(EntityPlayer player, IInventory craftMatrix, ICrafterWorktable crafter, int slot, int xPos,
            int yPos) {
        super(player, craftMatrix, craftMatrix, slot, xPos, yPos);
        this.craftMatrix = craftMatrix;
        this.crafter = crafter;
+        this.player = player;
    }

    @Override
@@ -39,7 +41,7 @@ public class SlotCrafter extends SlotCrafting {

    @Override
    public boolean canTakeStack(EntityPlayer player) {
-        return crafter.canTakeStack(getSlotIndex());
+        return crafter.canTakeStack(player, getSlotIndex());
    }

    @Override
@@ -49,7 +51,7 @@ public class SlotCrafter extends SlotCrafting {

    @Override
    public boolean getHasStack() {
-        return getStack() != null && crafter.canTakeStack(getSlotIndex());
+        return getStack() != null && crafter.canTakeStack(player, getSlotIndex());
    }

    @Override
@@ -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);
@@ -0,0 +1,100 @@
+package forestry.core.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+public class MergedInventories implements IInventory {
+
+    private final IInventory first;
+    private final IInventory second;
+
+    public MergedInventories(IInventory first, IInventory second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    @Override
+    public int getSizeInventory() {
+        return first.getSizeInventory() + second.getSizeInventory();
+    }
+
+    @Override
+    public ItemStack getStackInSlot(int slotIn) {
+        if (slotIn < first.getSizeInventory()) {
+            return first.getStackInSlot(slotIn);
+        }
+        return second.getStackInSlot(slotIn - first.getSizeInventory());
+    }
+
+    @Override
+    public ItemStack decrStackSize(int index, int count) {
+        if (index < first.getSizeInventory()) {
+            return first.decrStackSize(index, count);
+        }
+        return second.decrStackSize(index - first.getSizeInventory(), count);
+    }
+
+    @Override
+    public ItemStack getStackInSlotOnClosing(int index) {
+        if (index < first.getSizeInventory()) {
+            return first.getStackInSlotOnClosing(index);
+        }
+        return second.getStackInSlotOnClosing(index - first.getSizeInventory());
+    }
+
+    @Override
+    public void setInventorySlotContents(int index, ItemStack stack) {
+        if (index < first.getSizeInventory()) {
+            first.setInventorySlotContents(index, stack);
+        } else {
+            second.setInventorySlotContents(index - first.getSizeInventory(), stack);
+        }
+    }
+
+    @Override
+    public String getInventoryName() {
+        return first.getInventoryName();
+    }
+
+    @Override
+    public boolean hasCustomInventoryName() {
+        return first.hasCustomInventoryName();
+    }
+
+    @Override
+    public int getInventoryStackLimit() {
+        return Math.min(first.getInventoryStackLimit(), second.getInventoryStackLimit());
+    }
+
+    @Override
+    public void markDirty() {
+        first.markDirty();
+        second.markDirty();
+    }
+
+    @Override
+    public boolean isUseableByPlayer(EntityPlayer player) {
+        return first.isUseableByPlayer(player) && second.isUseableByPlayer(player);
+    }
+
+    @Override
+    public void openInventory() {
+        first.openInventory();
+        second.openInventory();
+    }
+
+    @Override
+    public void closeInventory() {
+        first.closeInventory();
+        second.closeInventory();
+    }
+
+    @Override
+    public boolean isItemValidForSlot(int index, ItemStack stack) {
+        if (index < first.getSizeInventory()) {
+            return first.isItemValidForSlot(index, stack);
+        }
+        return second.isItemValidForSlot(index - first.getSizeInventory(), stack);
+    }
+}
@@ -31,7 +31,7 @@ public class ItemForestryTool extends ItemForestry {
        setMaxDamage(200);
        this.remnants = remnants;
        if (remnants != null) {
-            MinecraftForge.EVENT_BUS.register(this);
+            MinecraftForge.EVENT_BUS.register(new EventHandler());
        }
    }

@@ -53,20 +53,6 @@ public class ItemForestryTool extends ItemForestry {
        return ForgeHooks.canToolHarvestBlock(block, 0, stack);
    }

-    @SubscribeEvent
-    public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
-        if (event.original == null || event.original.getItem() != this) {
-            return;
-        }
-
-        EntityPlayer player = event.entityPlayer;
-        World world = player.worldObj;
-
-        if (!world.isRemote && remnants != null) {
-            ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
-        }
-    }
-
    @Override
    public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
            EntityLivingBase entityliving) {
@@ -80,4 +66,21 @@ public class ItemForestryTool extends ItemForestry {
    public boolean isFull3D() {
        return true;
    }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
+            if (event.original == null || event.original.getItem() != ItemForestryTool.this) {
+                return;
+            }
+
+            EntityPlayer player = event.entityPlayer;
+            World world = player.worldObj;
+
+            if (!world.isRemote && remnants != null) {
+                ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
+            }
+        }
+    }
 }
@@ -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 */
@@ -74,6 +78,7 @@ public class ItemRegistryCore extends ItemRegistry {
    /* Rainmaker */
    public final ItemForestry iodineCharge;
    public final ItemForestry phosphor;
+    public final ItemForestry phosphorCharge;

    /* Misc */
    public final ItemCraftingMaterial craftingMaterial;
@@ -87,19 +92,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");
@@ -170,8 +182,8 @@ public class ItemRegistryCore extends ItemRegistry {

        // / RAINMAKER SUBSTRATES
        iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
-
        phosphor = registerItem(new ItemForestry(), "phosphor");
+        phosphorCharge = registerItem(new ItemForestry(), "phosphoricIodineCapsule");

        // / BEE RESOURCES
        beeswax = registerItem(new ItemForestry(), "beeswax");
@@ -187,4 +199,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();
+    }
 }
@@ -32,6 +32,7 @@ public enum PacketIdClient implements IPacketId {
    ITEMSTACK_DISPLAY,
    FX_SIGNAL,
    TANK_LEVEL_UPDATE,
+    TILE_CONFIGURATION,

    // Core Genome
    GENOME_TRACKER_UPDATE,
@@ -27,6 +27,7 @@ import forestry.core.network.packets.PacketPipetteClick;
 import forestry.core.network.packets.PacketSocketUpdate;
 import forestry.core.network.packets.PacketSolderingIronClick;
 import forestry.core.network.packets.PacketTankLevelUpdate;
+import forestry.core.network.packets.PacketTileConfiguration;
 import forestry.core.network.packets.PacketTileStream;

 public class PacketRegistryCore extends PacketRegistry {
@@ -47,6 +48,7 @@ public class PacketRegistryCore extends PacketRegistry {
        registerClientPacket(new PacketFXSignal());
        registerClientPacket(new PacketTankLevelUpdate());
        registerClientPacket(new PacketGenomeTrackerSync());
+        registerClientPacket(new PacketTileConfiguration());

        registerServerPacket(new PacketGuiSelectRequest());
        registerServerPacket(new PacketPipetteClick());
@@ -0,0 +1,49 @@
+package forestry.core.network.packets;
+
+import java.io.IOException;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.IForestryPacketClient;
+import forestry.core.network.PacketIdClient;
+import forestry.core.proxy.Proxies;
+import forestry.core.tiles.IConfigurable;
+
+/**
+ * Used to sync the tile configuration from Server to Client.
+ */
+public class PacketTileConfiguration extends PacketCoordinates implements IForestryPacketClient {
+
+    private TileEntity tileEntity = null;
+
+    public PacketTileConfiguration() {}
+
+    public PacketTileConfiguration(TileEntity tileEntity) {
+        super(tileEntity);
+        this.tileEntity = tileEntity;
+    }
+
+    @Override
+    protected void writeData(DataOutputStreamForestry data) throws IOException {
+        super.writeData(data);
+        if (tileEntity instanceof IConfigurable) {
+            ((IConfigurable) tileEntity).writeConfigurationData(data);
+        }
+    }
+
+    @Override
+    public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException {
+        TileEntity tile = getTarget(Proxies.common.getRenderWorld());
+        if (tile instanceof IConfigurable) {
+            ((IConfigurable) tile).readConfigurationData(data);
+        }
+    }
+
+    @Override
+    public PacketIdClient getPacketId() {
+        return PacketIdClient.TILE_CONFIGURATION;
+    }
+}
@@ -61,6 +61,10 @@ public class ProxyCommon {
        return false;
    }

+    public boolean isCtrlDown() {
+        return false;
+    }
+
    public void playSoundFX(World world, int x, int y, int z, Block block) {
        Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world);
    }
@@ -63,6 +63,11 @@ public class ProxyCommonClient extends ProxyCommon {
        return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
    }

+    @Override
+    public boolean isCtrlDown() {
+        return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
+    }
+
    @Override
    public String getDisplayName(ItemStack itemstack) {
        return itemstack.getItem().getItemStackDisplayName(itemstack);
@@ -112,15 +112,14 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
    public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
        super.handleTooltip(guiRecipe, currenttip, recipe);
        CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
+
        if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
            Point mouse = GuiDraw.getMousePosition();
            Point offset = guiRecipe.getRecipePosition(recipe);
-            Point relMouse = new Point(
-                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
-
+            Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
        }
+
        return currenttip;
    }

@@ -131,12 +130,9 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
        CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
        Point mouse = GuiDraw.getMousePosition();
        Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(
-                mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);

-        currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
-        return currenttip;
+        return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
    }

    public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
@@ -200,11 +196,9 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements

    protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
        CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
-        Point mousepos = GuiDraw.getMousePosition();
+        Point mouse = GuiDraw.getMousePosition();
        Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(
-                mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
-                mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
+        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);

        if (crecipe.getFluidTanks() != null) {
            for (PositionedFluidTank tank : crecipe.getFluidTanks()) {
@@ -51,7 +51,9 @@ public class TextureManager implements ITextureManager {
                "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave",
                "analyzer/pure_flyer", "analyzer/pure_nocturnal", "analyzer/queen", "particles/swarm_bee",
                "errors/errored", "errors/unknown", "slots/blocked", "slots/blocked_2", "slots/liquid",
-                "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader" };
+                "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader",
+                "misc/search_ingredients.internal_inventory", "misc/search_ingredients.player_inventory",
+                "misc/search_ingredients.all_inventories" };
        for (String str : defaultIconNames) {
            IIcon icon = registerTex(register, str);
            defaultIcons.put(str, icon);
@@ -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);
@@ -0,0 +1,13 @@
+package forestry.core.tiles;
+
+import java.io.IOException;
+
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+
+public interface IConfigurable {
+
+    void writeConfigurationData(DataOutputStreamForestry data) throws IOException;
+
+    void readConfigurationData(DataInputStreamForestry data) throws IOException;
+}
@@ -0,0 +1,8 @@
+package forestry.core.tiles;
+
+public interface IIngredientsSearchController {
+
+    IngredientsStorage getIngredientsStorage();
+
+    void setIngredientsStorage(IngredientsStorage ingredientsStorage);
+}
@@ -0,0 +1,42 @@
+package forestry.core.tiles;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+
+import forestry.core.inventory.MergedInventories;
+
+public enum IngredientsStorage {
+
+    INTERNAL_INVENTORY,
+    PLAYER_INVENTORY,
+    ALL_INVENTORIES;
+
+    public static final IngredientsStorage[] VALUES = values();
+
+    public static IngredientsStorage fromInt(int value) {
+        value = value % VALUES.length;
+        if (value < 0) {
+            value += VALUES.length;
+        }
+        return VALUES[value];
+    }
+
+    public IngredientsStorage next() {
+        return fromInt(ordinal() + 1);
+    }
+
+    public IngredientsStorage previous() {
+        return fromInt(ordinal() - 1);
+    }
+
+    public IInventory getInventory(IInventory internal, EntityPlayer player) {
+        switch (this) {
+            case PLAYER_INVENTORY:
+                return player.inventory;
+            case ALL_INVENTORIES:
+                return new MergedInventories(internal, player.inventory);
+            default:
+                return internal;
+        }
+    }
+}
@@ -241,16 +241,16 @@ public abstract class BlockUtil {
        if (bw) try {
            // noinspection unchecked
            BW_MetaGenerated_WerkstoffBlocksClass = (Class<? extends Block>) Class
-                    .forName("com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_WerkstoffBlocks");
-            BWBlocks = (Block) Class.forName("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader")
-                    .getField("BWBlocks").get(null);
+                    .forName("bartworks.system.material.BWMetaGeneratedWerkstoffBlocks");
+            BWBlocks = (Block) Class.forName("bartworks.system.material.WerkstoffLoader").getField("BWBlocks")
+                    .get(null);
        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
            e.printStackTrace();
        }
        if (gt) try {
            // noinspection unchecked
-            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.GT_Block_Machines");
-            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTech_API").getField("sBlockMachines").get(null);
+            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.BlockMachines");
+            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTechAPI").getField("sBlockMachines").get(null);
        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
            e.printStackTrace();
        }
@@ -96,6 +96,8 @@ public class GeneticsUtil {
     * altering the world by changing vanilla leaves to forestry ones.
     */
    public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) {
+        if (!world.blockExists(x, y, z)) return null;
+
        TileEntity tile = world.getTileEntity(x, y, z);

        if (tile instanceof IPollinatable) {
@@ -0,0 +1,30 @@
+package forestry.core.utils;
+
+import java.math.BigDecimal;
+
+public class MathUtil {
+
+    private static final BigDecimal MAX_FLOAT = BigDecimal.valueOf(Float.MAX_VALUE);
+    private static final BigDecimal MIN_FLOAT = BigDecimal.valueOf(-Float.MAX_VALUE);
+
+    private static float clampToFloatRange(BigDecimal result) {
+        if (result.compareTo(MAX_FLOAT) > 0) {
+            return Float.MAX_VALUE;
+        } else if (result.compareTo(MIN_FLOAT) < 0) {
+            return -Float.MAX_VALUE;
+        }
+        return result.floatValue();
+    }
+
+    public static float safeMultiply(float a, float b) {
+        BigDecimal bigA = BigDecimal.valueOf(a);
+        BigDecimal bigB = BigDecimal.valueOf(b);
+        return clampToFloatRange(bigA.multiply(bigB));
+    }
+
+    public static float safeAdd(float a, float b) {
+        BigDecimal bigA = BigDecimal.valueOf(a);
+        BigDecimal bigB = BigDecimal.valueOf(b);
+        return clampToFloatRange(bigA.add(bigB));
+    }
+}
@@ -73,9 +73,9 @@ public class Vect implements IVect {
    }

    public static Vect getRandomPositionInArea(Random random, IVect area) {
-        int x = random.nextInt(area.getX());
-        int y = random.nextInt(area.getY());
-        int z = random.nextInt(area.getZ());
+        int x = random.nextInt(area.getX() + 1);
+        int y = random.nextInt(area.getY() + 1);
+        int z = random.nextInt(area.getZ() + 1);
        return new Vect(x, y, z);
    }

@@ -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++;
            }
@@ -24,6 +24,7 @@ import forestry.core.gui.slots.SlotCraftMatrix;
 import forestry.core.gui.slots.SlotCrafter;
 import forestry.core.network.packets.PacketGuiSelectRequest;
 import forestry.core.proxy.Proxies;
+import forestry.core.tiles.IngredientsStorage;
 import forestry.core.utils.ItemStackUtil;
 import forestry.core.utils.Log;
 import forestry.factory.inventory.InventoryCraftingForestry;
@@ -207,6 +208,15 @@ public class ContainerWorktable extends ContainerTile<TileWorktable> implements
                sendPacketToCrafters(new PacketWorktableRecipeUpdate(tile));
                break;
            }
+            case 200: { // switch ingredients storage
+                tile.setIngredientsStorage(IngredientsStorage.fromInt(secondary));
+                markConfigurationDirty();
+                break;
+            }
        }
    }
+
+    public IngredientsStorage getIngredientsStorage() {
+        return tile.getIngredientsStorage();
+    }
 }
@@ -19,9 +19,12 @@ import forestry.core.config.Constants;
 import forestry.core.gui.GuiForestryTitled;
 import forestry.core.gui.buttons.GuiBetterButton;
 import forestry.core.gui.buttons.StandardButtonTextureSets;
+import forestry.core.gui.ledgers.SearchIngregientsLedger;
 import forestry.core.network.packets.PacketGuiSelectRequest;
 import forestry.core.proxy.Proxies;
 import forestry.core.recipes.RecipeUtil;
+import forestry.core.tiles.IIngredientsSearchController;
+import forestry.core.tiles.IngredientsStorage;
 import forestry.core.utils.InventoryUtil;
 import forestry.factory.gui.widgets.ClearWorktable;
 import forestry.factory.gui.widgets.MemorizedRecipeSlot;
@@ -30,13 +33,16 @@ import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;
 import forestry.factory.tiles.TileWorktable;

-public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable> {
+public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable>
+        implements IIngredientsSearchController {

    private static final int SPACING = 18;
    private boolean hasRecipeConflict = false;
+    private final EntityPlayer player;

    public GuiWorktable(EntityPlayer player, TileWorktable tile) {
        super(Constants.TEXTURE_PATH_GUI + "/worktable2.png", new ContainerWorktable(player, tile), tile);
+        this.player = player;

        ySize = 218;

@@ -60,6 +66,12 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
        widgetManager.add(new ClearWorktable(widgetManager, 66, 19));
    }

+    @Override
+    protected void addLedgers() {
+        super.addLedgers();
+        ledgerManager.add(new SearchIngregientsLedger(ledgerManager, this));
+    }
+
    @Override
    public void updateScreen() {
        super.updateScreen();
@@ -82,7 +94,7 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
                .get(54 + InventoryGhostCrafting.SLOT_CRAFTING_RESULT);

        if (func_146978_c(itemSlot.xDisplayPosition, itemSlot.yDisplayPosition, 16, 16, mouseX, mouseY)
-                && !inventory.canTakeStack(InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
+                && !inventory.canTakeStack(player, InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
            final MemorizedRecipe recipe = inventory.getCurrentRecipe();

            if (recipe != null) {
@@ -121,4 +133,14 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
        int id = 100 + button.id;
        Proxies.net.sendToServer(new PacketGuiSelectRequest(id, 0));
    }
+
+    @Override
+    public IngredientsStorage getIngredientsStorage() {
+        return container.getIngredientsStorage();
+    }
+
+    @Override
+    public void setIngredientsStorage(IngredientsStorage ingredientsStorage) {
+        Proxies.net.sendToServer(new PacketGuiSelectRequest(200, ingredientsStorage.ordinal()));
+    }
 }
@@ -26,16 +26,14 @@ public class InventoryRainmaker extends InventoryAdapterTile<TileMillRainmaker>
    @Override
    public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
        if (slotIndex == SLOT_SUBSTRATE) {
+            if (getStackInSlot(SLOT_SUBSTRATE) != null) {
+                return false;
+            }
            if (FuelManager.rainSubstrate.containsKey(itemStack) && tile.charge == 0 && tile.progress == 0) {
                RainSubstrate substrate = FuelManager.rainSubstrate.get(itemStack);
-                if (tile.getWorld().isRaining() && substrate.reverse) {
-                    return true;
-                } else if (!tile.getWorld().isRaining() && !substrate.reverse) {
-                    return true;
-                }
+                return tile.isValidSubstrate(substrate);
            }
        }
-
        return false;
    }

@@ -7,7 +7,7 @@ public interface ICrafterWorktable {

    ItemStack getResult();

-    boolean canTakeStack(int slotIndex);
+    boolean canTakeStack(EntityPlayer player, int slotIndex);

    boolean onCraftingStart(EntityPlayer player);

@@ -10,6 +10,7 @@ package forestry.factory.tiles;

 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.storage.WorldInfo;

 import forestry.api.fuels.FuelManager;
 import forestry.api.fuels.RainSubstrate;
@@ -20,7 +21,7 @@ import forestry.factory.inventory.InventoryRainmaker;
 public class TileMillRainmaker extends TileMill {

    private int duration;
-    private boolean reverse;
+    private RainSubstrate.WeatherState weather;

    public TileMillRainmaker() {
        super(null);
@@ -39,9 +40,9 @@ public class TileMillRainmaker extends TileMill {
        }

        // We don't have a gui, but we can be activated
-        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
+        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
            RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
-            if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
+            if (isValidSubstrate(substrate)) {
                addCharge(substrate);
                player.inventory.getCurrentItem().stackSize--;
            }
@@ -49,6 +50,17 @@ public class TileMillRainmaker extends TileMill {
        sendNetworkUpdate();
    }

+    public boolean isValidSubstrate(RainSubstrate substrate) {
+        boolean thundering = getWorld().isThundering();
+        boolean raining = getWorld().isRaining();
+
+        return switch (substrate.weather) {
+            case CLEAR -> (thundering || raining);
+            case RAIN -> (thundering || !raining);
+            case STORM -> (!thundering);
+        };
+    }
+
    @Override
    public void readFromNBT(NBTTagCompound nbttagcompound) {
        super.readFromNBT(nbttagcompound);
@@ -57,7 +69,7 @@ public class TileMillRainmaker extends TileMill {
        progress = nbttagcompound.getFloat("Progress");
        stage = nbttagcompound.getInteger("Stage");
        duration = nbttagcompound.getInteger("Duration");
-        reverse = nbttagcompound.getBoolean("Reverse");
+        weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
    }

    @Override
@@ -68,14 +80,14 @@ public class TileMillRainmaker extends TileMill {
        nbttagcompound.setFloat("Progress", progress);
        nbttagcompound.setInteger("Stage", stage);
        nbttagcompound.setInteger("Duration", duration);
-        nbttagcompound.setBoolean("Reverse", reverse);
+        nbttagcompound.setString("Weather", weather.name());
    }

    public void addCharge(RainSubstrate substrate) {
        charge = 1;
        speed = substrate.speed;
        duration = substrate.duration;
-        reverse = substrate.reverse;
+        weather = substrate.weather;
        sendNetworkUpdate();
    }

@@ -103,15 +115,26 @@ public class TileMillRainmaker extends TileMill {
        }

        if (!worldObj.isRemote) {
-            if (reverse) {
-                worldObj.getWorldInfo().setRaining(false);
-            } else {
-                worldObj.getWorldInfo().setRaining(true);
-                worldObj.getWorldInfo().setRainTime(duration);
+            WorldInfo world = worldObj.getWorldInfo();
+            switch (weather) {
+                case CLEAR:
+                    world.setRaining(false);
+                    world.setThundering(false);
+                    break;
+                case STORM:
+                    world.setRaining(true);
+                    world.setRainTime(duration);
+                    world.setThundering(true);
+                    world.setThunderTime(duration);
+                    break;
+                case RAIN:
+                    world.setRaining(true);
+                    world.setRainTime(duration);
+                    world.setThundering(false);
+                    break;
            }
            charge = 0;
            duration = 0;
-            reverse = false;
            sendNetworkUpdate();
        }
    }
@@ -24,6 +24,8 @@ import forestry.core.inventory.wrappers.InventoryMapper;
 import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.recipes.RecipeUtil;
+import forestry.core.tiles.IConfigurable;
+import forestry.core.tiles.IngredientsStorage;
 import forestry.core.tiles.TileBase;
 import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.ItemStackUtil;
@@ -35,13 +37,14 @@ import forestry.factory.inventory.InventoryWorktable;
 import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;

-public class TileWorktable extends TileBase implements ICrafterWorktable {
+public class TileWorktable extends TileBase implements ICrafterWorktable, IConfigurable {

    private final RecipeMemory recipeMemory;
    private final InventoryAdapterTile<?> craftingDisplay;
    private MemorizedRecipe currentRecipe;
    private long savedTick = 0;
    private long savedSystemTimeExpiration = 0;
+    private IngredientsStorage ingredientsStorage = IngredientsStorage.INTERNAL_INVENTORY;

    public TileWorktable() {
        super("worktable");
@@ -58,6 +61,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {

        craftingDisplay.writeToNBT(nbttagcompound);
        recipeMemory.writeToNBT(nbttagcompound);
+        nbttagcompound.setInteger("IngredientsStorage", ingredientsStorage.ordinal());
    }

    @Override
@@ -66,6 +70,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {

        craftingDisplay.readFromNBT(nbttagcompound);
        recipeMemory.readFromNBT(nbttagcompound);
+        ingredientsStorage = IngredientsStorage.fromInt(nbttagcompound.getInteger("IngredientsStorage"));
    }

    /* NETWORK */
@@ -108,16 +113,20 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
        }
    }

+    private IInventory getIngredientsInventory(EntityPlayer player) {
+        return ingredientsStorage.getInventory(this, player);
+    }
+
    /* ICrafterWorktable */
    @Override
-    public boolean canTakeStack(int craftingSlotIndex) {
+    public boolean canTakeStack(EntityPlayer player, int craftingSlotIndex) {
        if (craftingSlotIndex == InventoryGhostCrafting.SLOT_CRAFTING_RESULT) {
-            return canCraftCurrentRecipe();
+            return canCraftCurrentRecipe(player);
        }
        return true;
    }

-    private boolean canCraftCurrentRecipe() {
+    private boolean canCraftCurrentRecipe(EntityPlayer player) {
        if (currentRecipe == null) {
            return false;
        }
@@ -139,7 +148,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
        }

        ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(this);
+        ItemStack[] inventory = InventoryUtil.getStacks(getIngredientsInventory(player));
        InventoryCraftingForestry crafting = RecipeUtil
                .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());

@@ -152,8 +161,9 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
            return false;
        }

+        IInventory ingredientsInventory = getIngredientsInventory(player);
        ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(this);
+        ItemStack[] inventory = InventoryUtil.getStacks(ingredientsInventory);
        InventoryCraftingForestry crafting = RecipeUtil
                .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
        if (crafting == null) {
@@ -163,7 +173,8 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
        recipeItems = InventoryUtil.getStacks(crafting);

        // craft recipe should exactly match ingredients here, so no oreDict or tool matching
-        ItemStack[] removed = InventoryUtil.removeSets(this, 1, recipeItems, player, false, false, false);
+        ItemStack[] removed = InventoryUtil
+                .removeSets(ingredientsInventory, 1, recipeItems, player, false, false, false);
        if (removed == null) {
            return false;
        }
@@ -175,6 +186,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
    @Override
    public void onCraftingComplete(EntityPlayer player) {
        IInventory craftingInventory = getCraftingDisplay();
+        IInventory ingredientsInventory = getIngredientsInventory(player);
        for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) {
            ItemStack itemStack = craftingInventory.getStackInSlot(i);
            if (itemStack == null) {
@@ -202,7 +214,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
                continue;
            }

-            if (!InventoryUtil.tryAddStack(this, container, true)) {
+            if (!InventoryUtil.tryAddStack(ingredientsInventory, container, true)) {
                player.dropPlayerItemWithRandomChoice(container, false);
            }
        }
@@ -287,6 +299,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
        }
    }

+    public IngredientsStorage getIngredientsStorage() {
+        return ingredientsStorage;
+    }
+
+    public void setIngredientsStorage(IngredientsStorage ingredientsStorage) {
+        this.ingredientsStorage = ingredientsStorage;
+    }
+
    @Override
    public Object getGui(EntityPlayer player, int data) {
        return new GuiWorktable(player, this);
@@ -296,4 +316,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
    public Object getContainer(EntityPlayer player, int data) {
        return new ContainerWorktable(player, this);
    }
+
+    @Override
+    public void writeConfigurationData(DataOutputStreamForestry data) throws IOException {
+        data.writeEnum(ingredientsStorage, IngredientsStorage.VALUES);
+    }
+
+    @Override
+    public void readConfigurationData(DataInputStreamForestry data) throws IOException {
+        ingredientsStorage = data.readEnum(IngredientsStorage.VALUES);
+    }
 }
@@ -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();
@@ -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
@@ -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;
@@ -220,9 +222,23 @@ public class PluginFactory extends ForestryPlugin {
        // Set rain substrates
        ItemStack iodineCharge = coreItems.iodineCharge.getItemStack();
        ItemStack dissipationCharge = coreItems.craftingMaterial.getDissipationCharge();
+        ItemStack phosphorCharge = coreItems.phosphorCharge.getItemStack();
+        FuelManager.rainSubstrate.put(
+                iodineCharge,
+                new RainSubstrate(
+                        iodineCharge,
+                        Constants.RAINMAKER_RAIN_DURATION_IODINE,
+                        0.01f,
+                        RainSubstrate.WeatherState.RAIN));
        FuelManager.rainSubstrate
-                .put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
-        FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
+                .put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f, RainSubstrate.WeatherState.CLEAR));
+        FuelManager.rainSubstrate.put(
+                phosphorCharge,
+                new RainSubstrate(
+                        phosphorCharge,
+                        Constants.RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE,
+                        0.008f,
+                        RainSubstrate.WeatherState.STORM));

        for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
            MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -592,6 +608,15 @@ public class PluginFactory extends ForestryPlugin {
                    PluginFluids.items.canEmpty,
                    'Z',
                    beeItems.honeydew);
+            RecipeManagers.carpenterManager.addRecipe(
+                    5,
+                    PluginCore.items.iodineCharge.getItemStack(),
+                    PluginCore.items.phosphorCharge.getItemStack(),
+                    "# #",
+                    " # ",
+                    "# #",
+                    '#',
+                    PluginCore.items.phosphor.getItemStack());
        }

        // Ender pearl
@@ -644,18 +669,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()) {
@@ -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(),
@@ -60,6 +60,7 @@ public class PluginLepidopterology extends ForestryPlugin {
    public static int spawnConstraint = 100;
    public static int entityConstraint = 1000;
    private static boolean allowPollination = true;
+    public static boolean disableButterflyLeafSpawns = false;

    public static ItemRegistryLepidopterology items;
    public static BlockRegistryLepidopterology blocks;
@@ -112,7 +113,8 @@ public class PluginLepidopterology extends ForestryPlugin {

        blocks.lepidopterology.init();

-        TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
+        if (!PluginLepidopterology.disableButterflyLeafSpawns)
+            TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());

        RecipeSorter.register(
                "forestry:lepidopterologymating",
@@ -127,6 +129,8 @@ public class PluginLepidopterology extends ForestryPlugin {
        spawnConstraint = config.getIntLocalized("butterfly.entities", "spawn.limit", spawnConstraint, 0, 500);
        entityConstraint = config.getIntLocalized("butterfly.entities", "maximum", entityConstraint, 0, 5000);
        allowPollination = config.getBooleanLocalized("butterfly.entities", "pollination", allowPollination);
+        disableButterflyLeafSpawns = config
+                .getBooleanLocalized("butterfly.entities", "disable.leaf.spawns", disableButterflyLeafSpawns);

        config.save();
    }
@@ -96,6 +96,7 @@ public class PluginStorage extends ForestryPlugin {
    private final ArrayList<ItemStack> hunterItems = new ArrayList<>();
    private final ArrayList<ItemStack> adventurerItems = new ArrayList<>();
    private final ArrayList<ItemStack> builderItems = new ArrayList<>();
+    private final ArrayList<ItemStack> coinItems = new ArrayList<>();

    public static ItemRegistryStorage items;

@@ -108,7 +109,7 @@ public class PluginStorage extends ForestryPlugin {

        BackpackManager.backpackInterface = new BackpackInterface();

-        BackpackManager.backpackItems = new ArrayList[6];
+        BackpackManager.backpackItems = new ArrayList[7];

        BackpackManager.backpackItems[0] = minerItems;
        BackpackManager.backpackItems[1] = diggerItems;
@@ -116,6 +117,7 @@ public class PluginStorage extends ForestryPlugin {
        BackpackManager.backpackItems[3] = hunterItems;
        BackpackManager.backpackItems[4] = adventurerItems;
        BackpackManager.backpackItems[5] = builderItems;
+        BackpackManager.backpackItems[6] = coinItems;

        BackpackDefinition definition;

@@ -146,18 +148,22 @@ public class PluginStorage extends ForestryPlugin {

        definition = new BackpackDefinition("builder", new Color(0xdd3a3a).getRGB());
        BackpackManager.definitions.put(definition.getKey(), definition);
+
+        definition = new BackpackDefinition("coin", new Color(0xffd700).getRGB());
+        BackpackManager.definitions.put(definition.getKey(), definition);
    }

    @Override
    @SuppressWarnings({ "unchecked" })
    protected void disabledSetupAPI() {
-        BackpackManager.backpackItems = new ArrayList[6];
+        BackpackManager.backpackItems = new ArrayList[7];
        BackpackManager.backpackItems[0] = minerItems;
        BackpackManager.backpackItems[1] = diggerItems;
        BackpackManager.backpackItems[2] = foresterItems;
        BackpackManager.backpackItems[3] = hunterItems;
        BackpackManager.backpackItems[4] = adventurerItems;
        BackpackManager.backpackItems[5] = builderItems;
+        BackpackManager.backpackItems[6] = coinItems;
    }

    @Override
@@ -182,6 +188,7 @@ public class PluginStorage extends ForestryPlugin {
        handleBackpackConfig(config, "hunter");
        handleBackpackConfig(config, "adventurer");
        handleBackpackConfig(config, "builder");
+        handleBackpackConfig(config, "coin");

        config.save();

@@ -219,6 +226,7 @@ public class PluginStorage extends ForestryPlugin {
        final BackpackDefinition adventurer = (BackpackDefinition) BackpackManager.definitions.get("adventurer");
        final BackpackDefinition builder = (BackpackDefinition) BackpackManager.definitions.get("builder");
        final BackpackDefinition hunter = (BackpackDefinition) BackpackManager.definitions.get("hunter");
+        final BackpackDefinition coin = (BackpackDefinition) BackpackManager.definitions.get("coin");

        miner.addValidItems(minerItems);
        digger.addValidItems(diggerItems);
@@ -226,6 +234,7 @@ public class PluginStorage extends ForestryPlugin {
        hunter.addValidItems(hunterItems);
        adventurer.addValidItems(adventurerItems);
        builder.addValidItems(builderItems);
+        coin.addValidItems(coinItems);

        final Pattern minerOreDictPattern = Pattern
                .compile("(ore|dust|gem|ingot|nugget|crushed|cluster|denseore)[A-Z].*");
@@ -440,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);
        }
    }

@@ -521,6 +535,7 @@ public class PluginStorage extends ForestryPlugin {
        addBackpackRecipe(items.hunterBackpack, Items.feather);
        addBackpackRecipe(items.adventurerBackpack, Items.bone);
        addBackpackRecipe(items.builderBackpack, Items.clay_ball);
+        addBackpackRecipe(items.coinBackpack, "ingotGold");

        // / CARPENTER
        if (PluginManager.Module.FACTORY.isEnabled()) {
@@ -543,6 +558,7 @@ public class PluginStorage extends ForestryPlugin {
            addT2BackpackRecipe(items.hunterBackpack, items.hunterBackpackT2);
            addT2BackpackRecipe(items.adventurerBackpack, items.adventurerBackpackT2);
            addT2BackpackRecipe(items.builderBackpack, items.builderBackpackT2);
+            addT2BackpackRecipe(items.coinBackpack, items.coinBackpackT2);
        }
    }

@@ -197,8 +197,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                    FlowerManager.FlowerTypeVanilla,
                    FlowerManager.FlowerTypeSnow,
                    FlowerManager.FlowerTypeMushrooms); // Swampflower
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 2, 1.0, FlowerManager.FlowerTypeNether);
-            // //Deathbloom
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers,
                    3,
@@ -248,16 +246,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                    1.0,
                    FlowerManager.FlowerTypeVanilla,
                    FlowerManager.FlowerTypeSnow); // Waterlily
-            FlowerManager.flowerRegistry.registerPlantableFlower(
-                    flowers,
-                    11,
-                    1.0,
-                    FlowerManager.FlowerTypeVanilla,
-                    FlowerManager.FlowerTypeSnow); // EnderLotus (does not actually spawn in the end)
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 12, 1.0, FlowerManager.FlowerTypeCacti); // Bromeliad
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 13, 1.0, FlowerManager.FlowerTypeNether); // EyeBulb
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 14, 1.0, FlowerManager.FlowerTypeNether);
-            // // Unlisted top of the eyebulb
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers,
                    15,
@@ -283,8 +273,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 3, 1.0, FlowerManager.FlowerTypeVanilla); // Lavender
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 4, 1.0, FlowerManager.FlowerTypeVanilla); // Goldenrod
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 5, 1.0, FlowerManager.FlowerTypeVanilla); // Bluebells
-            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 6, 1.0, FlowerManager.FlowerTypeVanilla); // Miner's
-                                                                                                                     // delight
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers2,
                    7,
@@ -148,7 +148,7 @@ public class PluginHarvestCraft extends ForestryPlugin {
                );

        ImmutableList.Builder<String> genericCropsBuilder = ImmutableList.builder();
-        genericCropsBuilder.add("cotton", "rice", "tea", "coffee", "candleberry");
+        genericCropsBuilder.add("cotton", "rice", "tealeaf", "coffeebean", "candleberry");
        genericCropsBuilder.addAll(herbs);
        genericCropsBuilder.addAll(spices);

@@ -281,7 +281,14 @@ public class PluginHarvestCraft extends ForestryPlugin {
        }

        for (String cropName : genericCrops) {
-            ItemStack genericCropSeed = GameRegistry.findItemStack(HC, cropName + "seedItem", 1);
+            String seedName = cropName;
+            // Pam's Tea and Coffee have inconsistent Crop/Seed names, unlike other Pam's crops
+            if (seedName.equals("tealeaf")) {
+                seedName = "tea";
+            } else if (seedName.equals("coffeebean")) {
+                seedName = "coffee";
+            }
+            ItemStack genericCropSeed = GameRegistry.findItemStack(HC, seedName + "seedItem", 1);
            Block genericCropBlock = GameRegistry.findBlock(HC, "pam" + cropName + "Crop");
            if (genericCropSeed != null) {
                RecipeManagers.squeezerManager
@@ -192,14 +192,24 @@ public class BackpackDefinition implements IBackpackDefinition {
        int[] oreIds = OreDictionary.getOreIDs(itemStack);
        for (int oreId : oreIds) {
            if (validOreIds.contains(oreId)) {
-                validItemStacks.add(itemStackStringWild);
+                if (meta != OreDictionary.WILDCARD_VALUE) {
+                    String itemStackString = itemStackStringWild + ':' + meta;
+                    validItemStacks.add(itemStackString);
+                } else {
+                    validItemStacks.add(itemStackStringWild);
+                }
                return true;
            }
        }

        for (Class<?> itemClass : validItemClasses) {
            if (itemClass.isInstance(item)) {
-                validItemStacks.add(itemStackStringWild);
+                if (meta != OreDictionary.WILDCARD_VALUE) {
+                    String itemStackString = itemStackStringWild + ':' + meta;
+                    validItemStacks.add(itemStackString);
+                } else {
+                    validItemStacks.add(itemStackStringWild);
+                }
                return true;
            }
        }
@@ -208,7 +218,12 @@ public class BackpackDefinition implements IBackpackDefinition {
        if (block != null) {
            for (Class<?> blockClass : validBlockClasses) {
                if (blockClass.isInstance(block)) {
-                    validItemStacks.add(itemStackStringWild);
+                    if (meta != OreDictionary.WILDCARD_VALUE) {
+                        String itemStackString = itemStackStringWild + ':' + meta;
+                        validItemStacks.add(itemStackString);
+                    } else {
+                        validItemStacks.add(itemStackStringWild);
+                    }
                    return true;
                }
            }
@@ -37,6 +37,8 @@ public class ItemRegistryStorage extends ItemRegistry {
    public final Item adventurerBackpackT2;
    public final Item builderBackpack;
    public final Item builderBackpackT2;
+    public final Item coinBackpack;
+    public final Item coinBackpackT2;

    public ItemRegistryStorage() {
        // CRATE
@@ -113,5 +115,13 @@ public class ItemRegistryStorage extends ItemRegistry {
        builderBackpackT2 = registerItem(
                BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2),
                "builderBagT2");
+
+        definition = BackpackManager.definitions.get("coin");
+        coinBackpack = registerItem(
+                BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T1),
+                "coinBag");
+        coinBackpackT2 = registerItem(
+                BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2),
+                "coinBagT2");
    }
 }
@@ -0,0 +1,5 @@
+# Forestry Access Transformer configuration file
+public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
+public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
+public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
+public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
@@ -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
@@ -171,6 +171,7 @@ for.gui.imprinter.name=GENOME IMPRINTER
 for.gui.inactive=Inactive
 for.gui.life=Life
 for.gui.lifespan=Lifespan
+for.gui.none=None
 for.gui.normal=Normal
 for.gui.jubilance=Jubilance: %s

@@ -243,6 +244,11 @@ for.gui.noeffect=No effect
 for.gui.owner=Owner
 for.gui.page=Page

+for.gui.search_ingredients=Search Items
+for.gui.search_ingredients.internal_inventory=Internal Inventory
+for.gui.search_ingredients.player_inventory=Player Inventory
+for.gui.search_ingredients.all_inventories=All Inventories
+
 for.gui.pipe.filter.anything=Anything
 for.gui.pipe.filter.bee=Any Bees
 for.gui.pipe.filter.cave=Cave-Dwellers
@@ -336,6 +342,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
@@ -417,6 +424,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

@@ -470,6 +593,9 @@ item.for.adventurerBagT2.name=Adventurer's Woven Backpack
 item.for.ambrosia.name=Ambrosia
 item.for.apatite.name=Apatite

+item.for.coinBag.name=Coiner's Backpack
+item.for.coinBagT2.name=Coiner's Woven Backpack
+
 item.for.apiaristBag.name=Apiarist's Backpack
 item.for.apiaristBoots.name=Apiarist's Shoes
 item.for.apiaristChest.name=Apiarist's Shirt
@@ -484,6 +610,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
@@ -504,6 +631,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
@@ -541,11 +669,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
@@ -576,6 +706,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
@@ -592,6 +723,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
@@ -623,11 +755,15 @@ item.for.naturalistHelmet.name=Spectacles
 item.for.oakStick.name=Impregnated Stick
 item.for.peat.name=Peat
 item.for.phosphor.name=Phosphor
+item.for.phosphoricIodineCapsule.name=Phosphoric Iodine Capsule
 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
@@ -665,6 +801,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
@@ -706,15 +843,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
@@ -723,23 +863,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
@@ -906,6 +1051,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.
@@ -1120,6 +1267,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
@@ -1129,10 +1277,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
@@ -1142,11 +1293,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

 ####################
@@ -1261,8 +1414,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

@@ -1304,10 +1459,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
@@ -1340,15 +1506,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

 ####################
@@ -1402,12 +1572,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

@@ -1415,6 +1587,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
@@ -1473,6 +1648,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

 ####################
@@ -1684,6 +1860,8 @@ for.config.butterfly.entities.maximum=Butterfly Maximum
 for.config.butterfly.entities.maximum.comment=New butterflies will stay in item form and will not take flight once this limit is reached.
 for.config.butterfly.entities.pollination=Butterfly Pollination
 for.config.butterfly.entities.pollination.comment=Allow butterflies to pollinate leaves.
+for.config.butterfly.entities.disable.leaf.spawns=Disable Butterfly Leaf Spawns
+for.config.butterfly.entities.disable.leaf.spawns.comment=Prevent random butterflies from autonomously spawning from Forestry leaves.

 for.config.backpacks.item.stacks.format=Add itemStacks for the %s's backpack here in the format 'modid:name:meta'. For wildcard metadata the format is 'modid:name'.
 for.config.backpacks.ore.dict.format=Add ore dictionary names for the %s's backpack here in the format 'oreDictName'.
@@ -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!
@@ -150,7 +150,7 @@ gui.maxspeed=Mбximo
 gui.fastest=Rбpida++
 gui.faster=Rбpida+
 gui.fast=Rбpida
-gui.slowLenta
+gui.slow=Lenta
 gui.slower=Lenta+
 gui.slowest=Lenta++
 gui.longestlife=Longa++
@@ -241,6 +241,11 @@ for.gui.noeffect=Нет эффекта
 for.gui.owner=Владелец
 for.gui.page=Страница

+for.gui.search_ingredients=Искать предметы
+for.gui.search_ingredients.internal_inventory=Встроенный инвентарь
+for.gui.search_ingredients.player_inventory=Инвентарь игрока
+for.gui.search_ingredients.all_inventories=Все инвентари
+
 for.gui.pipe.filter.anything=Всё
 for.gui.pipe.filter.bee=Любые пчелы
 for.gui.pipe.filter.cave=Пещерные
@@ -45,3 +45,7 @@ ledger.farm.background=2ca22c
 ledger.farm.header=e1c92f
 ledger.farm.subheader=aaafb8
 ledger.farm.text=000000
+
+ledger.search_ingredients.background=ffffff
+ledger.search_ingredients.header=587b96
+ledger.search_ingredients.text=000000
Author	SHA1	Message	Date
Dream Master	43fc136fe3	update	2025-07-18 10:15:39 +07:00
boubou19	ea52fa0d55	Speed up forge event registration (#98 )	2025-07-17 18:49:32 +00:00
Martin Robertz	725d556718	update	2025-07-10 11:11:16 +02:00
Yoshy	d88c007fbb	Add missing = in Localisation (#97 )	2025-07-09 22:28:25 +00:00
Martin Robertz	485333c6aa	update	2025-06-20 23:40:15 +02:00
slprime	240802082e	Change NEIHandler Tooltip Position (#96 )	2025-06-16 07:46:05 +02:00
Martin Robertz	6f182e932d	update	2025-06-03 20:22:19 +02:00
Yurii Martin Robertz boubou19 Maya	d08b42f18c	Protect some calls that lead to loadChunk with blockExists (#91 ) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: boubou19 <[email protected]> Co-authored-by: Maya <[email protected]>	2025-06-01 21:05:22 +00:00
Martin Robertz	57cc915a1e	update	2025-05-25 15:29:38 +02:00
DrParadox7	d7c5940596	Disable flowers that cannot be planted (#94 )	2025-05-25 15:28:01 +02:00
Martin Robertz	79a6af701b	update	2025-05-17 12:17:12 +02:00
dibbydoda	4c0b503b8b	Add thunder substrate for rainmaker (#95 )	2025-05-17 11:39:34 +02:00
thedarkcolour	2a6f3771a3	Fix multiblock components to drop inventory contents when broken (#93 )	2025-04-20 05:39:48 +00:00
Maya	04a7c96b4d	update	2025-04-19 09:19:48 -05:00
dibbydoda	6d0a001b9e	Habitat locator mouse hover shows Hellish temperature in the Nether (#92 )	2025-04-19 09:19:35 -05:00
Maya	e2c2ff8d30	update	2025-03-10 16:18:15 -05:00
Demiu	586f5bf093	Fix alveary climate logic (#90 )	2025-03-10 16:16:16 -05:00
Maya	755301d313	update	2025-02-22 22:50:41 -06:00
Discreater	33f3389b84	Add missing localization (#89 )	2025-02-22 22:50:30 -06:00
Maya	c9167b8316	update	2025-02-14 00:22:07 -06:00
Yannick Marcotte-Gourde	1ed646b147	Don't crash if someone tries to color number values stored in lang files (#88 )	2025-02-14 00:21:59 -06:00
Martin Robertz	7a7930d7eb	update	2024-12-31 14:25:14 +01:00
glowredman	3dccc7e06d	Add Localizations (#87 )	2024-12-30 18:18:18 -06:00
Martin Robertz	18e26956ef	update	2024-12-18 17:51:39 +01:00
combusterfandMarcel Sondaar	713b0f9d9e	fix: Use GT ash instead of letting unification screw everything up. (#86 ) Co-authored-by: Marcel Sondaar <[email protected]>	2024-12-18 07:23:38 +01:00
Martin Robertz	c6f2e3c7b3	update	2024-11-22 21:37:18 +01:00
chochem	c6d8518d82	fix apatite ore crash (#85 )	2024-11-21 17:11:44 +00:00
Dream Master	98711e5d34	update	2024-11-18 12:00:06 +01:00
Glease	5caab59507	close item inventory if parent item is gone (#84 )	2024-11-18 11:38:20 +01:00
Martin Robertz	41d47d99ca	update	2024-11-16 15:40:01 +01:00
Alexander Anishin	3c6d5d04d0	Fix NPE in logic of radioactive effect (#83 )	2024-11-16 12:04:33 +01:00
Martin Robertz	137927b3e6	update	2024-09-12 08:20:39 +02:00
Nico SpiskeandMartin Robertz	8aa7e05bbe	Add ability to display bee lore and add Discoverd by tag (#79 ) * [minor] add ability to display bee lore and add Discoverd by tag * [minor] better formatting, logic for bees, trees and butterflies. * [minor] changes according to review --------- Co-authored-by: Martin Robertz <[email protected]>	2024-09-12 07:34:49 +02:00
chochem	16414da3f2	Remove duplicate items (#82 ) * remove some items if dreamcraft is loaded * sa	2024-09-11 19:27:41 +02:00
NotAPenguinGitHub GTNH Actionsgithub-actions[bot]	11eb4b62df	Fix broken reflection into GT post-renaming (#80 ) * fix reflection * spotlessApply (#81) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-09-08 22:50:17 +02:00
Martin Robertz	a172cb379f	update	2024-08-31 11:27:01 +02:00
Connor-Colenso	c979d1fa79	Fix Alveary Mutation Overflow (#76 )	2024-08-30 15:09:10 +01:00
Astatine5985	ef5825edcf	Bee Mutation Logic Fix (#75 )	2024-08-29 21:55:11 +02:00
Connor-ColensoGitHub GTNH ActionsGTNH-Colen github-actions[bot]	9570cb2982	Change Radioactive Bee Effect (#72 ) * Change up how the radioactive bee works to make it a bit more reasonable. * Remove debug code * Fix the range of bees being off by one block. nextInt is [0,n), so we need to do n+1 to get our boundary included. * Remove unnecessary check, fix alveary block under not using correct y and unprotect other blocks under. Also fix canMineBlock being the wrong way round. * Fix under block protection for non-alvearies * spotlessApply (#73) Co-authored-by: GitHub GTNH Actions <> * Fix condition --------- Co-authored-by: GTNH-Colen <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-06-26 16:49:46 +02:00
Martin Robertz	f89a074393	update	2024-06-22 22:09:49 +02:00
chochem	19457080bf	dont extend the filter to any meta while optimizing (#74 )	2024-06-22 17:30:54 +01:00
Oleg Ivanov	d6ec27209b	Add ingredients search setting to the worktable (#70 )	2024-05-26 16:03:16 +02:00
Martin Robertz	a0435886ab	update	2024-05-26 12:52:39 +02:00
Ethryan	2ab8613bec	Adding a Coin Bag for all those coins. (#71 )	2024-05-26 12:48:21 +02:00
Martin Robertz	9d31dedd35	update	2024-05-04 11:43:39 +02:00
slprime	2dd539c3df	NEI incorrect tooltip with search	2024-05-04 11:38:09 +02:00
Martin Robertz	fd2ac7d172	update	2024-04-16 22:22:28 +02:00
NotAPenguin	466110d461	Fix wrong length check (#68 )	2024-04-15 17:47:49 +01:00
Martin Robertz	ecf0d7165c	update	2024-03-27 09:49:21 +01:00
DrParadox7	dde3514dce	Add Butterfly Leaf Spawn Config (#67 ) Added `butterfly.entities.disable.leaf.spawns` config to Lepidopterology.cfg. When set to _True_, it will stop any butterfly from spontaneously spawning from Forestry's leaves [_False_ by default]. Pregnant butterflies remain unaffected for fans of the hobby.	2024-03-26 18:14:34 -07:00
Martin Robertz	0f24a4e043	update	2024-03-04 20:29:49 +01:00
leumasme	3ed2ecfdd0	Fix multifarm not harvesting coffee and tea Also fixes fermenter recipes for these crops	2024-03-04 16:50:39 +01:00