fix(doors): up max stack size from 1 to 8

Align Max stack size to 8 same as MC Door Item.

.gitignore

@@ -4,6 +4,7 @@
 /run
 /eclipse
 /out
+/classes
 .idea
 *.iml
 *.ipr
@@ -16,3 +17,4 @@
 /usernamecache.json
 
 changelog.html
+*.bat

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
         maven {
             name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            url = "https://files.minecraftforge.net/maven"
         }
         maven {
             name = "sonatype"
@@ -19,15 +19,18 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.matthewprenger.cursegradle" version "1.0.6"
+}
 apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
 apply plugin: 'forge'
 
-version = "2.0.21"
+version = "2.0.26"
 if (System.getenv("BUILD_NUMBER") != null) {
-    version = version + "-" + System.getenv("BUILD_NUMBER")
+    version = version + "." + System.getenv("BUILD_NUMBER")
 }
 group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "binnie-mods-1.7.10"
+archivesBaseName = "binnie-mods-1.7.10-gtnh"
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
@@ -66,3 +69,23 @@ task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask
     toRef =  "HEAD"
     templateContent = file('changelog.mustache').getText('UTF-8')
 }
+
+curseforge {
+    apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
+    project {
+        id = '223525'
+        changelog = file('changelog.html')
+        changelogType = 'html'
+        releaseType = 'release'
+        relations {
+            requiredLibrary 'forestry'
+            incompatible 'binnie-fix'
+            incompatible 'binniepatcher'
+            incompatible 'more-binnie-fixes'
+        }
+    }
+}
+
+afterEvaluate {
+    tasks.curseforge223525.dependsOn.add(gitChangelogTask)
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,90 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/binnie/core/block/TileEntityMetadata.java

@@ -74,12 +74,8 @@ public class TileEntityMetadata extends TileEntity {
 	}
 
 	public static ItemStack getItemStack(Block block, int damage) {
-		NBTTagCompound tag = new NBTTagCompound();
-		tag.setInteger("meta", damage);
-
 		ItemStack item = new ItemStack(block, 1, 0);
-		item.setItemDamage((damage < 16387) ? damage : 16387);
-		item.setTagCompound(tag);
+		item.setItemDamage(Math.min(damage, 16387));
 		return item;
 	}
 

src/main/java/binnie/core/craftgui/WindowFieldKit.java

@@ -213,6 +213,10 @@ public class WindowFieldKit extends Window {
 		super.onWindowInventoryChanged();
 		if (isServer()) {
 			ItemStack kit = getPlayer().getHeldItem();
+			if(kit == null || !kit.getItem().equals(BinnieCore.fieldKit)) {
+				return;
+			}
+
 			int sheets = 64 - kit.getItemDamage();
 			int size = (getWindowInventory().getStackInSlot(1) == null) ? 0 : getWindowInventory().getStackInSlot(1).stackSize;
 			if (sheets != size) {

src/main/java/binnie/extratrees/block/BlockETLog.java

@@ -128,7 +128,11 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
 	@Override
 	public String getBlockName(ItemStack itemStack) {
 		int meta = TileEntityMetadata.getItemDamage(itemStack);
-		return I18N.localise("extratrees.block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
+		ILogType.ExtraTreeLog[] logs= ILogType.ExtraTreeLog.values();
+		if(meta < 0 || meta >= logs.length) {
+			meta = 0;
+		}
+		return I18N.localise("extratrees.block.log.name", logs[meta].getName());
 	}
 
 	@Override

src/main/java/binnie/extratrees/block/ILogType.java

@@ -1,19 +1,22 @@
 package binnie.extratrees.block;
 
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+import forestry.api.arboriculture.EnumWoodType;
+import forestry.api.arboriculture.TreeManager;
+import forestry.arboriculture.worldgen.BlockTypeLog;
+
 import binnie.core.block.TileEntityMetadata;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.api.IDesignMaterial;
 import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.api.arboriculture.EnumWoodType;
-import forestry.api.arboriculture.TreeManager;
-import forestry.arboriculture.worldgen.BlockTypeLog;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public interface ILogType {
 	void placeBlock(World p0, int p1, int p2, int p3);

src/main/java/binnie/extratrees/block/ItemETDoor.java

@@ -17,7 +17,7 @@ import net.minecraft.world.World;
 public class ItemETDoor extends ItemMetadata {
 	public ItemETDoor(Block block) {
 		super(block);
-		maxStackSize = 1;
+		maxStackSize = 8;
 		setCreativeTab(CreativeTabs.tabRedstone);
 	}
 

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -313,7 +313,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
 	@Override
 	public String getDescription() {
-		return I18N.localise("extratrees.item.food." + name().toLowerCase());
+		return "extratrees.item.food." + name().toLowerCase();
 	}
 
 	@Override
@@ -375,7 +375,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
 		float modeYieldMod = 1.0f;
 		for (Map.Entry<ItemStack, Float> entry2 : products.entrySet()) {
-			if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) {
+			if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * stage) {
 				product2.add(entry2.getKey().copy());
 			}
 		}
@@ -418,7 +418,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
 	@Override
 	public String getName() {
-		return getDescription();
+		return I18N.localise("for." + getDescription());
 	}
 
 	public String getNameOfFruit() {

src/main/java/binnie/extratrees/item/Food.java

@@ -89,7 +89,6 @@ public enum Food implements IItemMisc {
 		ores = new ArrayList<>();
 		this.hunger = hunger;
 	}
-
 	public static void registerOreDictionary() {
 		Food.Crabapple.ore("Apple").ore("Crabapple");
 		Food.Orange.ore("Orange");
@@ -131,6 +130,25 @@ public enum Food implements IItemMisc {
 		Food.Coffee.ore("Coffee");
 		Food.OsangeOrange.ore("OsangeOrange");
 		Food.Clove.ore("Clove");
+		Food.Papayimar.ore("Papayimar");
+		Food.Blackcurrant.ore("Blackcurrant");
+		Food.Redcurrant.ore("Redcurrant");
+		Food.Blackberry.ore("Blackberry");
+		Food.Raspberry.ore("Raspberry");
+		Food.Blueberry.ore("Blueberry");
+		Food.Cranberry.ore("Cranberry");
+		Food.Juniper.ore("Juniper");
+		Food.Gooseberry.ore("Gooseberry");
+		Food.GoldenRaspberry.ore("GoldenRaspberry");
+		Food.Coconut.ore("Coconut");
+		Food.Cashew.ore("Cashew");
+		Food.Avacado.ore("Avacado");
+		Food.Nutmeg.ore("Nutmeg");
+		Food.Chilli.ore("Chilli");
+		Food.StarAnise.ore("StarAnise");
+		Food.Mango.ore("Mango");
+		Food.Starfruit.ore("Starfruit");
+		Food.Candlenut.ore("Candlenut");
 	}
 
 	public boolean isEdible() {
@@ -148,7 +166,7 @@ public enum Food implements IItemMisc {
 
 	@Override
 	public String getName(ItemStack itemStack) {
-		return I18N.localise("extratrees.item.food." + name().toLowerCase());
+		return I18N.localise("for.extratrees.item.food." + name().toLowerCase());
 	}
 
 	@Override

src/main/java/binnie/genetics/gui/AnalystPageDatabase.java

@@ -53,7 +53,7 @@ public class AnalystPageDatabase extends ControlAnalystPage {
 				Collection<IAlleleSpecies> options = new ArrayList<>();
 				getSpecies(system);
 				for (IAlleleSpecies species : getSpecies(system)) {
-					if (value != null && value.isEmpty() && !species.getName().toLowerCase().contains(value.toLowerCase())) {
+					if (value != null && !value.isEmpty() && !species.getName().toLowerCase().contains(value.toLowerCase())) {
 						continue;
 					}
 					options.add(species);

src/main/resources/assets/extratrees/lang/en_GB.lang

@@ -1,14 +1,429 @@
-extratrees.machine.machine.press.info=The Press squeezes fruit to give various fruit juices. It can be powered or run manually by right clicking.
-extratrees.machine.machine.lumbermill.info=The Lumbermill converts logs into planks at an increased rate, as well as giving by-products such as sawdust and bark.
 
+extratrees.machine.kitchen.bar=Bar
+extratrees.machine.kitchen.bottleRack=Bottle Rack
+
+extratrees.machine.machine.brewery=Brewery
+extratrees.machine.machine.brewery.info=The Brewery uses yeasts, juices and grains to make many kinds of Wines and Beers.
+extratrees.machine.machine.distillery=Distillery
+extratrees.machine.machine.distillery.info=The Distillery can single, double or triple distill certain alcohols to give brandies, liquors and other spirits.
+extratrees.machine.machine.nursery=Nursery
+extratrees.machine.machine.press=Fruit Press
+extratrees.machine.machine.press.info=The Press squeezes fruit to give various fruit juices. It can be powered or run manually by right clicking.
+
+extratrees.machine.machine.lumbermill=Lumbermill
+extratrees.machine.machine.lumbermill.info=The Lumbermill converts logs into planks at an increased rate, as well as giving by-products such as sawdust and bark.
+extratrees.machine.lumbermill.logs=Logs
+extratrees.machine.lumbermill.error.noWood=No Wood
+extratrees.machine.lumbermill.error.noRoom=No room for new planks
+extratrees.machine.lumbermill.error.noWater=Not Enough Water
+
+extratrees.machine.machine.woodworker=Woodworker
+extratrees.machine.machine.woodworker.info=The Woodworker creates patterned wooden tiles from two different woods.
+extratrees.machine.woodworker.material=Wooden Plank
+
+extratrees.machine.machine.panelworker=Panelworker
+extratrees.machine.machine.panelworker.info=The Panelworker creates patterned wooden panels from two different woods.
+extratrees.machine.panelworker.material=Wooden Plank
+
+extratrees.machine.machine.glassworker=Glassworker
+extratrees.machine.machine.glassworker.info=The Glassworker creates patterned stained glass.
+extratrees.machine.glassworker.material=Glass
+
+extratrees.machine.machine.tileworker=Tileworker
+extratrees.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles.
+extratrees.machine.tileworker.material=Ceramic Block
+
+extratrees.machine.worker.error.glueRequired=Requires Adhesive to Function
+
+extratrees.block.planks.fir=Fir
+extratrees.block.planks.cedar=Cedar
+extratrees.block.planks.hemlock=Hemlock
+extratrees.block.planks.cypress=Cypress
+extratrees.block.planks.fig=Fig
+extratrees.block.planks.beech=Beech
+extratrees.block.planks.alder=Alder
+extratrees.block.planks.hazel=Hazel
+extratrees.block.planks.hornbeam=Hornbeam
+extratrees.block.planks.box=Box
+extratrees.block.planks.butternut=Butternut
+extratrees.block.planks.hickory=Hickory
+extratrees.block.planks.whitebeam=Whitebeam
+extratrees.block.planks.elm=Elm
+extratrees.block.planks.apple=Apple
+extratrees.block.planks.yew=Yew
+extratrees.block.planks.pear=Pear
+extratrees.block.planks.hawthorn=Hawthorn
+extratrees.block.planks.rowan=Rowan
+extratrees.block.planks.elder=Elder
+extratrees.block.planks.maclura=Maclura
+extratrees.block.planks.syzgium=Syzgium
+extratrees.block.planks.brazilwood=Brazilwood
+extratrees.block.planks.logwood=Logwood
+extratrees.block.planks.iroko=Iroko
+extratrees.block.planks.locust=Locust
+extratrees.block.planks.eucalyptus=Eucalyptus
+extratrees.block.planks.purpleheart=Purpleheart
+extratrees.block.planks.ash=Ash
+extratrees.block.planks.holly=Holly
+extratrees.block.planks.olive=Olive
+extratrees.block.planks.sweetgum=Sweetgum
+extratrees.block.planks.rosewood=Rosewood
+extratrees.block.planks.gingko=Gingko
+extratrees.block.planks.pinkivory=Pink Ivory
+extratrees.block.planks.cherry=Cherry
+extratrees.block.planks.banana=Banana
+extratrees.block.planks.cinnamon=Cinnamon
+extratrees.block.planks.vanilla.oak=Oak
+extratrees.block.planks.vanilla.spruce=Spruce
+extratrees.block.planks.vanilla.birch=Birch
+extratrees.block.planks.vanilla.jungle=Jungle
+extratrees.block.planks.vanilla.darkoak=Dark Oak
+extratrees.block.planks.vanilla.acacia=Acacia
+
+extratrees.block.planks.forestry.larch=Larch
+extratrees.block.planks.forestry.teak=Teak
+extratrees.block.planks.forestry.acacia=Desert Acacia
+extratrees.block.planks.forestry.lime=Lime
+extratrees.block.planks.forestry.chestnut=Chestnut
+extratrees.block.planks.forestry.wenge=Wenge
+extratrees.block.planks.forestry.baobab=Baobab
+extratrees.block.planks.forestry.sequoia=Sequoia
+extratrees.block.planks.forestry.kapok=Kapok
+extratrees.block.planks.forestry.ebony=Ebony
+extratrees.block.planks.forestry.mahogany=Mahogany
+extratrees.block.planks.forestry.balsa=Balsa
+extratrees.block.planks.forestry.willow=Willow
+extratrees.block.planks.forestry.walnut=Walnut
+extratrees.block.planks.forestry.greenheart=Greenheart
+extratrees.block.planks.forestry.cherry=Cherry
+extratrees.block.planks.forestry.mahoe=Mahoe
+extratrees.block.planks.forestry.poplar=Poplar
+extratrees.block.planks.forestry.palm=Palm
+extratrees.block.planks.forestry.papaya=Papaya
+extratrees.block.planks.forestry.pine=Pine
+extratrees.block.planks.forestry.plum=Plum
+extratrees.block.planks.forestry.maple=Maple
+extratrees.block.planks.forestry.citrus=Citrus
+extratrees.block.planks.forestry.giganteum=Giant Sequoia
+extratrees.block.planks.forestry.ipe=Ipe
+extratrees.block.planks.forestry.padauk=Padauk
+extratrees.block.planks.forestry.cocobolo=Cocobolo
+extratrees.block.planks.forestry.zebrawood=Zebrawood
+
+extratrees.block.planks.ebxl.redwood=Redwood
+extratrees.block.planks.ebxl.fir=Scottish Fir
+extratrees.block.planks.ebxl.acacia=Excel Acacia
+
+extratrees.block.planks.fir.desc=A good sturdy conifer wood.|Lumber Jack
+extratrees.block.planks.cedar.desc=A red tinged softwood.|Lumber Jack
+extratrees.block.planks.hemlock.desc=Hemlock gives a green hued conifer wood.|Lumber Jack
+extratrees.block.planks.cypress.desc=A conifer wood with a sligh yellow colouring.|Lumber Jack
+extratrees.block.planks.fig.desc=Generally not considered a viable construction wood, nonetheless a useful wood.|Lumber Jack
+extratrees.block.planks.beech.desc=A slightly lighter wood, pretty average.|Lumber Jack
+extratrees.block.planks.alder.desc=A darker hardwood, doesn't have many discerning properties.|Lumber Jack
+extratrees.block.planks.hazel.desc=A lovely pale wood, similar in colour to Birch.|Lumber Jack
+extratrees.block.planks.hornbeam.desc=Another average wood, without many interesting properties.|Lumber Jack
+extratrees.block.planks.box.desc=One of the palest woods avaiable, but only found on the short box shrub.|Lumber Jack
+extratrees.block.planks.butternut.desc=A creamy hued wood, though the tree is more known for its nuts.|Lumber Jack
+extratrees.block.planks.hickory.desc=A not particularly remarkable hardwood.|Lumber Jack
+extratrees.block.planks.whitebeam.desc=Despite it's name whitebeam has a rather subdued colour.|Lumber Jack
+extratrees.block.planks.elm.desc=A rather brigh peachy wood.|Lumber Jack
+extratrees.block.planks.apple.desc=A very dark wood, making apple trees a very useful cultivar.|Lumber Jack
+extratrees.block.planks.yew.desc=A rather attractively hued conifer wood.|Lumber Jack
+extratrees.block.planks.pear.desc=Unlike Apple wood, pear wood is not particularly unique.|Lumber Jack
+extratrees.block.planks.hawthorn.desc=An average softwood.|Lumber Jack
+extratrees.block.planks.rowan.desc=A more subdued wood with nice contrast between the planks.|Lumber Jack
+extratrees.block.planks.elder.desc=A average plank without much fanfare.|Lumber Jack
+extratrees.block.planks.maclura.desc=A very rich orange hue makes Maclura wood very desirable.|Lumber Jack
+extratrees.block.planks.syzgium.desc=With a tinge of pink Syzgium is a very unique wood.|Lumber Jack
+extratrees.block.planks.brazilwood.desc=Brazilwood is known for its deep purple shade.|Lumber Jack
+extratrees.block.planks.logwood.desc=Logwood is one of the closest you can get to a red wood.|Lumber Jack
+extratrees.block.planks.iroko.desc=This attractive dark wood would make a lovely lintel.|Lumber Jack
+extratrees.block.planks.locust.desc=Totally unrelated to the devouring insect plague.|Lumber Jack
+extratrees.block.planks.eucalyptus.desc=A pinkish wood, more commonly converted to wood pulp.|Lumber Jack
+extratrees.block.planks.purpleheart.desc=A deep shade of purple makes this tree aptly named.|Lumber Jack
+extratrees.block.planks.ash.desc=Gotta catch 'em all!|Ash Ketchum
+extratrees.block.planks.holly.desc=The whitest wood available, just avoid the pointy leaves to get to it.|Lumber Jack
+extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack
+extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack
+extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack
+extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack
+extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack
+
+extratrees.block.tooltip.twoColors=%s and %s
+extratrees.block.tooltip.twoMaterials=%s and %s
+
+extratrees.block.door.name=%1$s Wood Door
+
+extratrees.block.door.name.adv=%2$s %1$s Wood Door
+extratrees.block.door.type.standard=
+extratrees.block.door.type.solid=Solid
+extratrees.block.door.type.double=Split
+extratrees.block.door.type.full=Full
+
+extratrees.block.plank.name=%1$s Wood Planks
+extratrees.block.log.name=%1$s Wood
+extratrees.block.woodslab.name=%1$s Wood Slab
+extratrees.block.woodstairs.name=%1$s Stairs
+extratrees.block.woodfence.name=%1$s Fence
+extratrees.block.woodgate.name=%1$s Gate
+
+extratrees.block.multifence.name=%2$s %1$s Gate
+extratrees.block.multifence.name2=%2$s %1$s & $3$s Gate
+
+extratrees.block.woodentile.name=%1$s Wooden Tile
+extratrees.block.woodenpanel.name=%1$s Wooden Panel
+extratrees.block.stainedglass.name=%1$s Stained Glass
+
+extratrees.species.orchardapple.name=Orchard Apple
 extratrees.species.sweetcrabapple.name=Sweet Crab Apple
 extratrees.species.floweringcrabapple.name=Flowering Crab Apple
 extratrees.species.prairiecrabapple.name=Prairie Crab Apple
+extratrees.species.blackthorn.name=Blackthorn
+extratrees.species.cherryplum.name=Cherry Plum
+extratrees.species.peach.name=Peach
+extratrees.species.nectarine.name=Nectarine
+extratrees.species.apricot.name=Apricot
+extratrees.species.almond.name=Almond
+extratrees.species.wildcherry.name=Wild Cherry
+extratrees.species.sourcherry.name=Sour Cherry
+extratrees.species.blackcherry.name=Black Cherry
+extratrees.species.orange.name=Orange
 extratrees.species.manderin.name=Mandarin
+extratrees.species.satsuma.name=Satsuma
+extratrees.species.tangerine.name=Tangerine
+extratrees.species.lime.name=Lime
+extratrees.species.keylime.name=Key Lime
+extratrees.species.fingerlime.name=Finger Lime
+extratrees.species.pomelo.name=Pomelo
+extratrees.species.grapefruit.name=Grapefruit
+extratrees.species.kumquat.name=Kumquat
+extratrees.species.citron.name=Citron
+extratrees.species.buddhahand.name=Buddha's Hand
+extratrees.species.banana.name=Banana
+extratrees.species.redbanana.name=Red Banana
+extratrees.species.plantain.name=Plantain
+extratrees.species.butternut.name=Butternut
+extratrees.species.rowan.name=Common Rowan
+extratrees.species.hemlock.name=Western Hemlock
+extratrees.species.ash.name=Common Ash
+extratrees.species.alder.name=Common Alder
+extratrees.species.alder.desc=A common tree in wet places and marshes.|Arborist Manual
+extratrees.species.beech.name=Common Beech
+extratrees.species.beech.desc=An elegant tree with small inedible nuts, used in the manufacture of seed oil.|Arborist Manual
+extratrees.species.copperbeech.name=Copper Beech
+extratrees.species.copperbeech.desc=Beautiful purple brown leaves make this tree a favourite of gardeners.|Arborist Manual
+extratrees.species.aspen.name=Aspen
+extratrees.species.yew.name=Common Yew
+extratrees.species.cypress.name=Lawson Cypress
+extratrees.species.douglasfir.name=Douglas-fir
+extratrees.species.hazel.name=Common Hazel
+extratrees.species.sycamore.name=Sycamore Fig
+extratrees.species.whitebeam.name=Whitebeam
+extratrees.species.hawthorn.name=Common Hawthorn
+extratrees.species.pecan.name=Pecan
+extratrees.species.elm.name=Common Elm
+extratrees.species.elder.name=Elderberry
+extratrees.species.holly.name=Common Holly
+extratrees.species.hornbeam.name=Common Hornbeam
+extratrees.species.sallow.name=Great Sallow
+extratrees.species.acornoak.name=Acorn Oak
+extratrees.species.fir.name=Silver Fir
+extratrees.species.cedar.name=Great Cedar
+extratrees.species.olive.name=Olive
+extratrees.species.redmaple.name=Red Maple
+extratrees.species.balsamfir.name=Balsam Fir
+extratrees.species.loblollypine.name=Loblolly Pine
+extratrees.species.sweetgum.name=Sweetgum
+extratrees.species.locust.name=Black Locust
+extratrees.species.pear.name=Cultivated Pear
 extratrees.species.osangeosange.name=Osage-Orange
+extratrees.species.oldfustic.name=Old Fustic
+extratrees.species.brazilwood.name=Brazilwood
+extratrees.species.logwood.name=Logwood
+extratrees.species.rosewood.name=Rosewood
+extratrees.species.purpleheart.name=Purpleheart
+extratrees.species.iroko.name=Iroko
+extratrees.species.gingko.name=Ginkgo
+extratrees.species.brazilnut.name=Brazil Nut
+extratrees.species.rosegum.name=Rose Gum
+extratrees.species.swampgum.name=Swamp Gum
+extratrees.species.box.name=Boxwood
+extratrees.species.clove.name=Clove
+extratrees.species.coffee.name=Coffee
+extratrees.species.monkeypuzzle.name=Monkey Puzzle
+extratrees.species.rainbowgum.name=Rainbow Gum
+extratrees.species.pinkivory.name=Pink Ivory
+extratrees.species.blackcurrant.name=Blackcurrant
+extratrees.species.redcurrant.name=Redcurrant
+extratrees.species.blackberry.name=Blackberry
+extratrees.species.raspberry.name=Raspberry
+extratrees.species.blueberry.name=Blueberry
+extratrees.species.cranberry.name=Cranberry
+extratrees.species.juniper.name=Juniper
+extratrees.species.gooseberry.name=Gooseberry
+extratrees.species.goldenraspberry.name=Golden Raspberry
+extratrees.species.cinnamon.name=Cinnamon
+extratrees.species.coconut.name=Coconut
+extratrees.species.cashew.name=Cashew
 extratrees.species.avacado.name=Avocado
+extratrees.species.nutmeg.name=Nutmeg
+extratrees.species.allspice.name=Allspice
+extratrees.species.chilli.name=Chilli Pepper
+extratrees.species.staranise.name=Star Anise
+extratrees.species.mango.name=Mango
+extratrees.species.starfruit.name=Starfruit
+extratrees.species.candlenut.name=Candlenut
+extratrees.species.dwarfhazel.name=Dwarf Hazel
 
-extratrees.item.food.crabapple=Crab Apple
-extratrees.item.food.buddhahand=Buddha’s Hand
-extratrees.item.food.manderin=Mandarin
-extratrees.item.food.avacado=Avocado
+extratrees.butterflies.species.whiteAdmiral=White Admiral
+extratrees.butterflies.species.purpleEmperor=Purple Emperor
+extratrees.butterflies.species.redAdmiral=Red Admiral
+extratrees.butterflies.species.paintedLady=Painted Lady
+extratrees.butterflies.species.smallTortoiseshell=Small Tortoiseshell
+extratrees.butterflies.species.camberwellBeauty=Camberwell Beauty
+extratrees.butterflies.species.peacock=Peacock
+extratrees.butterflies.species.wall=Wall
+extratrees.butterflies.species.crimsonRose=Crimson Rose
+extratrees.butterflies.species.kaiserIHind=Kaiser-i-Hind
+extratrees.butterflies.species.goldenBirdwing=Golden Birdwing
+extratrees.butterflies.species.marshFritillary=Marsh Fritillary
+extratrees.butterflies.species.pearlBorderedFritillary=Pearl-bordered Fritillary
+extratrees.butterflies.species.queenOfSpainFritillary=Queen of Spain Fritillary
+extratrees.butterflies.species.speckledWood=Speckled Wood
+extratrees.butterflies.species.scotchAngus=Scotch Angus
+extratrees.butterflies.species.gatekeeper=Gatekeeper
+extratrees.butterflies.species.meadowBrown=Meadow Brown
+extratrees.butterflies.species.smallHeath=Small Heath
+extratrees.butterflies.species.ringlet=Ringlet
+extratrees.butterflies.species.monarch=Monarch
+extratrees.butterflies.species.marbledWhite=Marbled White
+
+extratrees.genetics.requirements.height=Minimum height from bedrock of %d
+extratrees.genetics.unknown=<Unknown>
+extratrees.genetics.discoveredBy=Discovered by %s
+extratrees.genetics.complexity=Complexity: %d
+
+extratrees.item.carpentryHammer=Master Carpentry Hammer
+extratrees.item.masterCarpentryHammer=Carpentry Hammer
+extratrees.item.sawdust=Sawdust
+extratrees.item.bark=Bark
+extratrees.item.provenGear=Proven Gear
+extratrees.item.woodWax=Wood Polish
+extratrees.item.glassFitting=Glass Fittings
+
+for.extratrees.item.food.apple=Apple
+for.extratrees.item.food.crabapple=Crabapple
+for.extratrees.item.food.orange=Orange
+for.extratrees.item.food.kumquat=Kumquat
+for.extratrees.item.food.lime=Lime
+for.extratrees.item.food.wildcherry=Wild Cherry
+for.extratrees.item.food.sourcherry=Sour Cherry
+for.extratrees.item.food.blackcherry=Black Cherry
+for.extratrees.item.food.blackthorn=Blackthorn
+for.extratrees.item.food.cherryplum=Cherry Plum
+for.extratrees.item.food.almond=Almond
+for.extratrees.item.food.apricot=Apricot
+for.extratrees.item.food.grapefruit=Grapefruit
+for.extratrees.item.food.peach=Peach
+for.extratrees.item.food.satsuma=Satsuma
+for.extratrees.item.food.buddhahand=Buddhas Hand
+for.extratrees.item.food.citron=Citron
+for.extratrees.item.food.fingerlime=Finger Lime
+for.extratrees.item.food.keylime=Key Lime
+for.extratrees.item.food.manderin=Manderin
+for.extratrees.item.food.nectarine=Nectarine
+for.extratrees.item.food.pomelo=Pomelo
+for.extratrees.item.food.tangerine=Tangerine
+for.extratrees.item.food.pear=Pear
+for.extratrees.item.food.sandpear=Sand Pear
+for.extratrees.item.food.hazelnut=Hazelnut
+for.extratrees.item.food.butternut=Butternut
+for.extratrees.item.food.beechnut=Beechnut
+for.extratrees.item.food.pecan=Pecan Nut
+for.extratrees.item.food.banana=Banana
+for.extratrees.item.food.redbanana=Red Banana
+for.extratrees.item.food.plantain=Plantain
+for.extratrees.item.food.brazilnut=Brazil Nut
+for.extratrees.item.food.fig=Fig
+for.extratrees.item.food.acorn=Acorn
+for.extratrees.item.food.elderberry=Elderberry
+for.extratrees.item.food.olive=Olive
+for.extratrees.item.food.gingkonut=Gingko Nut
+for.extratrees.item.food.coffee=Coffee
+for.extratrees.item.food.osangeosange=Osange Orange
+for.extratrees.item.food.osangeorange=Osange Orange
+for.extratrees.item.food.clove=Clove
+for.extratrees.item.food.papayimar=Papayimar
+for.extratrees.item.food.blackcurrant=Blackcurrant
+for.extratrees.item.food.redcurrant=Redcurrant
+for.extratrees.item.food.blackberry=Blackberry
+for.extratrees.item.food.raspberry=Raspberry
+for.extratrees.item.food.blueberry=Blueberry
+for.extratrees.item.food.cranberry=Cranberry
+for.extratrees.item.food.juniper=Juniper
+for.extratrees.item.food.gooseberry=Gooseberry
+for.extratrees.item.food.goldenraspberry=Golden Raspberry
+for.extratrees.item.food.coconut=Coconut
+for.extratrees.item.food.cashew=Cashew
+for.extratrees.item.food.avacado=Avacado
+for.extratrees.item.food.nutmeg=Nutmeg
+for.extratrees.item.food.allspice=Allspice
+for.extratrees.item.food.chilli=Chilli
+for.extratrees.item.food.staranise=Star Anise
+for.extratrees.item.food.mango=Mango
+for.extratrees.item.food.starfruit=Starfruit
+for.extratrees.item.food.candlenut=Candlenut
+
+extratrees.item.database=Arborist Database
+extratrees.item.masterDatabase=Master Arborist Database
+extratrees.item.database.tooltip=Sengir-in-a-can
+
+extratrees.item.mothDatabase=Lepidopterist Database
+extratrees.item.mothMasterDatabase=Master Lepidopterist Database
+extratrees.item.mothDatabase.tooltip=Binnie's Emporium of Lepidopterans
+
+extratrees.fluid.sap=Sap
+extratrees.fluid.resin=Resin
+extratrees.fluid.latex=Latex
+extratrees.fluid.turpentine=Turpentine
+
+extratrees.gui.database.planks.use=Can make:
+
+extratrees.gui.database.mode.fruit=Fruit
+extratrees.gui.database.mode.wood=Wood
+extratrees.gui.database.mode.planks=Planks
+
+extratrees.gui.database.tab.species.overview=Overview
+extratrees.gui.database.tab.species.genome=Genome
+extratrees.gui.database.tab.species.classification=Classification
+extratrees.gui.database.tab.species.resultant=Resultant Mutations
+extratrees.gui.database.tab.species.further=Further Mutations
+
+extratrees.gui.database.tab.branches.overview=Overview
+extratrees.gui.database.tab.branches.species=Species
+
+extratrees.gui.database.tab.breeder.breeder=Breeder
+
+extratrees.gui.database.tab.fruit.natural=Natural Trees
+extratrees.gui.database.tab.fruit.natura.help=List of trees that naturally produce this fruit
+extratrees.gui.database.tab.fruit.potential=Potential Trees
+extratrees.gui.database.tab.fruit.potential.help=List of trees that can produce this fruit if they possess the right allele
+extratrees.gui.database.tab.wood.natural=Natural Trees
+extratrees.gui.database.tab.wood.natural.help=List of trees that are made of this wood
+extratrees.gui.database.tab.planks.overview=Overview
+extratrees.gui.database.tab.planks.overview.help=Description and possible uses
+extratrees.gui.database.tab.planks.natural=Natural Trees
+extratrees.gui.database.tab.planks.natural.help=List of trees that produce logs that can be crafted into this plank
+
+extratrees.gui.database.tab.butterfly.species.overview=Overview
+extratrees.gui.database.tab.butterfly.species.classification=Classification
+extratrees.gui.database.tab.butterfly.species.specimen=Specimen
+extratrees.gui.database.tab.butterfly.species.resultant=Resultant Mutations
+extratrees.gui.database.tab.butterfly.species.further=Further Mutations
+extratrees.gui.database.tab.butterfly.branches.overview=Overview
+extratrees.gui.database.tab.butterfly.branches.species=Species
+extratrees.gui.database.tab.butterfly.breeder=Breeder
+
+extratrees.gui.database.log=Log
+extratrees.gui.database.leaves=Leaves

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

@@ -320,67 +320,68 @@ extratrees.item.provenGear=Proven Gear
 extratrees.item.woodWax=Wood Polish
 extratrees.item.glassFitting=Glass Fittings
 
-extratrees.item.food.apple=Apple
-extratrees.item.food.crabapple=Crabapple
-extratrees.item.food.orange=Orange
-extratrees.item.food.kumquat=Kumquat
-extratrees.item.food.lime=Lime
-extratrees.item.food.wildcherry=Wild Cherry
-extratrees.item.food.sourcherry=Sour Cherry
-extratrees.item.food.blackcherry=Black Cherry
-extratrees.item.food.blackthorn=Blackthorn
-extratrees.item.food.cherryplum=Cherry Plum
-extratrees.item.food.almond=Almond
-extratrees.item.food.apricot=Apricot
-extratrees.item.food.grapefruit=Grapefruit
-extratrees.item.food.peach=Peach
-extratrees.item.food.satsuma=Satsuma
-extratrees.item.food.buddhahand=Buddhas Hand
-extratrees.item.food.citron=Citron
-extratrees.item.food.fingerlime=Finger Lime
-extratrees.item.food.keylime=Key Lime
-extratrees.item.food.manderin=Manderin
-extratrees.item.food.nectarine=Nectarine
-extratrees.item.food.pomelo=Pomelo
-extratrees.item.food.tangerine=Tangerine
-extratrees.item.food.pear=Pear
-extratrees.item.food.sandpear=Sand Pear
-extratrees.item.food.hazelnut=Hazelnut
-extratrees.item.food.butternut=Butternut
-extratrees.item.food.beechnut=Beechnut
-extratrees.item.food.pecan=Pecan Nut
-extratrees.item.food.banana=Banana
-extratrees.item.food.redbanana=Red Banana
-extratrees.item.food.plantain=Plantain
-extratrees.item.food.brazilnut=Brazil Nut
-extratrees.item.food.fig=Fig
-extratrees.item.food.acorn=Acorn
-extratrees.item.food.elderberry=Elderberry
-extratrees.item.food.olive=Olive
-extratrees.item.food.gingkonut=Gingko Nut
-extratrees.item.food.coffee=Coffee
-extratrees.item.food.osangeorange=Osange Orange
-extratrees.item.food.clove=Clove
-extratrees.item.food.papayimar=Papayimar
-extratrees.item.food.blackcurrant=Blackcurrant
-extratrees.item.food.redcurrant=Redcurrant
-extratrees.item.food.blackberry=Blackberry
-extratrees.item.food.raspberry=Raspberry
-extratrees.item.food.blueberry=Blueberry
-extratrees.item.food.cranberry=Cranberry
-extratrees.item.food.juniper=Juniper
-extratrees.item.food.gooseberry=Gooseberry
-extratrees.item.food.goldenraspberry=Golden Raspberry
-extratrees.item.food.coconut=Coconut
-extratrees.item.food.cashew=Cashew
-extratrees.item.food.avacado=Avacado
-extratrees.item.food.nutmeg=Nutmeg
-extratrees.item.food.allspice=Allspice
-extratrees.item.food.chilli=Chilli
-extratrees.item.food.staranise=Star Anise
-extratrees.item.food.mango=Mango
-extratrees.item.food.starfruit=Starfruit
-extratrees.item.food.candlenut=Candlenut
+for.extratrees.item.food.apple=Apple
+for.extratrees.item.food.crabapple=Crabapple
+for.extratrees.item.food.orange=Orange
+for.extratrees.item.food.kumquat=Kumquat
+for.extratrees.item.food.lime=Lime
+for.extratrees.item.food.wildcherry=Wild Cherry
+for.extratrees.item.food.sourcherry=Sour Cherry
+for.extratrees.item.food.blackcherry=Black Cherry
+for.extratrees.item.food.blackthorn=Blackthorn
+for.extratrees.item.food.cherryplum=Cherry Plum
+for.extratrees.item.food.almond=Almond
+for.extratrees.item.food.apricot=Apricot
+for.extratrees.item.food.grapefruit=Grapefruit
+for.extratrees.item.food.peach=Peach
+for.extratrees.item.food.satsuma=Satsuma
+for.extratrees.item.food.buddhahand=Buddhas Hand
+for.extratrees.item.food.citron=Citron
+for.extratrees.item.food.fingerlime=Finger Lime
+for.extratrees.item.food.keylime=Key Lime
+for.extratrees.item.food.manderin=Manderin
+for.extratrees.item.food.nectarine=Nectarine
+for.extratrees.item.food.pomelo=Pomelo
+for.extratrees.item.food.tangerine=Tangerine
+for.extratrees.item.food.pear=Pear
+for.extratrees.item.food.sandpear=Sand Pear
+for.extratrees.item.food.hazelnut=Hazelnut
+for.extratrees.item.food.butternut=Butternut
+for.extratrees.item.food.beechnut=Beechnut
+for.extratrees.item.food.pecan=Pecan Nut
+for.extratrees.item.food.banana=Banana
+for.extratrees.item.food.redbanana=Red Banana
+for.extratrees.item.food.plantain=Plantain
+for.extratrees.item.food.brazilnut=Brazil Nut
+for.extratrees.item.food.fig=Fig
+for.extratrees.item.food.acorn=Acorn
+for.extratrees.item.food.elderberry=Elderberry
+for.extratrees.item.food.olive=Olive
+for.extratrees.item.food.gingkonut=Gingko Nut
+for.extratrees.item.food.coffee=Coffee
+for.extratrees.item.food.osangeosange=Osange Orange
+for.extratrees.item.food.osangeorange=Osange Orange
+for.extratrees.item.food.clove=Clove
+for.extratrees.item.food.papayimar=Papayimar
+for.extratrees.item.food.blackcurrant=Blackcurrant
+for.extratrees.item.food.redcurrant=Redcurrant
+for.extratrees.item.food.blackberry=Blackberry
+for.extratrees.item.food.raspberry=Raspberry
+for.extratrees.item.food.blueberry=Blueberry
+for.extratrees.item.food.cranberry=Cranberry
+for.extratrees.item.food.juniper=Juniper
+for.extratrees.item.food.gooseberry=Gooseberry
+for.extratrees.item.food.goldenraspberry=Golden Raspberry
+for.extratrees.item.food.coconut=Coconut
+for.extratrees.item.food.cashew=Cashew
+for.extratrees.item.food.avacado=Avacado
+for.extratrees.item.food.nutmeg=Nutmeg
+for.extratrees.item.food.allspice=Allspice
+for.extratrees.item.food.chilli=Chilli
+for.extratrees.item.food.staranise=Star Anise
+for.extratrees.item.food.mango=Mango
+for.extratrees.item.food.starfruit=Starfruit
+for.extratrees.item.food.candlenut=Candlenut
 
 extratrees.item.database=Arborist Database
 extratrees.item.masterDatabase=Master Arborist Database

src/main/resources/assets/extratrees/lang/ru_RU.lang

@@ -1,5 +1,3 @@
-##################################################
-## Machines
 
 extratrees.machine.kitchen.bar=Бар
 extratrees.machine.kitchen.bottleRack=Стойка для бутылок
@@ -8,9 +6,9 @@ extratrees.machine.machine.brewery=Пивоварня
 extratrees.machine.machine.brewery.info=Пивоварня использует дрожжи (Yeast), соки (Juice) и зёрна (Grain), для производства разнообразных видов вина и пива.
 extratrees.machine.machine.distillery=Винокурня
 extratrees.machine.machine.distillery.info=Винокурня посредством двойной, тройной перегонки спирта производит коньяки, ликеры и другие спиртные напитки.
+extratrees.machine.machine.nursery=Питомник
 extratrees.machine.machine.press=Фруктовый пресс
 extratrees.machine.machine.press.info=Фруктовый пресс выжимает из фруктов различные фруктовые соки. Требуется энергия, но может также работать вручную, по правой кнопке мыши.
-extratrees.machine.machine.nursery=Питомник
 
 extratrees.machine.machine.lumbermill=Лесопилка
 extratrees.machine.machine.lumbermill.info=Лесопилка разрезает бревна на доски с повышенной скоростью, а также производит побочные продукты - опилки (sawdust) и кору (bark). Требуется энергия и вода.
@@ -37,7 +35,7 @@ extratrees.machine.tileworker.material=Керамический блок
 
 extratrees.machine.worker.error.glueRequired=Требует клей для работы
 
-#ДОСКИ мода EXTRATREES
+# ДОСКИ мода EXTRATREES
 extratrees.block.planks.fir=пихты
 extratrees.block.planks.cedar=кедра
 extratrees.block.planks.hemlock=тсуги
@@ -76,8 +74,7 @@ extratrees.block.planks.pinkivory=умнини
 extratrees.block.planks.cherry=вишни
 extratrees.block.planks.banana=банана
 extratrees.block.planks.cinnamon=коричника цейлонского
-
-#ДОСКИ "ВАНИЛЬНОГО" minecraft
+# ДОСКИ "ВАНИЛЬНОГО" minecraft
 extratrees.block.planks.vanilla.oak=дуба
 extratrees.block.planks.vanilla.spruce=ели
 extratrees.block.planks.vanilla.birch=берёзы
@@ -85,7 +82,7 @@ extratrees.block.planks.vanilla.jungle=тропического дерева
 extratrees.block.planks.vanilla.darkoak=тёмного дуба
 extratrees.block.planks.vanilla.acacia=акации
 
-#ДОСКИ мода FORESTRY
+# ДОСКИ мода FORESTRY
 extratrees.block.planks.forestry.larch=лиственницы
 extratrees.block.planks.forestry.teak=тикового дерева
 extratrees.block.planks.forestry.acacia=пустынной акации
@@ -160,18 +157,14 @@ extratrees.block.planks.pinkivory.desc=Что я могу сказать, она
 extratrees.block.tooltip.twoColors=%s и %s
 extratrees.block.tooltip.twoMaterials=Из %s и %s
 
-< %1$s is name of wood used for door >
 extratrees.block.door.name=Дверь из %1$s
 
-< %1$s is name of wood used for door, %2$s is type of door >
-extratrees.block.door.name.adv=%2$s дверь из %1$s 
+extratrees.block.door.name.adv=%2$s дверь из %1$s
 extratrees.block.door.type.standard=Обычная
 extratrees.block.door.type.solid=Solid
 extratrees.block.door.type.double=Разделенная
 extratrees.block.door.type.full=Плотная
 
-< %1$s is name of the wood>
-extratrees.block.woodslab.name2=Составной деревянный забор %1$s
 extratrees.block.plank.name=Доски из %1$s
 extratrees.block.log.name=Древесина %1$s
 extratrees.block.woodslab.name=Плита из %1$s
@@ -179,16 +172,12 @@ extratrees.block.woodstairs.name=Ступени из %1$s
 extratrees.block.woodfence.name=Забор из %1$s
 extratrees.block.woodgate.name=Калитка из %1$s
 
-< %1$s is the adjective for the fence type, %2$s is the name of the wood >
 extratrees.block.multifence.name=%1$s ворота из %2$s
-< %3$s is the name of the second wood >
 extratrees.block.multifence.name2=%2$s забор из %1$s и $3$s
 
-< %1$s is name of the design >
 extratrees.block.woodentile.name=Деревянный блок, дизайн %1$s
 extratrees.block.woodenpanel.name=Деревянная панель, дизайн %1$s
 extratrees.block.stainedglass.name=Витражное стекло, дизайн %1$s
-extratrees.block.ceramicBrick.name=%1$s Керамические кирпичи
 
 # ВИДЫ ДЕРЕВЬЕВ
 extratrees.species.orchardapple.name=Яблоня садовая
@@ -317,78 +306,80 @@ extratrees.butterflies.species.marbledWhite=Буддлея Давида
 
 extratrees.genetics.requirements.height=Минимальная высота от бедрока должна быть %d
 extratrees.genetics.unknown=<Неизвестно>
-extratrees.genetics.discoveredBy=Изучено игроком %s 
-extratrees.genetics.complexity=Сложность: %d 
+extratrees.genetics.discoveredBy=Изучено игроком %s
+extratrees.genetics.complexity=Сложность: %d
 
+extratrees.item.carpentryHammer=Master Carpentry Hammer
+extratrees.item.masterCarpentryHammer=Carpentry Hammer
 extratrees.item.sawdust=Опилки
 extratrees.item.bark=Кора
 extratrees.item.provenGear=Проверенная шестерня
 extratrees.item.woodWax=Полироль
 extratrees.item.glassFitting=Стеклянные фитинги
 
+for.extratrees.item.food.apple=Яблоко
+for.extratrees.item.food.crabapple=Яблоко-дичка
+for.extratrees.item.food.orange=Апельсин
+for.extratrees.item.food.kumquat=Кумкват
+for.extratrees.item.food.lime=Лайм
+for.extratrees.item.food.wildcherry=Вишня дикая
+for.extratrees.item.food.sourcherry=Вишня кислая
+for.extratrees.item.food.blackcherry=Черёмуха поздняя
+for.extratrees.item.food.blackthorn=Тёрен
+for.extratrees.item.food.cherryplum=Алыча
+for.extratrees.item.food.almond=Миндаль
+for.extratrees.item.food.apricot=Абрикос
+for.extratrees.item.food.grapefruit=Грейпфрут
+for.extratrees.item.food.peach=Персик
+for.extratrees.item.food.satsuma=Мандарин уншиу
+for.extratrees.item.food.buddhahand=Цитрон пальчатый
+for.extratrees.item.food.citron=Цитрон
+for.extratrees.item.food.fingerlime=Лайм пальчиковый
+for.extratrees.item.food.keylime=Лайм дикий
+for.extratrees.item.food.manderin=Мандарин
+for.extratrees.item.food.nectarine=Нектарин
+for.extratrees.item.food.pomelo=Помело
+for.extratrees.item.food.tangerine=Танжерин
+for.extratrees.item.food.pear=Груша
+for.extratrees.item.food.sandpear=Груша грушелистная
+for.extratrees.item.food.hazelnut=Фундук
+for.extratrees.item.food.butternut=Орех серый
+for.extratrees.item.food.beechnut=Буковый орешек
+for.extratrees.item.food.pecan=Пекан обыкновенный
+for.extratrees.item.food.banana=Банан
+for.extratrees.item.food.redbanana=Банан красный
+for.extratrees.item.food.plantain=Плантан
+for.extratrees.item.food.brazilnut=Бразильский орех
+for.extratrees.item.food.fig=Инжир
+for.extratrees.item.food.acorn=Жёлудь
+for.extratrees.item.food.elderberry=Бузина
+for.extratrees.item.food.olive=Олива
+for.extratrees.item.food.gingkonut=Семена Гинкго
+for.extratrees.item.food.coffee=Кофейные зёрна
 # ПРОДУКТЫ САДОВОДСТВА
-extratrees.item.food.osangeosange=Плод маклюра
-extratrees.item.food.apple=Яблоко
-extratrees.item.food.crabapple=Яблоко-дичка
-extratrees.item.food.orange=Апельсин
-extratrees.item.food.kumquat=Кумкват
-extratrees.item.food.lime=Лайм
-extratrees.item.food.wildcherry=Вишня дикая
-extratrees.item.food.sourcherry=Вишня кислая
-extratrees.item.food.blackcherry=Черёмуха поздняя
-extratrees.item.food.blackthorn=Тёрен
-extratrees.item.food.cherryplum=Алыча
-extratrees.item.food.almond=Миндаль
-extratrees.item.food.apricot=Абрикос
-extratrees.item.food.grapefruit=Грейпфрут
-extratrees.item.food.peach=Персик
-extratrees.item.food.satsuma=Мандарин уншиу
-extratrees.item.food.buddhahand=Цитрон пальчатый
-extratrees.item.food.citron=Цитрон
-extratrees.item.food.fingerlime=Лайм пальчиковый
-extratrees.item.food.keylime=Лайм дикий
-extratrees.item.food.manderin=Мандарин
-extratrees.item.food.nectarine=Нектарин
-extratrees.item.food.pomelo=Помело
-extratrees.item.food.tangerine=Танжерин
-extratrees.item.food.pear=Груша
-extratrees.item.food.sandpear=Груша грушелистная
-extratrees.item.food.hazelnut=Фундук
-extratrees.item.food.butternut=Орех серый
-extratrees.item.food.beechnut=Буковый орешек
-extratrees.item.food.pecan=Пекан обыкновенный
-extratrees.item.food.banana=Банан
-extratrees.item.food.redbanana=Банан красный
-extratrees.item.food.plantain=Плантан
-extratrees.item.food.brazilnut=Бразильский орех
-extratrees.item.food.fig=Инжир
-extratrees.item.food.acorn=Жёлудь
-extratrees.item.food.elderberry=Бузина
-extratrees.item.food.olive=Олива
-extratrees.item.food.gingkonut=Семена Гинкго
-extratrees.item.food.coffee=Кофейные зёрна
-extratrees.item.food.osangeorange=Плод маклюра
-extratrees.item.food.clove=Гвоздика (пряность)
-extratrees.item.food.papayimar=Папайя
-extratrees.item.food.blackcurrant=Смородина чёрная
-extratrees.item.food.redcurrant=Смородина красная
-extratrees.item.food.blackberry=Ежевика
-extratrees.item.food.raspberry=Малина
-extratrees.item.food.blueberry=Голубика
-extratrees.item.food.cranberry=Клюква
-extratrees.item.food.juniper=Семяна Можжевельника
-extratrees.item.food.gooseberry=Крыжовник
-extratrees.item.food.goldenraspberry=Малина золотая
-extratrees.item.food.coconut=Кокос
-extratrees.item.food.cashew=Кешью
-extratrees.item.food.avacado=Авокадо
-extratrees.item.food.nutmeg=Мускатный орех
-extratrees.item.food.allspice=Перец душистый
-extratrees.item.food.chilli=Перец красный
-extratrees.item.food.staranise=Анис звёздчатый
-extratrees.item.food.mango=Манго
-extratrees.item.food.starfruit=Карамбола
-extratrees.item.food.candlenut=Лумбанг
+for.extratrees.item.food.osangeosange=Плод маклюра
+for.extratrees.item.food.osangeorange=Osange Orange
+for.extratrees.item.food.clove=Гвоздика (пряность)
+for.extratrees.item.food.papayimar=Папайя
+for.extratrees.item.food.blackcurrant=Смородина чёрная
+for.extratrees.item.food.redcurrant=Смородина красная
+for.extratrees.item.food.blackberry=Ежевика
+for.extratrees.item.food.raspberry=Малина
+for.extratrees.item.food.blueberry=Голубика
+for.extratrees.item.food.cranberry=Клюква
+for.extratrees.item.food.juniper=Семяна Можжевельника
+for.extratrees.item.food.gooseberry=Крыжовник
+for.extratrees.item.food.goldenraspberry=Малина золотая
+for.extratrees.item.food.coconut=Кокос
+for.extratrees.item.food.cashew=Кешью
+for.extratrees.item.food.avacado=Авокадо
+for.extratrees.item.food.nutmeg=Мускатный орех
+for.extratrees.item.food.allspice=Перец душистый
+for.extratrees.item.food.chilli=Перец красный
+for.extratrees.item.food.staranise=Анис звёздчатый
+for.extratrees.item.food.mango=Манго
+for.extratrees.item.food.starfruit=Карамбола
+for.extratrees.item.food.candlenut=Лумбанг
 
 extratrees.item.database=База данных лесовода
 extratrees.item.masterDatabase=База данных лесовода-мастера

src/main/resources/assets/extratrees/lang/zh_CN.lang

@@ -1,5 +1,3 @@
-##################################################
-## Machines
 
 extratrees.machine.kitchen.bar=Bar
 extratrees.machine.kitchen.bottleRack=瓶架
@@ -155,17 +153,14 @@ extratrees.block.planks.pinkivory.desc=我能说些什么呢.它的粉色太浓
 extratrees.block.tooltip.twoColors=%s - %s
 extratrees.block.tooltip.twoMaterials=%s - %s
 
-< %1$s is name of wood used for door >
 extratrees.block.door.name=%1$s木门
 
-< %1$s is name of wood used for door， %2$s is type of door >
 extratrees.block.door.name.adv=%1$s%2$s木门
 extratrees.block.door.type.standard=
 extratrees.block.door.type.solid=Solid
 extratrees.block.door.type.double=Split
 extratrees.block.door.type.full=Full
 
-< %1$s is name of the wood>
 extratrees.block.plank.name=%1$s木板
 extratrees.block.log.name=%1$s原木
 extratrees.block.woodslab.name=%1$s台阶
@@ -173,12 +168,9 @@ extratrees.block.woodstairs.name=%1$s楼梯
 extratrees.block.woodfence.name=%1$s栅栏
 extratrees.block.woodgate.name=%1$s栅栏门
 
-< %1$s is the adjective for the fence type， %2$s is the name of the wood >
 extratrees.block.multifence.name=%2$s %1$s 门
-< %3$s is the name of the second wood >
 extratrees.block.multifence.name2=%2$s %1$s & $3$s 门
 
-< %1$s is name of the design >
 extratrees.block.woodentile.name=%1$s木砖
 extratrees.block.woodenpanel.name=%1$s镶板
 extratrees.block.stainedglass.name=%1$s染色玻璃
@@ -320,67 +312,68 @@ extratrees.item.provenGear=标定齿轮
 extratrees.item.woodWax=Wood Polish
 extratrees.item.glassFitting=玻璃配件
 
-extratrees.item.food.apple=苹果
-extratrees.item.food.crabapple=海棠果
-extratrees.item.food.orange=橙子
-extratrees.item.food.kumquat=金橘
-extratrees.item.food.lime=酸橙
-extratrees.item.food.wildcherry=野樱桃
-extratrees.item.food.sourcherry=欧洲酸樱桃
-extratrees.item.food.blackcherry=黑樱桃
-extratrees.item.food.blackthorn=黑刺李
-extratrees.item.food.cherryplum=樱桃李
-extratrees.item.food.almond=扁桃
-extratrees.item.food.apricot=杏子
-extratrees.item.food.grapefruit=西柚
-extratrees.item.food.peach=桃
-extratrees.item.food.satsuma=温州蜜柑
-extratrees.item.food.buddhahand=佛手柑
-extratrees.item.food.citron=枸橼
-extratrees.item.food.fingerlime=指橙
-extratrees.item.food.keylime=墨西哥莱檬
-extratrees.item.food.manderin=橘子
-extratrees.item.food.nectarine=油桃
-extratrees.item.food.pomelo=柚子
-extratrees.item.food.tangerine=瓯柑
-extratrees.item.food.pear=梨
-extratrees.item.food.sandpear=沙梨
-extratrees.item.food.hazelnut=榛子
-extratrees.item.food.butternut=灰核桃
-extratrees.item.food.beechnut=山毛榉坚果
-extratrees.item.food.pecan=长山核桃
-extratrees.item.food.banana=香蕉
-extratrees.item.food.redbanana=红香蕉
-extratrees.item.food.plantain=大蕉
-extratrees.item.food.brazilnut=巴西栗
-extratrees.item.food.fig=无花果
-extratrees.item.food.acorn=橡果
-extratrees.item.food.elderberry=接骨木浆果
-extratrees.item.food.olive=橄榄
-extratrees.item.food.gingkonut=白果
-extratrees.item.food.coffee=咖啡
-extratrees.item.food.osangeorange=桑橙
-extratrees.item.food.clove=丁香
-extratrees.item.food.papayimar=Pahimar牌木瓜
-extratrees.item.food.blackcurrant=黑加仑
-extratrees.item.food.redcurrant=红加仑
-extratrees.item.food.blackberry=黑莓
-extratrees.item.food.raspberry=树莓
-extratrees.item.food.blueberry=蓝莓
-extratrees.item.food.cranberry=蔓越莓
-extratrees.item.food.juniper=杜松子
-extratrees.item.food.gooseberry=鹅莓
-extratrees.item.food.goldenraspberry=金树莓
-extratrees.item.food.coconut=椰子
-extratrees.item.food.cashew=腰果
-extratrees.item.food.avacado=鳄梨
-extratrees.item.food.nutmeg=肉豆蔻
-extratrees.item.food.allspice=多香果
-extratrees.item.food.chilli=辣椒
-extratrees.item.food.staranise=八角
-extratrees.item.food.mango=芒果
-extratrees.item.food.starfruit=杨桃
-extratrees.item.food.candlenut=石栗
+for.extratrees.item.food.apple=苹果
+for.extratrees.item.food.crabapple=海棠果
+for.extratrees.item.food.orange=橙子
+for.extratrees.item.food.kumquat=金橘
+for.extratrees.item.food.lime=酸橙
+for.extratrees.item.food.wildcherry=野樱桃
+for.extratrees.item.food.sourcherry=欧洲酸樱桃
+for.extratrees.item.food.blackcherry=黑樱桃
+for.extratrees.item.food.blackthorn=黑刺李
+for.extratrees.item.food.cherryplum=樱桃李
+for.extratrees.item.food.almond=扁桃
+for.extratrees.item.food.apricot=杏子
+for.extratrees.item.food.grapefruit=西柚
+for.extratrees.item.food.peach=桃
+for.extratrees.item.food.satsuma=温州蜜柑
+for.extratrees.item.food.buddhahand=佛手柑
+for.extratrees.item.food.citron=枸橼
+for.extratrees.item.food.fingerlime=指橙
+for.extratrees.item.food.keylime=墨西哥莱檬
+for.extratrees.item.food.manderin=橘子
+for.extratrees.item.food.nectarine=油桃
+for.extratrees.item.food.pomelo=柚子
+for.extratrees.item.food.tangerine=瓯柑
+for.extratrees.item.food.pear=梨
+for.extratrees.item.food.sandpear=沙梨
+for.extratrees.item.food.hazelnut=榛子
+for.extratrees.item.food.butternut=灰核桃
+for.extratrees.item.food.beechnut=山毛榉坚果
+for.extratrees.item.food.pecan=长山核桃
+for.extratrees.item.food.banana=香蕉
+for.extratrees.item.food.redbanana=红香蕉
+for.extratrees.item.food.plantain=大蕉
+for.extratrees.item.food.brazilnut=巴西栗
+for.extratrees.item.food.fig=无花果
+for.extratrees.item.food.acorn=橡果
+for.extratrees.item.food.elderberry=接骨木浆果
+for.extratrees.item.food.olive=橄榄
+for.extratrees.item.food.gingkonut=白果
+for.extratrees.item.food.coffee=咖啡
+for.extratrees.item.food.osangeosange=Osange Orange
+for.extratrees.item.food.osangeorange=Osange Orange
+for.extratrees.item.food.clove=丁香
+for.extratrees.item.food.papayimar=Pahimar牌木瓜
+for.extratrees.item.food.blackcurrant=黑加仑
+for.extratrees.item.food.redcurrant=红加仑
+for.extratrees.item.food.blackberry=黑莓
+for.extratrees.item.food.raspberry=树莓
+for.extratrees.item.food.blueberry=蓝莓
+for.extratrees.item.food.cranberry=蔓越莓
+for.extratrees.item.food.juniper=杜松子
+for.extratrees.item.food.gooseberry=鹅莓
+for.extratrees.item.food.goldenraspberry=金树莓
+for.extratrees.item.food.coconut=椰子
+for.extratrees.item.food.cashew=腰果
+for.extratrees.item.food.avacado=鳄梨
+for.extratrees.item.food.nutmeg=肉豆蔻
+for.extratrees.item.food.allspice=多香果
+for.extratrees.item.food.chilli=辣椒
+for.extratrees.item.food.staranise=八角
+for.extratrees.item.food.mango=芒果
+for.extratrees.item.food.starfruit=杨桃
+for.extratrees.item.food.candlenut=石栗
 
 extratrees.item.database=林业员数据库
 extratrees.item.masterDatabase=林业员大师数据库