backdate

(cherry picked from commit 18e26956ef)

.gitignore

@@ -30,4 +30,3 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
-layout.json

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    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')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.52-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = Forestry
 modGroup = forestry
 
 # Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -80,7 +80,7 @@ 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 = forestry_at.cfg
+accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
@@ -151,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: UniMixins is automatically set as a required dependency if usesMixins = true.
+# Note: GTNH Mixins 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.

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,7 +86,8 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_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.

settings.gradle

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

src/main/java/forestry/api/core/IClimateControlled.java

@@ -12,15 +12,11 @@ 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);
 }

src/main/java/forestry/api/fuels/RainSubstrate.java

@@ -9,37 +9,33 @@ 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 weather event triggered by this substrate in Minecraft ticks.
+     * Duration of the rain shower 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 RainSubstrate(ItemStack item, float speed, WeatherState weather) {
-        this(item, 0, speed, weather);
+    public boolean reverse;
+
+    public RainSubstrate(ItemStack item, int duration, float speed) {
+        this(item, duration, speed, false);
     }
 
-    public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
+    public RainSubstrate(ItemStack item, float speed) {
+        this(item, 0, speed, true);
+    }
+
+    public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
         this.item = item;
         this.duration = duration;
         this.speed = speed;
-        this.weather = weather;
+        this.reverse = reverse;
     }
 }

src/main/java/forestry/api/multiblock/IAlvearyComponent.java

@@ -49,14 +49,6 @@ 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;
-        }
     }
 
     /**

src/main/java/forestry/api/multiblock/IMultiblockComponent.java

@@ -9,8 +9,6 @@ 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.
  */
@@ -47,15 +45,4 @@ 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();
-    }
 }

src/main/java/forestry/apiculture/flowers/FlowerRegistry.java

@@ -213,7 +213,6 @@ 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;

src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java

@@ -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.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
+        if (!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.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
+        if (!world.isAirBlock(x, y, z)) {
             return false;
         }
 

src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java

@@ -34,10 +34,6 @@ 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;

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

@@ -773,9 +773,6 @@ 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) {

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

@@ -27,10 +27,6 @@ public abstract class AlleleEffectThrottled extends AlleleEffect {
         this.requiresWorkingQueen = requiresWorking;
     }
 
-    public int getThrottle() {
-        return throttle;
-    }
-
     @Override
     public boolean isCombinable() {
         return isCombinable;

src/main/java/forestry/apiculture/items/ItemHabitatLocator.java

@@ -71,8 +71,9 @@ 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);
 
-        EnumTemperature temperature = EnumTemperature
-                .getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
+        float temperatureValue = currentBiome
+                .getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
+        EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
         EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);
 
         list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -9,10 +9,8 @@
 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;
@@ -61,9 +59,7 @@ 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 TreeSet<>(
-            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
-                    .reversed());
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
     private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
 
     // CLIENT
@@ -237,24 +233,26 @@ 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 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);
+    private static float equalizeChange(float change) {
+        if (change == 0) {
+            return 0;
         }
+
+        change *= 0.95f;
+        if (change <= 0.001f && change >= -0.001f) {
+            change = 0;
+        }
+        return change;
     }
 
     @Override
@@ -412,13 +410,19 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         ChunkCoordinates coordinates = getCoordinates();
 
         float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
+
+        tempChange += change;
+        tempChange = Math.max(boundaryDown - temperature, tempChange);
+        tempChange = Math.min(boundaryUp - temperature, tempChange);
     }
 
     @Override
     public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
         float humidity = getBiome().rainfall;
-        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
+
+        humidChange += change;
+        humidChange = Math.max(boundaryDown - humidity, humidChange);
+        humidChange = Math.min(boundaryUp - humidity, humidChange);
     }
 
     /* GUI */

src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java

@@ -19,7 +19,6 @@ 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;
@@ -32,8 +31,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, IMultiblockComponent.HasInventory {
+public class TileAlvearyHygroregulator extends TileAlveary
+        implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
 
     private final HygroregulatorRecipe[] recipes;
 
@@ -57,9 +56,9 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
         this.tankManager = new TankManager(this, liquidTank);
 
         this.recipes = new HygroregulatorRecipe[] {
-                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) };
+                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) };
     }
 
     @Override
@@ -112,11 +111,6 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
         }
     }
 
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java

@@ -18,7 +18,6 @@ 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;
@@ -26,8 +25,7 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;
 
-public class TileAlvearySieve extends TileAlveary
-        implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {
+public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
 
     private final IBeeListener beeListener;
     private final InventoryAlvearySieve inventory;

src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java

@@ -22,7 +22,6 @@ 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;
@@ -38,8 +37,7 @@ 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, IMultiblockComponent.HasInventory {
+public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
 
     private final InventorySwarmer inventory;
     private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();

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

@@ -1148,14 +1148,6 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
         return species.getUID();
     }
 
-    public EnumWoodType getWoodType() {
-        return woodType;
-    }
-
-    public ItemStack getVanillaWood() {
-        return vanillaWood;
-    }
-
     @Override
     public final ITreeGenome getGenome() {
         return genome;

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

@@ -116,12 +116,6 @@ 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);
     }

src/main/java/forestry/core/config/Constants.java

@@ -109,7 +109,6 @@ 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;

src/main/java/forestry/core/genetics/mutations/Mutation.java

@@ -176,8 +176,4 @@ public abstract class Mutation implements IMutationCustom {
     public boolean isSecret() {
         return isSecret;
     }
-
-    public List<IMutationCondition> getMutationConditions() {
-        return mutationConditions;
-    }
 }

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

@@ -31,7 +31,7 @@ public class ItemForestryTool extends ItemForestry {
         setMaxDamage(200);
         this.remnants = remnants;
         if (remnants != null) {
-            MinecraftForge.EVENT_BUS.register(new EventHandler());
+            MinecraftForge.EVENT_BUS.register(this);
         }
     }
 
@@ -53,6 +53,20 @@ 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) {
@@ -66,21 +80,4 @@ 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);
-            }
-        }
-    }
 }

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

@@ -78,7 +78,6 @@ public class ItemRegistryCore extends ItemRegistry {
     /* Rainmaker */
     public final ItemForestry iodineCharge;
     public final ItemForestry phosphor;
-    public final ItemForestry phosphorCharge;
 
     /* Misc */
     public final ItemCraftingMaterial craftingMaterial;
@@ -182,8 +181,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");

src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java

@@ -112,12 +112,18 @@ 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.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
-            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
+
+            if (recipeIndex >= 0) {
+                Point offset = guiRecipe.getRecipePosition(recipeIndex);
+                Point relMouse = new Point(
+                        mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                        mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+                currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            }
         }
 
         return currenttip;
@@ -129,10 +135,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         Point mouse = GuiDraw.getMousePosition();
-        Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
+        int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
 
-        return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
+        if (recipeIndex >= 0) {
+            Point offset = guiRecipe.getRecipePosition(recipeIndex);
+            Point relMouse = new Point(
+                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+            currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
+        }
+
+        return currenttip;
     }
 
     public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
@@ -196,9 +210,11 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
 
     protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
-        Point mouse = GuiDraw.getMousePosition();
+        Point mousepos = GuiDraw.getMousePosition();
         Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
+        Point relMouse = new Point(
+                mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
+                mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
 
         if (crecipe.getFluidTanks() != null) {
             for (PositionedFluidTank tank : crecipe.getFluidTanks()) {

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

@@ -37,8 +37,7 @@ 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").replaceAll("§\\d", ""));
+            int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
             for (int i = 1; i <= levelCount; i++) {
                 String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
                 researchNotes.put(notesLevel, note);

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

@@ -96,8 +96,6 @@ 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) {

src/main/java/forestry/factory/inventory/InventoryRainmaker.java

@@ -26,14 +26,16 @@ 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);
-                return tile.isValidSubstrate(substrate);
+                if (tile.getWorld().isRaining() && substrate.reverse) {
+                    return true;
+                } else if (!tile.getWorld().isRaining() && !substrate.reverse) {
+                    return true;
+                }
             }
         }
+
         return false;
     }
 

src/main/java/forestry/factory/tiles/TileMillRainmaker.java

@@ -10,7 +10,6 @@ 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;
@@ -21,7 +20,7 @@ import forestry.factory.inventory.InventoryRainmaker;
 public class TileMillRainmaker extends TileMill {
 
     private int duration;
-    private RainSubstrate.WeatherState weather;
+    private boolean reverse;
 
     public TileMillRainmaker() {
         super(null);
@@ -40,9 +39,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 && progress == 0) {
+        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
             RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
-            if (isValidSubstrate(substrate)) {
+            if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
                 addCharge(substrate);
                 player.inventory.getCurrentItem().stackSize--;
             }
@@ -50,17 +49,6 @@ 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);
@@ -69,7 +57,7 @@ public class TileMillRainmaker extends TileMill {
         progress = nbttagcompound.getFloat("Progress");
         stage = nbttagcompound.getInteger("Stage");
         duration = nbttagcompound.getInteger("Duration");
-        weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
+        reverse = nbttagcompound.getBoolean("Reverse");
     }
 
     @Override
@@ -80,14 +68,14 @@ public class TileMillRainmaker extends TileMill {
         nbttagcompound.setFloat("Progress", progress);
         nbttagcompound.setInteger("Stage", stage);
         nbttagcompound.setInteger("Duration", duration);
-        nbttagcompound.setString("Weather", weather.name());
+        nbttagcompound.setBoolean("Reverse", reverse);
     }
 
     public void addCharge(RainSubstrate substrate) {
         charge = 1;
         speed = substrate.speed;
         duration = substrate.duration;
-        weather = substrate.weather;
+        reverse = substrate.reverse;
         sendNetworkUpdate();
     }
 
@@ -115,26 +103,15 @@ public class TileMillRainmaker extends TileMill {
         }
 
         if (!worldObj.isRemote) {
-            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;
+            if (reverse) {
+                worldObj.getWorldInfo().setRaining(false);
+            } else {
+                worldObj.getWorldInfo().setRaining(true);
+                worldObj.getWorldInfo().setRainTime(duration);
             }
             charge = 0;
             duration = 0;
+            reverse = false;
             sendNetworkUpdate();
         }
     }

src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java

@@ -18,10 +18,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import com.mojang.realmsclient.gui.ChatFormatting;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
@@ -92,7 +93,7 @@ public class ItemButterflyGE extends ItemGE {
     @Override
     public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
         super.addInformation(itemstack, player, list, flag);
-        if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(EnumChatFormatting.RED + "Disabled");
+        if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(ChatFormatting.RED + "Disabled");
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })

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

@@ -222,23 +222,9 @@ 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(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));
+                .put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
+        FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
 
         for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
             MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -608,15 +594,6 @@ 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

src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java

@@ -197,6 +197,8 @@ 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,
@@ -246,8 +248,16 @@ 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,
@@ -273,6 +283,8 @@ 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,

src/main/resources/META-INF/forestry_at.cfg

@@ -1,5 +0,0 @@
-# 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

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

@@ -171,7 +171,6 @@ 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
 
@@ -424,122 +423,6 @@ 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
 
@@ -610,7 +493,6 @@ 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
@@ -631,7 +513,6 @@ 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
@@ -669,13 +550,11 @@ 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
@@ -706,7 +585,6 @@ 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
@@ -723,7 +601,6 @@ 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
@@ -755,15 +632,11 @@ 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
@@ -801,7 +674,6 @@ 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
@@ -843,18 +715,15 @@ 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
@@ -863,28 +732,23 @@ 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
@@ -1051,8 +915,6 @@ 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.
@@ -1267,7 +1129,6 @@ 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
@@ -1277,13 +1138,10 @@ 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
@@ -1293,13 +1151,11 @@ 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
 
 ####################
@@ -1414,10 +1270,8 @@ 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
 
@@ -1459,21 +1313,10 @@ 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
@@ -1506,19 +1349,15 @@ 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
 
 ####################
@@ -1572,14 +1411,12 @@ 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
 
@@ -1587,9 +1424,6 @@ 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
@@ -1648,7 +1482,6 @@ item.for.butterfly.name=Butterfly
 item.for.flutterlyzer.name=Flutterlyzer
 item.for.lepidopteristBag.name=Lepidopterist's Backpack
 item.for.moth.name=Moth
-tile.for.lepidopterology.name=Lepidopterist's Chest
 tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################

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

@@ -150,7 +150,7 @@ gui.maxspeed=Mбximo
 gui.fastest=Rбpida++
 gui.faster=Rбpida+
 gui.fast=Rбpida
-gui.slow=Lenta
+gui.slowLenta
 gui.slower=Lenta+
 gui.slowest=Lenta++
 gui.longestlife=Longa++