update deps

Co-authored-by: GitHub GTNH Actions <>

.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-beta40:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2: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.
@@ -85,11 +85,6 @@ accessTransformersFile =
 # 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
 
@@ -122,15 +117,9 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, 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.

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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -86,7 +84,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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +203,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.

gradlew.bat

@@ -13,8 +13,6 @@
 @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 ##########################################################################

settings.gradle

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

src/main/java/forestry/Forestry.java

@@ -15,7 +15,6 @@ 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;
@@ -80,15 +79,11 @@ public class Forestry {
 
     public static PacketHandler packetHandler;
 
-    public static boolean isDreamcraftLoaded;
-
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         checkForCoFHLib();
         packetHandler = new PacketHandler();
 
-        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
-
         // Register event handler
         EventHandlerCore eventHandlerCore = new EventHandlerCore();
         MinecraftForge.EVENT_BUS.register(eventHandlerCore);

src/main/java/forestry/api/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/genetics/IIndividual.java

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

src/main/java/forestry/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/apiculture/genetics/Bee.java

@@ -18,8 +18,6 @@ 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;
@@ -378,36 +376,6 @@ 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) {
 

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

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

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

@@ -51,8 +51,12 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
         IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
         IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
 
-        processedChance = safeMultiply(processedChance, beeHousingModifier.getMutationModifier(genome0, genome1, 1.0F));
-        processedChance = safeMultiply(processedChance, beeModeModifier.getMutationModifier(genome0, genome1, 1.0F));
+        processedChance = safeMultiply(
+                processedChance,
+                beeHousingModifier.getMutationModifier(genome0, genome1, processedChance));
+        processedChance = safeMultiply(
+                processedChance,
+                beeModeModifier.getMutationModifier(genome0, genome1, processedChance));
 
         return processedChance;
     }

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

@@ -13,7 +13,6 @@ 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;
@@ -108,8 +107,11 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
             }
 
             // 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)) {
+            if (!world.canMineBlock(
+                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
+                    posHousing.x,
+                    posHousing.y,
+                    posHousing.z)) {
                 continue;
             }
 

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

@@ -56,9 +56,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.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
@@ -111,11 +111,6 @@ public class TileAlvearyHygroregulator extends TileAlveary
         }
     }
 
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

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

@@ -16,8 +16,6 @@ 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;
@@ -300,36 +298,6 @@ public class Tree extends Individual implements ITree, IPlantable {
         return plantTypes;
     }
 
-    @Override
-    public void addLore(List<String> text) {
-        IAlleleTreeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
-                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
-                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
-                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
-                text.addAll(formattedLoreList);
-            }
-        }
-    }
-
-    @Override
-    public void addDiscoveredBy(List<String> text) {
-        IAlleleTreeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                text.add("");
-                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
-            }
-        }
-    }
-
     @Override
     public void addTooltip(List<String> list) {
 

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

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.core.blocks;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -54,7 +52,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 && !isDreamcraftLoaded) {
+        if (metadata == 0) {
             this.dropXpOnBlockBreak(world, x, y, z, MathHelper.getRandomIntegerInRange(world.rand, 1, 4));
         }
     }
@@ -63,7 +61,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() && !isDreamcraftLoaded) {
+        if (metadata == ResourceType.APATITE.ordinal()) {
             int fortuneModifier = world.rand.nextInt(fortune + 2) - 1;
             if (fortuneModifier < 0) {
                 fortuneModifier = 0;

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

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

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

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

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

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

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

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

src/main/java/forestry/core/proxy/ProxyCommon.java

@@ -61,10 +61,6 @@ 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);
     }

src/main/java/forestry/core/proxy/ProxyCommonClient.java

@@ -63,11 +63,6 @@ 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);

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/BlockUtil.java

@@ -241,16 +241,16 @@ public abstract class BlockUtil {
         if (bw) try {
             // noinspection unchecked
             BW_MetaGenerated_WerkstoffBlocksClass = (Class<? extends Block>) Class
-                    .forName("bartworks.system.material.BWMetaGeneratedWerkstoffBlocks");
-            BWBlocks = (Block) Class.forName("bartworks.system.material.WerkstoffLoader").getField("BWBlocks")
-                    .get(null);
+                    .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);
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }
         if (gt) try {
             // noinspection unchecked
-            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.BlockMachines");
-            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTechAPI").getField("sBlockMachines").get(null);
+            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);
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }

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

@@ -1,30 +1,29 @@
 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));
+        if (a > 0 && b > 0 && a > Float.MAX_VALUE / b) {
+            return Float.MAX_VALUE;
+        } else if (a > 0 && b < 0 && a > Float.MIN_VALUE / b) {
+            return Float.MIN_VALUE;
+        } else if (a < 0 && b > 0 && a < Float.MIN_VALUE / b) {
+            return Float.MIN_VALUE;
+        } else if (a < 0 && b < 0 && a < Float.MAX_VALUE / b) {
+            return Float.MAX_VALUE;
+        } else {
+            return a * b;
+        }
     }
 
     public static float safeAdd(float a, float b) {
-        BigDecimal bigA = BigDecimal.valueOf(a);
-        BigDecimal bigB = BigDecimal.valueOf(b);
-        return clampToFloatRange(bigA.add(bigB));
+        if (a > 0 && b > 0 && a > Float.MAX_VALUE - b) {
+            return Float.MAX_VALUE;
+        } else if (a < 0 && b < 0 && a < Float.MIN_VALUE - b) {
+            return Float.MIN_VALUE;
+        } else {
+            return a + b;
+        }
     }
+
 }

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

@@ -78,7 +78,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
                 return i;
             }
 
-            if (waste.getItem() != PluginCore.items.getAsh().getItem()) {
+            if (waste.getItem() != PluginCore.items.ash) {
                 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.getAsh());
+                inventory.setInventorySlotContents(wasteSlot, PluginCore.items.ash.getItemStack());
             } else {
                 inventory.getStackInSlot(wasteSlot).stackSize++;
             }

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

@@ -14,8 +14,6 @@ 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;
@@ -62,36 +60,6 @@ public class Butterfly extends IndividualLiving implements IButterfly {
         this.genome = genome;
     }
 
-    @Override
-    public void addLore(List<String> text) {
-        IAlleleButterflySpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
-                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
-                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
-                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
-                text.addAll(formattedLoreList);
-            }
-        }
-    }
-
-    @Override
-    public void addDiscoveredBy(List<String> text) {
-        IAlleleButterflySpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                text.add("");
-                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
-            }
-        }
-    }
-
     @Override
     public void addTooltip(List<String> list) {
         IAlleleButterflySpecies primary = genome.getPrimary();

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

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.plugins;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import java.util.ArrayList;
 
 import net.minecraft.command.ICommand;
@@ -134,16 +132,14 @@ 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.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");
-        }
+        crateRegistry.registerCrate(items.ash, "cratedAsh");
+        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");
@@ -199,15 +195,10 @@ public class PluginCore extends ForestryPlugin {
     protected void registerRecipes() {
 
         /* SMELTING RECIPES */
-        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);
+        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);
 
         /* BRONZE INGOTS */
         if (Config.isCraftingBronzeEnabled()) {
@@ -391,43 +382,41 @@ public class PluginCore extends ForestryPlugin {
                 new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE));
 
         // Storage Blocks
-        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.APATITE),
+                "###",
+                "###",
+                "###",
+                '#',
+                "gemApatite");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotCopper");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotCopper");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotTin");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotTin");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotBronze");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
-        }
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotBronze");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
     }
 
     @Override

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

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

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

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

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

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

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

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

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

@@ -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
 
@@ -342,7 +341,6 @@ 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
@@ -424,122 +422,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 +492,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 +512,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 +549,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 +584,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 +600,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
@@ -757,12 +633,9 @@ item.for.peat.name=Peat
 item.for.phosphor.name=Phosphor
 item.for.pipette.name=Pipette
 
-item.for.pollenFertile.name=Fertile Pollen
-item.for.pollen.name=Pollen Cluster
 item.for.pollen.crystalline.name=Crystalline Pollen Cluster
 item.for.pollen.normal.name=Pollen Cluster
 
-item.for.propolis.name=Propolis
 item.for.propolis.normal.name=Propolis
 item.for.propolis.pulsating.name=Pulsating Propolis
 item.for.propolis.silky.name=Silky Propolis
@@ -800,7 +673,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
@@ -842,18 +714,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
@@ -862,28 +731,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
@@ -1050,8 +914,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.
@@ -1266,7 +1128,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
@@ -1276,13 +1137,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
@@ -1292,13 +1150,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
 
 ####################
@@ -1413,10 +1269,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
 
@@ -1458,21 +1312,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
@@ -1505,19 +1348,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
 
 ####################
@@ -1571,14 +1410,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
 
@@ -1586,9 +1423,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
@@ -1647,7 +1481,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/no_NO.lang

@@ -244,7 +244,6 @@ 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!