Merge pull request #12 from GTNewHorizons/maven

update buildscript

.github/scripts/test-no-error-reports.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+RUNDIR="run"
+CRASH="crash-reports"
+SERVERLOG="server.log"
+
+if [[ -d $RUNDIR/$CRASH ]]; then
+  echo "Crash reports detected:"
+  cat $RUNDIR/$CRASH/crash*.txt
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" $SERVERLOG; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+

.github/workflows/build-and-test.yml

@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+
+    - name: Build the mod
+      run: ./gradlew build
+
+    - name: Run server for 1.5 minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt
+        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
+
+    - name: Test no errors reported during server run
+      run: |
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh

.github/workflows/release-tags.yml

@@ -0,0 +1,51 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Release tagged build
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup the workspace
+        run: ./gradlew setupCIWorkspace
+
+      - name: Build the mod
+        run: ./gradlew build
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar
+
+      - name: Publish to Maven
+        run: ./gradlew publish
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -1,18 +1,32 @@
 .gradle
-# IntelliJ
-/build
-/run
-/eclipse
-/out
-.idea
+.settings
+/.idea/
+/.vscode/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
-# minecraft
-/config
-/logs
-/saves
-/options.txt
-/usernamecache.json
-
-changelog.html
+src/main/resources/mixins.*.json
+*.bat
+*.DS_Store
+!gradlew.bat

.travis.yml

@@ -1,24 +0,0 @@
-sudo: required
-dist: trusty
-
-language: java
-jdk: oraclejdk8
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-before_install: chmod +x gradlew
-install:
-  - ./gradlew setupCIWorkspace -S
-script:
-  - ./gradlew build
-
-notifications:
-  email: false

CODEOWNERS

@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+

LICENSE.txt

@@ -1,7 +1,7 @@
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -163,678 +163,3 @@ whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,13 +1,46 @@
-## Binnie mods
+[Binnie mods](https://minecraft.curseforge.com/projects/binnies-mods/files)
+====================================
 
-This is an official fork of mod.
-All builds can be found on [Jenkins](https://ci.bymarcin.com/job/Binnie-Mods-MC1.7.10/)
+### What is it?
+Binnie’s Mods is a suite of mods designed to expand the [Forestry](https://github.com/ForestryMC/ForestryMC) mod. 
+It both extends the bee and tree breeding aspect by adding many new species with varied products,
+along with new features such as fully breedable flowers and genetic manipulation.
+
+### Homepage
+
+[Wiki](https://binnie.mods.wiki/wiki/Main_Page)
+
+[Latest Builds for 1.7.10](https://ci.bymarcin.com/job/Binnie-Mods-MC1.7.10/)
+
+### Mods
+
+[![](https://binnie.mods.wiki/w/images/binnie/9/91/Extra_Bees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Bees)
+
+Extra Bees expands upon the bee breeding of Forestry by adding 107 new bee species to forestry. These bees cover a large spectrum of different effects and products, giving you the ability to produce everything from dyes to rare metal dusts purely from bees. It also adds the Apiarist Database, a tool to keep track of discovered species, mutations and traits. There are also new alveary components which help improve and streamline bee production. 
+
+
+[![](https://binnie.mods.wiki/w/images/binnie/5/59/Extra_Trees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Trees)
+
+Extra Trees both increases the number of tree species and adds many new aesthetic uses. There are 96 new tree species, such as Banana, Brazil nut and Douglas-fir. This comes with many new fruits as well as 35 new wooden planks. Extra Trees allows these, as well as Forestry and vanilla planks, to be combined to give doors, gates and various designs of fences. The woodworker allows planks to be combined to give patterned tiles, allowing you to build beautiful wooden floors, and the same can be done with stained glass. A group of machines such as the brewery and distillery allow you to use the fruits you grow to make a variety of wines, ciders and spirits.
+
+
+[![](https://binnie.mods.wiki/w/images/binnie/3/34/Botany_Header.png)](https://binnie.mods.wiki/wiki/Botany)
+
+Botany adds an entirely new breeding system to Forestry: flowers. There are 46 different species that can be bred, including both vanilla flowers and new ones such as Fuschia and Lilies. The colour of the flowers can be transferred and selectively bred, meaning that each flower can be one of a possible 80 different colours. These new flowers can be bred manually in small gardens using a trowel and fertiliser, with careful care taken to maintain the desired pH or moisture, or grown on the large scale in Forestry farms. 
+
+[![](https://binnie.mods.wiki/w/images/binnie/4/4e/Genetics_Header.png)](https://binnie.mods.wiki/wiki/Genetics)
+
+Genetics is for those who want to eschew conventional breeding, and want to enter the realm of genetic manipulation. Here, genes can be isolated, sequenced and then inoculated back into different species, making it easier to obtain the perfect genome. Bees, trees, butterflies and flowers can all be manipulated in this way. They can also be acclimatised to different environments to build tolerance to hostile climates.
+
+[![](https://binnie.mods.wiki/w/images/binnie/d/d7/Binnie_Core_Header.png)](https://binnie.mods.wiki/wiki/Binnie_Core)
+
+Binnie Core is a mod which contains a lot of the core functionality such as networking and GUI's for the other mods. The only in game features it currently contains are the Compartments
 
 ### Warning
 
 Removed unused (unfinished) items and blocks: Honey Crystal, Alcohol, etc.
 
-#### Build
+### Building
 
 The master branch will always contain the latest released version with possibly some bug fixes for that version that will eventually be released.
 New versions will be created in branched named like {mc_version}-{mod_version}

build.gradle

@@ -1,68 +1,731 @@
+//version: 1644612407
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+*/
+
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
     repositories {
-        mavenCentral()
         maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
         }
         maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
         maven {
-            url "https://plugins.gradle.org/m2/"
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
+        }
+        maven {
+            name 'jitpack'
+            url 'https://jitpack.io'
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-        classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47"
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
 
-apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
+plugins {
+    id 'java-library'
+    id 'idea'
+    id 'eclipse'
+    id 'scala'
+    id 'maven-publish'
+    id 'org.jetbrains.kotlin.jvm'        version '1.5.30' apply false
+    id 'org.jetbrains.kotlin.kapt'       version '1.5.30' apply false
+    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'com.palantir.git-version'        version '0.13.0' apply false
+    id 'de.undercouch.download'          version '5.0.1'
+    id 'com.github.gmazzo.buildconfig'   version '3.0.3' apply false
+}
+
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
+}
+
+def out = services.get(StyledTextOutputFactory).create('an-output')
+
 apply plugin: 'forge'
 
-version = "2.0.18"
-if (System.getenv("BUILD_NUMBER") != null) {
-    version = version + "-" + System.getenv("BUILD_NUMBER")
-}
-group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "binnie-mods-1.7.10"
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+def projectJavaVersion = JavaLanguageVersion.of(8)
 
-// uncomment this hack if you use old IDEA
-/*sourceSets {
-    main {
-        output.resourcesDir = output.classesDir
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
     }
-}*/
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+String kotlinSourceDir = "src/main/kotlin/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(!getFile(targetFile).exists()) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+try {
+    'git config core.fileMode false'.execute()
+}
+catch (Exception e) {
+    out.style(Style.Failure).println("git isn't installed at all")
+}
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+String versionOverride = System.getenv("VERSION") ?: null
+try {
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+}
+catch (Exception e) {
+    out.style(Style.Failure).text(
+        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+    )
+    versionOverride = 'NO-GIT-TAG-SET'
+    identifiedVersion = versionOverride
+}
+version = minecraftVersion + '-' + identifiedVersion
+ext {
+    modVersion = identifiedVersion
+}
+
+if( identifiedVersion.equals(versionOverride) ) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+def arguments = []
+def jvmArguments = []
+
+if(usesMixins.toBoolean()) {
+    arguments += [
+            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    jvmArguments += [
+            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+    ]
+}
 
 minecraft {
-    version = "1.7.10-10.13.4.1614-1.7.10"
-    runDir = "eclipse"
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, modVersion
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+
+    clientIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+
+        if(developmentEnvironmentUserName) {
+            args("--username", developmentEnvironmentUserName)
+        }
+    }
+
+    serverIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+    }
+}
+
+if(file('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
+}
+
+repositories {
+    maven {
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
+        }
+        maven {
+            url 'https://jitpack.io'
+        }
+    }
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
+        annotationProcessor('com.google.guava:guava:24.1.1-jre')
+        annotationProcessor('com.google.code.gson:gson:2.8.6')
+        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+runServer {
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
 }
 
 processResources {
+    // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
 
+    // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-        expand 'version': project.version, 
-                'mcversion': project.minecraft.version,
-                'modid': "BinnieMods"
+
+        // replace modVersion and minecraftVersion
+        expand "minecraftVersion": project.minecraft.version,
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
     }
-        
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else that's not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
 
-task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
-    filePath = "changelog.html"
-    untaggedName = "Current release ${project.version}"
-    fromCommit = "dbc5c1a564c39e4a9c042411d1bdbe450985ce2c"
-    toRef =  "HEAD"
-    templateContent = file('changelog.mustache').getText('UTF-8');
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
+// and isn't strictly needed with the POM so just disable it.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "src"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+
+            // remove extra garbage from who knows where
+            pom.withXml {
+                def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
+                                   'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
+                                   'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava',
+                                   'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j',
+                                   'org.lwjgl.lwjgl', 'tv.twitch', 'org.jetbrains.kotlin', '']
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    badPomGroup.contains(it.groupId.text())
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Deobfuscation
+
+def deobf(String sourceURL) {
+    try {
+        URL url = new URL(sourceURL)
+        String fileName = url.getFile()
+
+        //get rid of directories:
+        int lastSlash = fileName.lastIndexOf("/")
+        if(lastSlash > 0) {
+            fileName = fileName.substring(lastSlash + 1)
+        }
+        //get rid of extension:
+        if(fileName.endsWith(".jar")) {
+            fileName = fileName.substring(0, fileName.lastIndexOf("."))
+        }
+
+        String hostName = url.getHost()
+        if(hostName.startsWith("www.")) {
+            hostName = hostName.substring(4)
+        }
+        List parts = Arrays.asList(hostName.split("\\."))
+        Collections.reverse(parts)
+        hostName = String.join(".", parts)
+
+        return deobf(sourceURL, hostName + "/" + fileName)
+    } catch(Exception e) {
+        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
+    }
+}
+
+// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
+def deobf(String sourceURL, String fileName) {
+    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
+    String bon2Dir = cacheDir + "forge_gradle/deobf"
+    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
+    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
+    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
+
+    if(file(deobfFile).exists()) {
+        return files(deobfFile)
+    }
+
+    download.run {
+        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
+        dest bon2File
+        quiet true
+        overwrite false
+    }
+
+    download.run {
+        src sourceURL
+        dest obfFile
+        quiet true
+        overwrite false
+    }
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        workingDir bon2Dir
+        standardOutput = new ByteArrayOutputStream()
+    }
+
+    return files(deobfFile)
+}
+
+// Helper methods
+
+def checkPropertyExists(String propertyName) {
+    if (project.hasProperty(propertyName) == false) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
 }

dependencies.gradle

@@ -0,0 +1,9 @@
+// Add your dependencies here
+
+dependencies {
+    compile 'com.github.GTNewHorizons:ForestryMC:4.4.6:dev'
+    compileOnly 'com.github.GTNewHorizons:BuildCraft:7.1.27:api'
+
+    compileOnly 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev'
+    compileOnly 'curse.maven:cofh-lib-220333:2388748'
+}

gradle.properties

@@ -0,0 +1,64 @@
+modName = Binnie Core
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = BinnieCore
+
+modGroup = binnie
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = Developer
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = BinnieCore.java
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatibility only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+customArchiveBaseName = binnie-mods

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,47 +22,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 +36,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='"-Xmx64m" "-Xms64m"'
+
+# 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 +105,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
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 +170,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,100 @@
-@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
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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="-Xmx64m" "-Xms64m"
+
+@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

jitpack.yml

@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace

repositories.gradle

@@ -0,0 +1,26 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+        allowInsecureProtocol
+    }
+    maven {
+        name 'ic2'
+        url 'http://maven.ic2.player.to/'
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
+    }
+    maven {
+        url 'https://jitpack.io'
+    }
+}

src/main/java/binnie/botany/Botany.java

@@ -55,6 +55,7 @@ import net.minecraftforge.event.world.BlockEvent;
 @Mod(
 	modid = "Botany",
 	name = "Botany",
+	version = BinnieCore.VERSION,
 	useMetadata = true,
 	dependencies = "after:BinnieCore"
 )

src/main/java/binnie/botany/farm/GardenLogic.java

@@ -89,10 +89,28 @@ public class GardenLogic extends FarmLogic {
 		return stack.getItem() == Item.getItemFromBlock(Blocks.dirt);
 	}
 
-	private boolean maintainSoil(int x2, int y2, int z2, FarmDirection direction, int extent) {
+	private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) {
 		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x2, y2, z2, direction, i);
-			if (fertilised && Gardening.isSoil(world.getBlock(position.x, position.y, position.z))) {
+			Vect position = translateWithOffset(x, y, z, direction, i);
+			boolean isSoil = Gardening.isSoil(world.getBlock(position.x, position.y, position.z));
+			
+			// remove unnecessary blocks
+			if (!isManual && !isSoil && !isAirBlock(position)) {
+				Block block = world.getBlock(position.x, position.y, position.z);
+				if (moisture == EnumMoisture.DAMP) {
+					if (block != Blocks.water) {
+						dropBlockAsProduction(position);
+					}
+				} else if (moisture == EnumMoisture.DRY) {
+					if (block != Blocks.sand) {
+						dropBlockAsProduction(position);
+					}
+				} else {
+					dropBlockAsProduction(position);
+				}
+			}
+
+			if (fertilised && isSoil) {
 				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
 				if (soil.fertilise(world, position.x, position.y, position.z, EnumSoilType.FLOWERBED)) {
 					continue;
@@ -101,55 +119,56 @@ public class GardenLogic extends FarmLogic {
 
 			if (world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
 				world.setBlockToAir(position.x, position.y + 1, position.z);
-			} else {
-				if (acidity != null && Gardening.isSoil(world.getBlock(position.x, position.y, position.z))) {
-					IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
-					EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z);
-					if (pH.ordinal() < acidity.ordinal()) {
-						ItemStack stack = getAvailableAlkaline();
-						if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
-							housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-							continue;
-						}
-					}
+				continue;
+			}
 
-					if (pH.ordinal() > acidity.ordinal()) {
-						ItemStack stack = getAvailableAcid();
-						if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
-							housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-							continue;
-						}
+			if (acidity != null && isSoil) {
+				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
+				EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z);
+				if (pH.ordinal() < acidity.ordinal()) {
+					ItemStack stack = getAvailableAlkaline();
+					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
+						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
+						continue;
 					}
 				}
 
-				if (!isAirBlock(position) && !world.getBlock(position.x, position.y, position.z).isReplaceable(world, position.x, position.y, position.z)) {
-					ItemStack block = getAsItemStack(position);
-					ItemStack loam = getAvailableLoam();
-					if (isWaste(block) && loam != null) {
-						produce.addAll(Blocks.dirt.getDrops(world, position.x, position.y, position.z, block.getItemDamage(), 0));
-						setBlock(position, Blocks.air, 0);
-						return trySetSoil(position, loam);
+				if (pH.ordinal() > acidity.ordinal()) {
+					ItemStack stack = getAvailableAcid();
+					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
+						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
+						continue;
 					}
-				} else if (!isManual) {
-					if (!isWaterBlock(position)) {
-						if (i % 2 == 0) {
-							return trySetSoil(position);
-						}
+				}
+			}
 
-						FarmDirection cclock = FarmDirection.EAST;
-						if (direction == FarmDirection.EAST) {
-							cclock = FarmDirection.SOUTH;
-						} else if (direction == FarmDirection.SOUTH) {
-							cclock = FarmDirection.EAST;
-						} else if (direction == FarmDirection.WEST) {
-							cclock = FarmDirection.SOUTH;
-						}
+			if (!isAirBlock(position) && !world.getBlock(position.x, position.y, position.z).isReplaceable(world, position.x, position.y, position.z)) {
+				ItemStack block = getAsItemStack(position);
+				ItemStack loam = getAvailableLoam();
+				if (isWaste(block) && loam != null) {
+					produce.addAll(Blocks.dirt.getDrops(world, position.x, position.y, position.z, block.getItemDamage(), 0));
+					setBlock(position, Blocks.air, 0);
+					return trySetSoil(position, loam);
+				}
+			} else if (!isManual) {
+				if (!isWaterBlock(position)) {
+					if (i % 2 == 0) {
+						return trySetSoil(position);
+					}
 
-						Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
-						ItemStack soil2 = getAsItemStack(previous);
-						if (!Gardening.isSoil(soil2.getItem())) {
-							trySetSoil(position);
-						}
+					FarmDirection cclock = FarmDirection.EAST;
+					if (direction == FarmDirection.EAST) {
+						cclock = FarmDirection.SOUTH;
+					} else if (direction == FarmDirection.SOUTH) {
+						cclock = FarmDirection.EAST;
+					} else if (direction == FarmDirection.WEST) {
+						cclock = FarmDirection.SOUTH;
+					}
+
+					Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
+					ItemStack soil2 = getAsItemStack(previous);
+					if (!Gardening.isSoil(soil2.getItem())) {
+						trySetSoil(position);
 					}
 				}
 			}
@@ -278,10 +297,19 @@ public class GardenLogic extends FarmLogic {
 		return true;
 	}
 
+	private void dropBlockAsProduction(Vect position) {
+		ItemStack stack = new ItemStack(world.getBlock(position.x, position.y, position.z));
+		if (stack.getItem() == null) {
+			return;
+		}
+		produce.add(stack);
+		world.setBlockToAir(position.x, position.y, position.z);
+	}
+
 	@Override
-	public boolean isAcceptedGermling(ItemStack itemstack) {
+	public boolean isAcceptedGermling(ItemStack stack) {
 		for (IFarmable farmable : farmables) {
-			if (farmable.isGermling(itemstack)) {
+			if (farmable.isGermling(stack)) {
 				return true;
 			}
 		}
@@ -340,7 +368,7 @@ public class GardenLogic extends FarmLogic {
 
 			try {
 				IOwnable housing2 = (IOwnable) housing;
-				GameProfile prof  = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2);
+				GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2);
 				((TileEntityFlower) tile).setOwner(prof);
 			} catch (Exception ex) {
 				// ignored

src/main/java/binnie/botany/flower/BlockFlower.java

@@ -39,6 +39,11 @@ public class BlockFlower extends BlockContainer {
 		setStepSound(Block.soundTypeGrass);
 	}
 
+	@Override
+	public String getUnlocalizedName() {
+		return "botany.flower";
+	}
+
 	@Override
 	public int getRenderType() {
 		return RendererBotany.renderID;
@@ -218,4 +223,10 @@ public class BlockFlower extends BlockContainer {
 		}
 		return hasBeenBroken;
 	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int meta, int side) {
+		return Blocks.yellow_flower.getIcon(0, 0);
+	}
 }

src/main/java/binnie/core/BinnieCore.java

@@ -1,7 +1,6 @@
 package binnie.core;
 
 import binnie.Binnie;
-import binnie.genetics.item.ItemFieldKit;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
 import binnie.core.craftgui.minecraft.ModuleCraftGUI;
@@ -24,6 +23,7 @@ import binnie.core.network.IPacketID;
 import binnie.core.proxy.BinnieProxy;
 import binnie.core.proxy.IBinnieProxy;
 import binnie.core.triggers.ModuleTrigger;
+import binnie.genetics.item.ItemFieldKit;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -47,7 +47,9 @@ import net.minecraftforge.client.event.TextureStitchEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-@Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true, dependencies = "after:Forestry@[4.2,)")
+import static binnie.core.BinnieCore.*;
+
+@Mod(modid = "BinnieCore", name = "Binnie Core", version = VERSION, useMetadata = true, dependencies = "after:Forestry@[4.2,)")
 public class BinnieCore extends AbstractMod {
 	@Mod.Instance("BinnieCore")
 	public static BinnieCore instance;
@@ -58,6 +60,7 @@ public class BinnieCore extends AbstractMod {
 	public static MachineGroup packageCompartment;
 	public static ItemGenesis genesis;
 	public static ItemFieldKit fieldKit;
+	public static final String VERSION = "GRADLETOKEN_VERSION";
 
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent evt) {
@@ -92,7 +95,7 @@ public class BinnieCore extends AbstractMod {
 
 	@Override
 	public void preInit() {
-		BinnieCore.instance = this;
+		instance = this;
 		for (FluidContainer container : FluidContainer.values()) {
 			Item item = new ItemFluidContainer(container);
 			GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
@@ -108,7 +111,7 @@ public class BinnieCore extends AbstractMod {
 			NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
 		}
 
-		BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
+		multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
 		GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
 	}
@@ -147,12 +150,12 @@ public class BinnieCore extends AbstractMod {
 	}
 
 	static void registerMod(AbstractMod mod) {
-		BinnieCore.modList.add(mod);
+		modList.add(mod);
 	}
 
 	private static List<AbstractMod> getActiveMods() {
 		List<AbstractMod> list = new ArrayList<>();
-		for (AbstractMod mod : BinnieCore.modList) {
+		for (AbstractMod mod : modList) {
 			if (mod.isActive()) {
 				list.add(mod);
 			}
@@ -183,7 +186,7 @@ public class BinnieCore extends AbstractMod {
 
 	@Override
 	public IBinnieProxy getProxy() {
-		return BinnieCore.proxy;
+		return proxy;
 	}
 
 	@Override
@@ -222,7 +225,7 @@ public class BinnieCore extends AbstractMod {
 
 	public static class PacketHandler extends BinniePacketHandler {
 		public PacketHandler() {
-			super(BinnieCore.instance);
+			super(instance);
 		}
 	}
 }

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

@@ -305,7 +305,7 @@ public class Widget implements IWidget {
 		}
 
 		onUpdateClient();
-		List<IWidget> deletedWidgets = new ArrayList<IWidget>();
+		List<IWidget> deletedWidgets = new ArrayList<>();
 		for (IWidget widget : getWidgets()) {
 			if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) {
 				deletedWidgets.add(widget);

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) {
@@ -274,7 +278,12 @@ public class WindowFieldKit extends Window {
 			return;
 		}
 
-		getWindowInventory().setInventorySlotContents(0, Analyser.analyse(getWindowInventory().getStackInSlot(0)));
+		ItemStack stack = getWindowInventory().getStackInSlot(0);
+		if (stack == null) {
+			return;
+		}
+
+		getWindowInventory().setInventorySlotContents(0, Analyser.analyse(stack));
 		getWindowInventory().decrStackSize(1, 1);
 	}
 

src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java

@@ -15,7 +15,7 @@ public class ControlListBox<T> extends ControlScrollableContent<ControlList<T>>
 
 	@Override
 	public void initialise() {
-		setScrollableContent(new ControlList<T>(this, 1.0f, 1.0f, w() - 2.0f - scrollBarSize, h() - 2.0f));
+		setScrollableContent(new ControlList<>(this, 1.0f, 1.0f, w() - 2.0f - scrollBarSize, h() - 2.0f));
 		addEventHandler(new EventKey.Down.Handler() {
 			@Override
 			public void onEvent(EventKey.Down event) {

src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java

@@ -93,11 +93,8 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
 
 		switch (discovered) {
 			case SHOW:
-				tooltip.add(species.getName());
-				break;
-
 			case DISCOVERED:
-				tooltip.add(I18N.localise("binniecore.gui.database.discovered.discovered"));
+				tooltip.add(species.getName());
 				break;
 
 			case UNDISCOVERED:

src/main/java/binnie/core/craftgui/database/PageBreeder.java

@@ -31,11 +31,11 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
 		);
 		new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount));
 		new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage);
-		new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.branch.count", system.discoveredBranchCount, system.totalBranchCount));
+		new ControlTextCentered(this, 115.0f, I18N.localise("binniecore.gui.database.branch.count", system.discoveredBranchCount, system.totalBranchCount));
 		new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage);
 
 		if (system.discoveredSecretCount > 0) {
-			new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount));
+			new ControlTextCentered(this, 155.0f, I18N.localise("binniecore.gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount));
 		}
 
 		new ControlTextCentered(this, 32.0f, player.getName());

src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java

@@ -119,7 +119,7 @@ public abstract class WindowAbstractDatabase extends Window {
 					widgets.listBox.setValidator(new IValidator<IWidget>() {
 						@Override
 						public boolean isValid(IWidget object) {
-							return event.getValue() == "" || ((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase());
+							return event.getValue().isEmpty() || ((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase());
 						}
 					});
 				}

src/main/java/binnie/core/craftgui/minecraft/ListMap.java

@@ -11,7 +11,7 @@ class ListMap<T> implements List<T> {
 	private LinkedHashMap<Integer, T> map;
 
 	ListMap() {
-		map = new LinkedHashMap<Integer, T>();
+		map = new LinkedHashMap<>();
 	}
 
 	@Override

src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java

@@ -92,7 +92,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener {
 			throw new RuntimeException("Parameter must have between one and four numbers");
 		}
 
-		List<Float> f = new ArrayList<Float>();
+		List<Float> f = new ArrayList<>();
 		for (String string : split) {
 			f.add(Float.parseFloat(string));
 		}
@@ -113,7 +113,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener {
 		if (split.length < 1 || split.length > 4) {
 			throw new RuntimeException("Parameter must have between one and four numbers");
 		}
-		List<Float> f = new ArrayList<Float>();
+		List<Float> f = new ArrayList<>();
 		for (String string : split) {
 			f.add(Float.parseFloat(string));
 		}

src/main/java/binnie/core/genetics/ManagerGenetics.java

@@ -207,10 +207,10 @@ public class ManagerGenetics extends ManagerBase {
 				throw new NullPointerException("Allele is null!");
 			}
 			if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) {
-				return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(Float.valueOf(((IAlleleFloat) o2).getValue()));
+				return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue());
 			}
 			if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) {
-				return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(Integer.valueOf(((IAlleleInteger) o2).getValue()));
+				return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue());
 			}
 			if (o1.getName() != null && o2.getName() != null) {
 				return o1.getName().compareTo(o2.getName());

src/main/java/binnie/core/genetics/TreeBreedingSystem.java

@@ -226,7 +226,7 @@ public class TreeBreedingSystem extends BreedingSystem {
 			return new ArrayList<>();
 		}
 		Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
-		List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
+		List<IAlleleSpecies> found = new ArrayList<>();
 		for (IAlleleSpecies species : set) {
 			IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
 			ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));

src/main/java/binnie/core/item/ModuleItems.java

@@ -3,11 +3,11 @@ package binnie.core.item;
 import binnie.botany.Botany;
 import binnie.botany.api.IFlower;
 import binnie.botany.flower.TileEntityFlower;
-import binnie.genetics.item.ItemFieldKit;
 import binnie.botany.network.PacketID;
 import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import binnie.core.network.packet.MessageNBT;
+import binnie.genetics.item.ItemFieldKit;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/binnie/core/machines/ManagerMachine.java

@@ -46,8 +46,8 @@ public class ManagerMachine extends ManagerBase {
 			return;
 		}
 
-		Set<Class<?>> interfaces = new HashSet<Class<?>>();
-		for (Class<?> currentClass = component; currentClass != null; currentClass = null) {
+		Set<Class<?>> interfaces = new HashSet<>();
+		for (Class<?> currentClass = component; currentClass != null; currentClass = currentClass.getSuperclass()) {
 			Collections.addAll(interfaces, currentClass.getInterfaces());
 		}
 

src/main/java/binnie/core/machines/inventory/SidedAccess.java

@@ -19,7 +19,7 @@ class SidedAccess {
 	}
 
 	public AccessDirection getAccess(ForgeDirection side) {
-		return accesses.containsKey(side) ? accesses.get(side) : base;
+		return accesses.getOrDefault(side, base);
 	}
 
 	public boolean canInsert(ForgeDirection side) {

src/main/java/binnie/core/machines/storage/WindowCompartment.java

@@ -51,7 +51,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -142,7 +141,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 			@Override
 			public void onEvent(EventValueChanged event) {
 				NBTTagCompound nbt = new NBTTagCompound();
-				int i = ((Integer) event.getValue()).intValue();
+				int i = (Integer) event.getValue();
 				nbt.setByte("i", (byte) i);
 				Window.get(tab).sendClientAction("tab-change", nbt);
 				currentTab = i;
@@ -150,10 +149,10 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 		}.setOrigin(EventHandler.Origin.DirectChild, tab));
 		x += 24;
 
-		ControlPages<Integer> compartmentPages = new ControlPages<Integer>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight);
+		ControlPages<Integer> compartmentPages = new ControlPages<>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight);
 		ControlPage[] page = new ControlPage[inv.getTabNumber()];
 		for (int p = 0; p < inv.getTabNumber(); ++p) {
-			page[p] = new ControlPage(compartmentPages, Integer.valueOf(p));
+			page[p] = new ControlPage(compartmentPages, p);
 		}
 		CraftGUIUtil.linkWidgets(tab, compartmentPages);
 		int i = 0;
@@ -210,7 +209,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 				@Override
 				public void onEvent(EventValueChanged event) {
 					NBTTagCompound nbt = new NBTTagCompound();
-					int i = ((Integer) event.getValue()).intValue();
+					int i = (Integer) event.getValue();
 					nbt.setByte("i", (byte) i);
 					Window.get(tab).sendClientAction("tab-change", nbt);
 					currentTab = i;
@@ -374,7 +373,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
 				if (sortByName) {
 					List<Entry<Integer, String>> list = new LinkedList(slotIds.entrySet());
-					Collections.sort(list, new Comparator<Entry<Integer, String>>() {
+					list.sort(new Comparator<Entry<Integer, String>>() {
 						@Override
 						public int compare(Entry<Integer, String> o1, Entry<Integer, String> o2) {
 							return -o2.getValue().compareTo(o1.getValue());

src/main/java/binnie/extrabees/ExtraBees.java

@@ -27,6 +27,7 @@ import net.minecraft.item.Item;
 @Mod(
 	modid = "ExtraBees",
 	name = "Extra Bees",
+	version = BinnieCore.VERSION,
 	useMetadata = true,
 	dependencies = "after:BinnieCore"
 )

src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java

@@ -69,11 +69,6 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi
 		// ignored
 	}
 
-	// TODO unused method?
-	public void onPostQueenDeath(IBee queen) {
-		// ignored
-	}
-
 	// TODO unused method?
 	public boolean onEggLaid(IBee queen) {
 		return false;

src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java

@@ -25,7 +25,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier {
 	}
 
 	@Override
-	public String getItemStackDisplayName(ItemStack par1ItemStack) {
+	public String getItemStackDisplayName(ItemStack stack) {
 		return frame.getName();
 	}
 

src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java

@@ -77,7 +77,6 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements
 	public void onMachineBroken() {
 		min = null;
 		max = null;
-
 	}
 
 	@Override
@@ -93,13 +92,11 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements
 	@Override
 	public void updateClient(int arg0) {
 		super.updateEntity();
-
 	}
 
 	@Override
 	public void updateServer(int arg0) {
 		super.updateEntity();
-
 	}
 
 	@Override

src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java

@@ -18,6 +18,6 @@ public class FrameSlotValidator extends SlotValidator {
 
 	@Override
 	public String getTooltip() {
-		return I18N.localise("extrabees.achine.alveay.frame.tooltip");
+		return I18N.localise("extrabees.machine.alveay.frame.tooltip");
 	}
 }

src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java

@@ -2,7 +2,6 @@ package binnie.extrabees.apiary.machine.mutator;
 
 import binnie.core.machines.Machine;
 import binnie.extrabees.apiary.ComponentBeeModifier;
-import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
@@ -23,7 +22,7 @@ public class MutatorModifierComponent extends ComponentBeeModifier implements IB
 	}
 
 	@Override
-	public void onPostQueenDeath(IBee queen) {
+	public void onQueenDeath() {
 		getUtil().decreaseStack(AlvearyMutator.SLOT_MUTATOR, 1);
 	}
 }

src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java

@@ -26,7 +26,7 @@ public class TransmissionModifierComponent extends ComponentBeeModifier implemen
 		}
 
 		TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity();
-		List<IEnergyHandler> handlers = new ArrayList<IEnergyHandler>();
+		List<IEnergyHandler> handlers = new ArrayList<>();
 		for (TileEntity alvearyTile : tile.getAlvearyBlocks()) {
 			if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) {
 				handlers.add((IEnergyHandler) alvearyTile);

src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java

@@ -179,6 +179,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition {
 	VOLCANIC("Irrapis") {
 		@Override
 		protected void setBranchProperties(IAllele[] template) {
+			AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
 			AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
 			AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
 			AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID()));

src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java

@@ -71,7 +71,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
 
 	@Override
 	public String getDescription() {
-		return I18N.localise("extrabees.flowers." + name().toString().toLowerCase() + ".name");
+		return I18N.localise("extrabees.flowers." + name().toLowerCase() + ".name");
 	}
 
 	public void register() {

src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java

@@ -1,5 +1,6 @@
 package binnie.extrabees.genetics.requirements;
 
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
@@ -13,7 +14,7 @@ public class DummyMutationCondition implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		return 1.0F;
 	}
 

src/main/java/binnie/extrabees/products/ModuleProducts.java

@@ -1,11 +1,8 @@
 package binnie.extrabees.products;
 
 import binnie.core.IInitializable;
-import binnie.core.Mods;
 import binnie.extrabees.ExtraBees;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class ModuleProducts implements IInitializable {

src/main/java/binnie/extrabees/worldgen/HiveDrop.java

@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class HiveDrop implements IHiveDrop {
 	private IAllele[] template;
@@ -27,9 +28,7 @@ public class HiveDrop implements IHiveDrop {
 		}
 		this.template = template;
 		this.chance = chance;
-		for (ItemStack stack : bonus) {
-			additional.add(stack);
-		}
+		Collections.addAll(additional, bonus);
 	}
 
 	@Override
@@ -48,7 +47,7 @@ public class HiveDrop implements IHiveDrop {
 
 	@Override
 	public ArrayList<ItemStack> getAdditional(World world, int x, int y, int z, int fortune) {
-		ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+		ArrayList<ItemStack> ret = new ArrayList<>();
 		for (ItemStack stack : additional) {
 			ret.add(stack.copy());
 		}

src/main/java/binnie/extratrees/ExtraTrees.java

@@ -30,6 +30,7 @@ import net.minecraft.item.Item;
 @Mod(
 	modid = "ExtraTrees",
 	name = "Extra Trees",
+	version = BinnieCore.VERSION,
 	useMetadata = true,
 	dependencies = "after:BinnieCore"
 )

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

@@ -5,7 +5,6 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
 import net.minecraftforge.client.IItemRenderer;
 import org.lwjgl.opengl.GL11;
 

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/block/ModuleBlocks.java

@@ -53,7 +53,6 @@ public class ModuleBlocks implements IInitializable {
 		GameRegistry.registerBlock(ExtraTrees.blockMultiFence, ItemMetadata.class, "multifence");
 		BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockMultiFence), new ItemMetadataRenderer());
 		GameRegistry.registerBlock(ExtraTrees.blockLog, ItemMetadata.class, "log");
-		GameRegistry.registerBlock(ExtraTrees.blockShrubLeaves, "shrubLeaves");
 		GameRegistry.registerBlock(ExtraTrees.blockGate, ItemMetadata.class, "gate");
 		GameRegistry.registerBlock(ExtraTrees.blockSlab, ItemETSlab.class, "slab");
 		GameRegistry.registerBlock(ExtraTrees.blockDoubleSlab, ItemETSlab.class, "doubleSlab");

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

@@ -31,41 +31,41 @@ public class PlankType {
 	}
 
 	public enum ExtraTreePlanks implements IPlankType, IFenceProvider {
-		Fir(12815444),
-		Cedar(14181940),
-		Hemlock(13088108),
-		Cypress(16169052),
-		Fig(13142058),
-		Beech(14784849),
-		Alder(12092755),
-		Hazel(13480341),
-		Hornbeam(12818528),
-		Box(16511430),
-		Butternut(15510138),
-		Hickory(14333070),
-		Whitebeam(13222585),
-		Elm(15772004),
-		Apple(6305064),
-		Yew(14722426),
-		Pear(12093805),
-		Hawthorn(13402978),
-		Rowan(13610394),
-		Elder(12489337),
-		Maclura(15970862),
-		Syzgium(15123393),
-		Brazilwood(7487063),
-		Logwood(10762028),
-		Iroko(7681024),
-		Locust(12816736),
-		Eucalyptus(16165771),
-		Purpleheart(5970991),
-		Ash(16107368),
-		Holly(16512743),
-		Olive(11578760),
-		Sweetgum(13997656),
-		Rosewood(7738624),
-		Gingko(16050106),
-		PinkIvory(15502496);
+		Fir(0xc38c54),
+		Cedar(0xd86634),
+		Hemlock(0xc7b56c),
+		Cypress(0xf6b85c),
+		Fig(0xc8882a),
+		Beech(0xe19951),
+		Alder(0xb88553),
+		Hazel(0xcdb195),
+		Hornbeam(0xc39860),
+		Box(0xfbf1c6),
+		Butternut(0xecaa7a),
+		Hickory(0xdab48e),
+		Whitebeam(0xc9c2b9),
+		Elm(0xf0a964),
+		Apple(0x603528),
+		Yew(0xe0a57a),
+		Pear(0xb8896d),
+		Hawthorn(0xcc8362),
+		Rowan(0xcfad9a),
+		Elder(0xbe9279),
+		Maclura(0xf3b22e),
+		Syzgium(0xe6c3c1),
+		Brazilwood(0x723e57),
+		Logwood(0xa4372c),
+		Iroko(0x753400),
+		Locust(0xc39160),
+		Eucalyptus(0xf6ab8b),
+		Purpleheart(0x5b1c2f),
+		Ash(0xf5c768),
+		Holly(0xfbf6e7),
+		Olive(0xb0ad88),
+		Sweetgum(0xd59658),
+		Rosewood(0x761500),
+		Gingko(0xf4e7ba),
+		PinkIvory(0xec8ca0);
 
 		protected int color;
 		protected IIcon icon;
@@ -109,7 +109,7 @@ public class PlankType {
 		}
 	}
 
-	public enum VanillaPlanks implements IPlankType {
+	public enum VanillaPlanks implements IPlankType, IFenceProvider {
 		OAK(0xb4905a),
 		SPRUCE(0x805e36),
 		BIRCH(0xd7c185),
@@ -149,6 +149,11 @@ public class PlankType {
 			Block block = Blocks.planks;
 			return block.getIcon(2, meta);
 		}
+
+		@Override
+		public ItemStack getFence() {
+			return TileEntityMetadata.getItemStack(ExtraTrees.blockFence, WoodManager.getPlankTypeIndex(this));
+		}
 	}
 
 	public enum ForestryPlanks implements IPlankType, IFenceProvider {

src/main/java/binnie/extratrees/block/decor/BlockFence.java

@@ -1,6 +1,5 @@
 package binnie.extratrees.block.decor;
 
-import binnie.core.Mods;
 import binnie.core.block.BlockMetadata;
 import binnie.core.block.IBlockMetadata;
 import binnie.core.block.TileEntityMetadata;
@@ -19,7 +18,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -41,20 +39,17 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 		setStepSound(Block.soundTypeWood);
 	}
 
-	public static boolean canConnect(Block block) {
-		return block == ((ItemBlock) Mods.forestry.item("fences")).field_150939_a
-			|| block == Blocks.fence
-			|| block == Blocks.fence_gate
-			|| block == Blocks.nether_brick_fence
-			|| block instanceof IBlockFence
-			|| block == ExtraTrees.blockGate;
-	}
-
 	@Override
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
 		for (IFenceProvider type : PlankType.ExtraTreePlanks.values()) {
 			list.add(type.getFence());
 		}
+
+		for (IFenceProvider type : PlankType.VanillaPlanks.values()) {
+			if (type != PlankType.VanillaPlanks.OAK) {
+				list.add(type.getFence());
+			}
+		}
 	}
 
 	@Override
@@ -140,16 +135,10 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 
 	@Override
 	public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) {
-		if (!isFence(world, x, y, z)) {
-			Block block = world.getBlock(x, y, z);
-			return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock();
-		}
-		return true;
-	}
-
-	public boolean isFence(IBlockAccess world, int x, int y, int z) {
 		Block block = world.getBlock(x, y, z);
-		return canConnect(block);
+		Material material = block.getMaterial();
+		return IBlockFence.isFence(block) && material == this.blockMaterial
+			|| material.isOpaque() && block.renderAsNormalBlock() && material != Material.gourd;
 	}
 
 	@Override
@@ -185,6 +174,13 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 	}
 
 	@Override
+	//@SideOnly(Side.CLIENT)
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		return BlockMetadata.getPickBlock(world, x, y, z);
+	}
+
+	@Override
+	//@SideOnly(Side.CLIENT)
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		return BlockMetadata.getPickBlock(world, x, y, z);
 	}

src/main/java/binnie/extratrees/block/decor/BlockGate.java

@@ -137,6 +137,13 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata {
 	}
 
 	@Override
+	//@SideOnly(Side.CLIENT)
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		return BlockMetadata.getPickBlock(world, x, y, z);
+	}
+
+	@Override
+	//@SideOnly(Side.CLIENT)
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		return BlockMetadata.getPickBlock(world, x, y, z);
 	}

src/main/java/binnie/extratrees/block/decor/BlockHedge.java

@@ -29,10 +29,6 @@ public class BlockHedge extends Block implements IBlockFence {
 		setBlockName("hedge");
 	}
 
-	public static boolean func_149825_a(Block block) {
-		return BlockFence.canConnect(block);
-	}
-
 	public static int getColor(int meta) {
 		LeafType type = LeafType.values()[meta % 6];
 		if (type == LeafType.CONIFER) {
@@ -130,11 +126,11 @@ public class BlockHedge extends Block implements IBlockFence {
 		return ModuleBlocks.hedgeRenderID;
 	}
 
+	@Override
 	public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) {
 		Block block = world.getBlock(x, y, z);
 		return block == this
-			|| block == Blocks.fence_gate
-			|| func_149825_a(block)
+			|| IBlockFence.isFence(block)
 			|| block.isLeaves(world, x, y, z)
 			|| (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd);
 	}

src/main/java/binnie/extratrees/block/decor/FenceType.java

@@ -22,7 +22,7 @@ public class FenceType {
 	}
 
 	public static Collection<FenceType> values() {
-		List<FenceType> list = new ArrayList<FenceType>();
+		List<FenceType> list = new ArrayList<>();
 		for (int size = 0; size < 3; ++size) {
 			for (boolean solid : new boolean[]{false, true}) {
 				for (boolean embedded : new boolean[]{false, true}) {

src/main/java/binnie/extratrees/block/decor/IBlockFence.java

@@ -1,4 +1,26 @@
 package binnie.extratrees.block.decor;
 
+import binnie.core.Mods;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFence;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.world.IBlockAccess;
+
 public interface IBlockFence {
+
+    /**
+     * Test if the specified block is a fence
+     *
+     * @param block the block to test
+     * @return {@code true} if the specified block is a fence
+     */
+    static boolean isFence(Block block) {
+        return block == ((ItemBlock) Mods.forestry.item("fences")).field_150939_a
+                || block instanceof BlockFence && block != Blocks.nether_brick_fence
+                || block instanceof BlockFenceGate;
+    }
+
+    boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z);
 }

src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java

@@ -17,7 +17,7 @@ public class MultiFenceRecipeSize implements IRecipe {
 	@Override
 	public boolean matches(InventoryCrafting inv, World world) {
 		StringBuilder pattern = new StringBuilder();
-		List<IPlankType> types = new ArrayList<IPlankType>();
+		List<IPlankType> types = new ArrayList<>();
 		for (int i = 0; i < inv.getSizeInventory(); ++i) {
 			ItemStack stack = inv.getStackInSlot(i);
 			IPlankType type = (stack == null) ? null : WoodManager.get(stack);

src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java

@@ -60,7 +60,7 @@ public class NBTShapedRecipe implements IRecipe {
 		for (int i2 = 0; i2 < j * k; ++i2) {
 			char c0 = s.charAt(i2);
 			if (hashmap.containsKey(c0)) {
-				aitemstack[i2] = ((ItemStack) hashmap.get(Character.valueOf(c0))).copy();
+				aitemstack[i2] = ((ItemStack) hashmap.get(c0)).copy();
 			} else {
 				aitemstack[i2] = null;
 			}

src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java

@@ -81,7 +81,7 @@ public class CarpentryInterface implements ICarpentryInterface {
 
 	@Override
 	public Collection<IDesignCategory> getAllDesignCategories() {
-		List<IDesignCategory> categories = new ArrayList<IDesignCategory>();
+		List<IDesignCategory> categories = new ArrayList<>();
 		for (IDesignCategory category : CarpentryInterface.designCategories.values()) {
 			if (category.getDesigns().size() > 0) {
 				categories.add(category);
@@ -92,7 +92,7 @@ public class CarpentryInterface implements ICarpentryInterface {
 
 	@Override
 	public List<IDesign> getSortedDesigns() {
-		List<IDesign> designs = new ArrayList<IDesign>();
+		List<IDesign> designs = new ArrayList<>();
 		for (IDesignCategory category : getAllDesignCategories()) {
 			designs.addAll(category.getDesigns());
 		}

src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java

@@ -14,7 +14,6 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.util.I18N;
 import binnie.extratrees.FakeWorld;
-import binnie.extratrees.craftgui.ControlBlockIconDisplay;
 import forestry.api.arboriculture.EnumTreeChromosome;
 import forestry.api.arboriculture.IAlleleTreeSpecies;
 import forestry.api.arboriculture.ITree;
@@ -117,7 +116,7 @@ public class PageSpeciesTreeGenome extends PageSpecies {
 		new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MIDDLE_RIGHT);
 		new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT);
 		y += th;
-		List<ItemStack> fruits = new ArrayList<ItemStack>();
+		List<ItemStack> fruits = new ArrayList<>();
 		Collections.addAll(fruits, genome.getFruitProvider().getProducts());
 
 		if (!fruits.isEmpty()) {

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

@@ -213,7 +213,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
 		if (itemstack.getItem() == Mods.forestry.item("honeydew")) {
 			return 0.7f;
 		}
-		if (itemstack.getItem() == Mods.forestry.item("beeComb")) {
+		if (itemstack.getItem() == Mods.forestry.item("beeCombs")) {
 			return 0.4f;
 		}
 		if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {

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/genetics/ExtraTreeSpecies.java

@@ -1347,7 +1347,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
 		if (itemstack.getItem() == Mods.forestry.item("honeydew")) {
 			return 0.7f;
 		}
-		if (itemstack.getItem() == Mods.forestry.item("beeComb")) {
+		if (itemstack.getItem() == Mods.forestry.item("beeCombs")) {
 			return 0.4f;
 		}
 		if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {

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

@@ -68,7 +68,7 @@ public class ModuleGenetics implements IInitializable {
 
 	private void generateBranches() {
 		for (String hierarchy : branches) {
-			List<String> set = new ArrayList<String>();
+			List<String> set = new ArrayList<>();
 			for (String string : hierarchy.split(" ", 0)) {
 				set.add(string.toLowerCase());
 			}

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

@@ -25,6 +25,7 @@ import net.minecraft.item.Item;
 @Mod(
 	modid = "Genetics",
 	name = "Genetics",
+	version = BinnieCore.VERSION,
 	useMetadata = true,
 	dependencies = "after:BinnieCore"
 )

src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java

@@ -46,7 +46,7 @@ public class ControlGeneScroll extends Control implements IControlValue<Breeding
 		boolean isNEI = ((WindowGeneBank) Window.get(this)).isNei;
 
 		for (Map.Entry<IChromosomeType, List<IAllele>> entry : genes.entrySet()) {
-			List<IAllele> discovered = new ArrayList<IAllele>();
+			List<IAllele> discovered = new ArrayList<>();
 			for (IAllele allele : entry.getValue()) {
 				Gene gene = new Gene(allele, entry.getKey(), system.getSpeciesRoot());
 				if ((isNEI || tracker.isSequenced(new Gene(allele, entry.getKey(), system.getSpeciesRoot()))) && gene.getName().toLowerCase().contains(filter)) {

src/main/java/binnie/genetics/genetics/GeneItem.java

@@ -1,16 +1,18 @@
 package binnie.genetics.genetics;
 
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import forestry.api.core.INBTTagable;
+import forestry.api.genetics.ISpeciesRoot;
+
 import binnie.Binnie;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.genetics.Gene;
 import binnie.genetics.api.IGene;
-import forestry.api.core.INBTTagable;
-import forestry.api.genetics.ISpeciesRoot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.List;
 
 public class GeneItem implements INBTTagable, IGeneItem {
 	protected IGene gene;
@@ -85,7 +87,10 @@ public class GeneItem implements INBTTagable, IGeneItem {
 
 	@Override
 	public ISpeciesRoot getSpeciesRoot() {
-		return gene.getSpeciesRoot();
+		if (gene != null) {
+			return gene.getSpeciesRoot();
+		}
+		return null;
 	}
 
 	@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/java/binnie/genetics/gui/AnalystPageFruit.java

@@ -83,13 +83,8 @@ public class AnalystPageFruit extends AnalystPageProduce {
 		}
 
 		Collection<ItemStack> allProducts = new UniqueItemStackSet();
-		for (ItemStack stack3 : products) {
-			allProducts.add(stack3);
-		}
-
-		for (ItemStack stack3 : specialties) {
-			allProducts.add(stack3);
-		}
+		allProducts.addAll(products);
+		allProducts.addAll(specialties);
 
 		Collection<ItemStack> refinedProducts = new UniqueItemStackSet();
 		refinedProducts.addAll(getAllProductsAndFluids(allProducts));

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

@@ -66,9 +66,7 @@ public class AnalystPageWood extends AnalystPageProduce {
 		}
 
 		Collection<ItemStack> allProducts = new UniqueItemStackSet();
-		for (ItemStack stack2 : products) {
-			allProducts.add(stack2);
-		}
+		allProducts.addAll(products);
 
 		Collection<ItemStack> refinedProducts = new UniqueItemStackSet();
 		refinedProducts.addAll(getAllProductsAndFluids(allProducts));

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

@@ -115,13 +115,13 @@ public class WindowAnalyst extends Window {
 	@Override
 	public void initialiseClient() {
 		if (isDatabase) {
-			setTitle(I18N.localise("genetics.item.analyst.name"));
-		} else {
 			if (isMaster) {
 				setTitle(I18N.localise("genetics.item.registry.1.name"));
 			} else {
 				setTitle(I18N.localise("genetics.item.registry.0.name"));
 			}
+		} else {
+			setTitle(I18N.localise("genetics.item.analyst.name"));
 		}
 
 		getWindowInventory().createSlot(0);

src/main/java/binnie/genetics/item/ItemSerum.java

@@ -1,5 +1,18 @@
 package binnie.genetics.item;
 
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.ISpeciesRoot;
+
 import binnie.Binnie;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.genetics.Gene;
@@ -11,17 +24,6 @@ import binnie.genetics.genetics.GeneItem;
 import binnie.genetics.genetics.IGeneItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.ISpeciesRoot;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import java.util.List;
-import java.util.Map;
 
 public class ItemSerum extends ItemGene implements IItemSerum {
 	public ItemSerum() {
@@ -93,7 +95,10 @@ public class ItemSerum extends ItemGene implements IItemSerum {
 	public String getItemStackDisplayName(ItemStack stack) {
 		IGeneItem gene = getGeneItem(stack);
 		BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot());
-		return I18N.localise("genetics.item.serum.name", breedingSystem.getDescriptor());
+		if (breedingSystem != null) {
+			return I18N.localise("genetics.item.serum.name", breedingSystem.getDescriptor());
+		}
+		return I18N.localise("genetics.item.serumEmpty.name");
 	}
 
 	@Override

src/main/java/binnie/genetics/item/ItemSerumArray.java

@@ -1,5 +1,20 @@
 package binnie.genetics.item;
 
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.ISpeciesRoot;
+
 import binnie.Binnie;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.genetics.Gene;
@@ -11,19 +26,6 @@ import binnie.genetics.genetics.GeneArrayItem;
 import binnie.genetics.genetics.IGeneItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosome;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.IIndividual;
-import forestry.api.genetics.ISpeciesRoot;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import java.util.List;
 
 public class ItemSerumArray extends ItemGene implements IItemSerum {
 	public ItemSerumArray() {
@@ -111,7 +113,10 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
 	public String getItemStackDisplayName(ItemStack stack) {
 		IGeneItem gene = getGeneItem(stack);
 		BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot());
-		return I18N.localise("genetics.item.serumArray.name", breedingSystem.getDescriptor());
+		if (breedingSystem != null) {
+			return I18N.localise("genetics.item.serumArray.name", breedingSystem.getDescriptor());
+		}
+		return I18N.localise("genetics.item.genomeEmpty.name");
 	}
 
 	@Override

src/main/java/binnie/genetics/item/ModuleItem.java

@@ -202,51 +202,77 @@ public class ModuleItem implements IInitializable {
 		GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(1), 0.0f);
 		GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(1), 0.0f);
 
-		// TODO refactor refactor refactor this!
-		Item[] arr$;
-		Item[] lyzers = arr$ = new Item[]{
-			Mods.forestry.item("beealyzer"),
-			Mods.forestry.item("treealyzer"),
-			Mods.forestry.item("flutterlyzer")
-		};
-		for (Item a : arr$) {
-			for (Item b : lyzers) {
-				for (Item c : lyzers) {
-					if (a != b && a != c && b != c) {
-						GameRegistry.addShapedRecipe(
-							new ItemStack(Genetics.analyst),
-							" b ", "fct", " d ",
-							'c', GeneticsItems.IntegratedCircuit.get(1),
-							'b', a,
-							't', b,
-							'f', c,
-							'd', new ItemStack(Items.diamond)
-						);
-					}
-				}
-			}
-		}
+		// TODONE refactor refactor refactor this!
+		// CombatZAK up to the task!
+		Item beealyzer = Mods.forestry.item("beealyzer");
+		Item treealyzer = Mods.forestry.item("treealyzer");
 
-		Item[] dbs = {ExtraBees.dictionary, ExtraTrees.itemDictionary, ExtraTrees.itemDictionaryLepi, Botany.database};
+		//This bit prevents a crash if the Forestry butterflies module is disabled. You can use whatever placeholder item you but a diamond seems reasonable
+		//theoretically similar checks could be performed for Apiculture and Arboriculture; but I will leave that to the mod owner to decide
+		Item flutterlyzer = BinnieCore.isLepidopteryActive() ? Mods.forestry.item("flutterlyzer") //grab the forestry flutterlyzer ONLY IF lepidopterology is active
+				: Items.diamond; //otherwise just replace it with another diamond
+
+		ItemStack circuit = GeneticsItems.IntegratedCircuit.get(1); //get a reference to Integrated circuit
+		Item diamond = Items.diamond; //save a reference to diamond
+
+		ItemStack analyst = new ItemStack(Genetics.analyst); //save a reference to the analyst, will make the next bit easier
+
+		//the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is still
+		//more trouble than it's worth. A single recipe is probably fine, with the analyzers in a specific arrangement,
+		//but I will leave it to the mod owner to make that call
+
+		//there are literally only six permutations for this recipe, so let's just write them all out and save ourselves
+		//some cycles rather than spinning through an n^3 loop wasting most of the combinations.
+		//expand the first one out for readability, but the following five are compressed to a single line
+		GameRegistry.addShapedRecipe(analyst,
+				" b ", "tcf", " d ",
+				'b', beealyzer,
+				't', treealyzer,
+				'f', flutterlyzer,
+				'c', circuit,
+				'd', diamond);
+
+		GameRegistry.addShapedRecipe(analyst, " b ", "fct", " d ", 'b', beealyzer, 't', treealyzer, 'f', flutterlyzer, 'c', circuit, 'd', diamond);
+		GameRegistry.addShapedRecipe(analyst, " t ", "bcf", " d ", 'b', beealyzer, 't', treealyzer, 'f', flutterlyzer, 'c', circuit, 'd', diamond);
+		GameRegistry.addShapedRecipe(analyst, " t ", "fcb", " d ", 'b', beealyzer, 't', treealyzer, 'f', flutterlyzer, 'c', circuit, 'd', diamond);
+		GameRegistry.addShapedRecipe(analyst, " f ", "bct", " d ", 'b', beealyzer, 't', treealyzer, 'f', flutterlyzer, 'c', circuit, 'd', diamond);
+		GameRegistry.addShapedRecipe(analyst, " f ", "tcb", " d ", 'b', beealyzer, 't', treealyzer, 'f', flutterlyzer, 'c', circuit, 'd', diamond);
+
+		//get some references to dictionary/databases for the various modules; these names are very inconsistent for like items.
+		//should be refactored in their respective modules.
+		ItemStack registry = new ItemStack(Genetics.registry);
+		Item beeDb = ExtraBees.dictionary;
+		Item treeDb = ExtraTrees.itemDictionary;
+		Item flwrDb = Botany.database;
+
+		//do a check to ensure that the butterfly module is enabled before using the butterfly dictionary.
+		//a similar check could be done for arboriculture and apiculture as well, but that is left to the mod owner
+		Item lepiDb = BinnieCore.isLepidopteryActive() ? ExtraTrees.itemDictionaryLepi
+				: Items.diamond; //just use a diamond if Butterflies is disabled
+		//going to use the circuit reference above as well
+
+		//as above, there are only 24 permutations here; let's find a way to just get those recipes rather than trying
+		//256 combinations in an n^4 loop. This will help performance and maybe be a bit more maintainable.
 		if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
-			for (Item a2 : dbs) {
-				for (Item b2 : dbs) {
-					for (Item c2 : dbs) {
-						for (Item d : dbs) {
-							if (a2 != b2 && a2 != c2 && a2 != d && b2 != c2 && b2 != d && c2 != d) {
-								GameRegistry.addShapedRecipe(
-									new ItemStack(Genetics.registry),
-									" b ", "fct", " l ",
-									'c', GeneticsItems.IntegratedCircuit.get(1),
-									'b', a2,
-									't', b2,
-									'f', c2,
-									'l', d
-								);
-							}
-						}
-					}
-				}
+			//24 full recipe lines is a bit much to maintain; so we'll use a loop here, but we're only going
+			//to run it 24 times. Start by making an array of all 24 valid dictionary permutations...
+			String[] permutations = new String[]{
+					"btlf", "btfl", "bltf", "blft", "bftl", "bflt",
+					"tblf", "tbfl", "tlbf", "tlfb", "tfbl", "tflb",
+					"lbtf", "lbft", "ltbf", "ltfb", "lfbt", "lftb",
+					"fbtl", "fblt", "ftbl", "ftlb", "flbt", "fltb"
+			};
+
+			//now go through each of the permutations and create a recipe
+			for (String p : permutations) {
+				GameRegistry.addShapedRecipe(registry, //adding the recipe with registry as output
+						//this line is the 3-string arrangement, with the characters pulled from the current permutation
+						String.format(" %c ", p.charAt(0)), String.format("%cc%c", p.charAt(1), p.charAt(2)), String.format(" %c ", p.charAt(3)),
+						'b', beeDb,
+						't', treeDb,
+						'l', lepiDb,
+						'f', flwrDb,
+						'c', circuit);
 			}
 		}
 	}

src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java

@@ -3,6 +3,7 @@ package binnie.genetics.machine.genepool;
 import binnie.Binnie;
 import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.IChargedSlots;
+import binnie.core.machines.network.INetwork;
 import binnie.core.machines.power.ComponentProcessSetCost;
 import binnie.core.machines.power.ErrorState;
 import binnie.core.machines.power.IProcess;
@@ -12,7 +13,7 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.ItemStack;
 
-public class GenepoolComponentLogic extends ComponentProcessSetCost implements IProcess {
+public class GenepoolComponentLogic extends ComponentProcessSetCost implements IProcess, INetwork.TilePacketSync {
 	private float ethanolDrain;
 
 	public GenepoolComponentLogic(Machine machine) {

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

@@ -222,13 +222,13 @@ binniecore.item.container.can.resin=Resin Can
 binniecore.item.container.can.latex=Latex Can
 binniecore.item.container.can.turpentine=Turpentine Can
 
-binniecore.item.container.bucket.acid=Acid Bukket
-binniecore.item.container.bucket.poison=Poison Bukket
-binniecore.item.container.bucket.liquidnitrogen=Nitrogen Bukket
-binniecore.item.container.bucket.sap=Sap Bukket
-binniecore.item.container.bucket.resin=Resin Bukket
-binniecore.item.container.bucket.latex=Latex Bukket
-binniecore.item.container.bucket.turpentine=Turpentine Bukket
+binniecore.item.container.bucket.acid=Acid Bucket
+binniecore.item.container.bucket.poison=Poison Bucket
+binniecore.item.container.bucket.liquidnitrogen=Nitrogen Bucket
+binniecore.item.container.bucket.sap=Sap Bucket
+binniecore.item.container.bucket.resin=Resin Bucket
+binniecore.item.container.bucket.latex=Latex Bucket
+binniecore.item.container.bucket.turpentine=Turpentine Bucket
 
 binniecore.item.container.glass.acid=Acid Glass
 binniecore.item.container.glass.poison=Poison Glass

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

@@ -182,6 +182,7 @@ item.trowelIron.name=Iron Trowel
 item.trowelGold.name=Gold Trowel
 item.trowelDiamond.name=Diamond Trowel
 
+botany.flower.name=Flower
 botany.flower.dandelion=Dandelion
 botany.flower.poppy=Poppy
 botany.flower.orchid=Orchid

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

@@ -182,6 +182,7 @@ item.trowelIron.name=Железный совок
 item.trowelGold.name=Золотой совок
 item.trowelDiamond.name=Алмазный совок
 
+botany.flower.name=Цветок
 botany.flower.dandelion=Одуванчик
 botany.flower.poppy=Мак
 botany.flower.orchid=Орхидея

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

@@ -2,14 +2,14 @@ botany.tab.botany=Binnie|花卉
 
 botany.pigmentedGlass=染色玻璃
 botany.ceramicBlock=陶瓷块
-botany.ceramicTile=陶瓷瓦砖
+botany.ceramicTile=瓷砖
 botany.ceramicBricks=陶瓷砖块
 botany.strippedCeramicBricks=条纹陶瓷砖块
-botany.largeCeramicBricks=大型陶瓷瓦砖
-botany.splitCeramicTile=匀称陶瓷瓦砖
-botany.chequeredCeramicTile=方格陶瓷瓦砖
-botany.mixedCeramicTile=混合风格陶瓷瓦砖
-botany.verticalCeramicBricks=竖纹陶瓷瓦砖
+botany.largeCeramicBricks=大型瓷砖
+botany.splitCeramicTile=匀称瓷砖
+botany.chequeredCeramicTile=方格瓷砖
+botany.mixedCeramicTile=混合风格瓷砖
+botany.verticalCeramicBricks=竖纹瓷砖
 botany.verticalStripedCeramicBricks=竖状条纹陶瓷砖块
 botany.largeVerticalCeramicBricks=竖纹大型陶瓷砖块
 
@@ -18,39 +18,39 @@ botany.design.octagon=八边形
 botany.design.diamond=菱形
 botany.design.ringed=环形
 botany.design.squared=方形
-botany.design.multiply=Multiply
-botany.design.halved=Halved
-botany.design.striped=Striped
-botany.design.thinStriped=Thin Striped
-botany.design.fullChequered=Full Chequered
-botany.design.fullTiled=Full Tiled
-botany.design.chequered=Chequered
+botany.design.multiply=乘号
+botany.design.halved=均分
+botany.design.striped=条纹
+botany.design.thinStriped=细条纹
+botany.design.fullChequered=六面交错
+botany.design.fullTiled=六面瓦砖
+botany.design.chequered=交错
 botany.design.tiled=瓦砖
-botany.design.veryThinCornered=Very Thin Cornered
-botany.design.thinCornered=Thin Cornered
-botany.design.cornered=Cornered
-botany.design.thickCornered=Thick Cornered
-botany.design.edged=Edged
-botany.design.thinEdged=Thin Edged
-botany.design.thinBarred=Thin Barred
-botany.design.barred=Barred
-botany.design.thickBarred=Thick Barred
+botany.design.veryThinCornered=迷你拐角
+botany.design.thinCornered=细拐角
+botany.design.cornered=拐角
+botany.design.thickCornered=宽拐角
+botany.design.edged=单边
+botany.design.thinEdged=细边
+botany.design.thinBarred=细中线
+botany.design.barred=中线
+botany.design.thickBarred=宽中线
 botany.design.diagonal=对角线
-botany.design.thickDiagonal=Thick Diagonal
-botany.design.thinSaltire=Thin Saltire
-botany.design.saltire=Saltire
-botany.design.thickSaltire=Thick Saltire
-botany.design.thinCrossed=Thin Crossed
-botany.design.crossed=Crossed
-botany.design.thickCrossed=Thick Crossed
-botany.design.thinTSection=Thin T Section
-botany.design.tSection=T Section
-botany.design.thickTSection=Thick T Section
-botany.design.thinBarredCorner=Thin Barred Corner
-botany.design.barredCorner=Barred Corner
-botany.design.thickBarredCorner=Thick Barred Corner
-botany.design.thinStripedCorner=Thin Striped Corner
-botany.design.stripedCorner=Striped Corner
+botany.design.thickDiagonal=宽对角线
+botany.design.thinSaltire=细斜十字纹
+botany.design.saltire=斜十字纹
+botany.design.thickSaltire=宽斜十字纹
+botany.design.thinCrossed=细十字纹
+botany.design.crossed=十字纹
+botany.design.thickCrossed=宽十字纹
+botany.design.thinTSection=细T形纹
+botany.design.tSection=T形纹
+botany.design.thickTSection=宽T形纹
+botany.design.thinBarredCorner=细中线拐角
+botany.design.barredCorner=中线拐角
+botany.design.thickBarredCorner=宽中线拐角
+botany.design.thinStripedCorner=细条纹拐角
+botany.design.stripedCorner=条纹拐角
 botany.design.emblem1=徽章 1
 botany.design.emblem2=徽章 2
 botany.design.emblem3=徽章 3
@@ -82,38 +82,38 @@ botany.design.letterW=字母 W
 botany.design.letterX=字母 X
 botany.design.letterY=字母 Y
 botany.design.letterZ=字母 Z
-botany.design.thinCurvedCrossed=Thin Curved Crossed
-botany.design.thinCurvedBarredCorner=Thin Curved Barred Corner
-botany.design.curvedBarredCorner=Curved Barred Corner
-botany.design.thinCurvedCorner=Thin Curved Corner
-botany.design.curvedCorner=Curved Corner
-botany.design.thinCurvedTSection=Thin Curved T Section
-botany.design.curvedTSection=Curved T Section
-botany.design.barredEnd=Barred End
-botany.design.diagonalCorner=Diagonal Corner
-botany.design.diagonalTSection=Diagonal T Section
-botany.design.diagonalCurvedCorner=Diagonal Curved Corner
-botany.design.diagonalCurvedTSection=Diagonal Curved T Section
-botany.design.ornateBarred=Ornate Barred
-botany.design.splitBarred=Split Barred
-botany.design.splitBarredCorner=Split Barred Corner
-botany.design.splitBarredTSection=Split Barred T Section
-botany.design.splitCrossed=Split Crossed
-botany.design.splitBarredEnd=Split Barred End
-botany.design.ornateThinBarred=Ornate Thin Barred
+botany.design.thinCurvedCrossed=细弧十字纹
+botany.design.thinCurvedBarredCorner=细弧中线拐角
+botany.design.curvedBarredCorner=中弧线拐角
+botany.design.thinCurvedCorner=细弧型拐角
+botany.design.curvedCorner=弧型拐角
+botany.design.thinCurvedTSection=细弧T形纹
+botany.design.curvedTSection=弧T形纹
+botany.design.barredEnd=中线末端
+botany.design.diagonalCorner=对角线拐角
+botany.design.diagonalTSection=对角T形纹
+botany.design.diagonalCurvedCorner=对角弧线拐角
+botany.design.diagonalCurvedTSection=对角弧线T形纹
+botany.design.ornateBarred=居中华纹
+botany.design.splitBarred=居中条纹
+botany.design.splitBarredCorner=居中条纹拐角
+botany.design.splitBarredTSection=居中条纹T形纹
+botany.design.splitCrossed=居中条纹十字纹
+botany.design.splitBarredEnd=居中条纹末端
+botany.design.ornateThinBarred=细居中华纹
 botany.design.circle=圆圈
-botany.design.plus=Plus
+botany.design.plus=加号
 botany.design.creeper=爬行者
-botany.design.ornateStripedCorner=Ornate Striped Corner
-botany.design.testingBlock=Testing Block
-botany.design.diagonalHalved=Diagonal Halved
-botany.design.corneredDiagonal=Cornered Diagonal
-botany.design.oppositeCorneredDiagonal=Opposite Cornered Diagonal
-botany.design.thickCorneredDiagonal=Thick Cornered Diagonal
-botany.design.thinBarredEnd=Thin Barred End
-botany.design.thickBarredEnd=Thick Barred End
-botany.design.overlappedBarred=Overlapped Barred
-botany.design.overlappedSplitBarred=Overlapped Split Barred
+botany.design.ornateStripedCorner=华纹条纹拐角
+botany.design.testingBlock=测试方块
+botany.design.diagonalHalved=对角均分
+botany.design.corneredDiagonal=对角拐角
+botany.design.oppositeCorneredDiagonal=镜面对角拐角
+botany.design.thickCorneredDiagonal=宽对角拐角
+botany.design.thinBarredEnd=细中线末端
+botany.design.thickBarredEnd=宽中线末端
+botany.design.overlappedBarred=交错中线
+botany.design.overlappedSplitBarred=交错居中条纹
 
 botany.design.category.designsEmblems=样式与徽章
 botany.design.category.squaresStripes=方形与条纹
@@ -143,7 +143,7 @@ botany.soil.weedkiller=除草剂
 
 botany.soil.tooltip.type=类型：
 botany.soil.tooltip.moisture=湿度：
-botany.soil.tooltip.pH=pH：
+botany.soil.tooltip.pH=pH值：
 
 botany.item.tooltip.holdMore=<按下 Shift 显示详细信息>
 botany.item.tooltip.bugged=这个物品出问题了，请立即销毁！
@@ -153,8 +153,8 @@ botany.item.tooltip.hybrid=%s-%s 杂合种
 botany.item.tooltip.age=年龄：%d
 botany.item.tooltip.temperature=温度：%s / %s
 botany.item.tooltip.moisture=湿度：%s / %s
-botany.item.tooltip.pH=pH：%s / %s
-botany.item.tooltip.fertility=Fertility: %dx
+botany.item.tooltip.pH=pH值：%s / %s
+botany.item.tooltip.fertility=肥沃度: %dx
 botany.item.tooltip.flowerColor1=花茎：%1$s、%2$s
 botany.item.tooltip.flowerColor2=花茎：%1$s、%2$s和%3$s
 
@@ -163,12 +163,12 @@ botany.item.pigment.name=颜料
 botany.item.clay.name=粘土
 botany.item.botany.name=%1$s %2$s
 botany.item.pollen.tag.name=花粉
-botany.item.germling.tag.name=Germling
+botany.item.germling.tag.name=幼苗
 botany.item.flowerCorrupted.name=腐烂的花
 botany.item.database.0.name=园丁数据库
 botany.item.database.1.name=园艺大师数据库
 botany.item.powderAsh.name=灰烬粉
-botany.item.powderPulp.name=Pulp Powder
+botany.item.powderPulp.name=木浆粉
 botany.item.powderMulch.name=覆盖戍粉
 botany.item.powderSulphur.name=硫磺粉
 botany.item.powderFertiliser.name=肥料粉
@@ -312,7 +312,7 @@ botany.colour.white=白
 botany.colour.yellow=黄
 botany.colour.yellowgreen=黄绿
 
-botany.effect.none=None
+botany.effect.none=无
 
 for.binnie.circuit.garden.dry.manual.fert=肥沃花土(干燥)
 for.binnie.circuit.garden.dry.acid.manual.fert=花土(花土(干燥，酸性)
@@ -375,6 +375,58 @@ botany.tube.insulate.hardenedClay=硬化粘土
 botany.tube.insulate.smoothStone=石头
 botany.tube.insulate.sandstone=沙石
 
+binnie.circuit.garden.normal=花园 (适中)
+binnie.circuit.garden.normal.fert=花园 (肥沃)
+binnie.circuit.garden.normal.neutral=花园 (中性)
+binnie.circuit.garden.normal.neutral.fert=花园 (肥沃/中性)
+binnie.circuit.garden.normal.acid=花园 (酸性)
+binnie.circuit.garden.normal.acid.fert=花园 (肥沃/酸性)
+binnie.circuit.garden.normal.alkaline.fert=花园 (肥沃/碱性)
+binnie.circuit.garden.normal.alkaline=花园 (碱性)
+binnie.circuit.garden.damp=花园 (潮湿)
+binnie.circuit.garden.damp.fert=花园 (肥沃/潮湿)
+binnie.circuit.garden.damp.acid=花园 (潮湿/酸性)
+binnie.circuit.garden.damp.acid.fert=花园 (肥沃/潮湿/酸性)
+binnie.circuit.garden.damp.alkaline=花园 (潮湿/碱性)
+binnie.circuit.garden.damp.alkaline.fert=花园 (肥沃/潮湿/碱性)
+binnie.circuit.garden.damp.neutral=花园 (潮湿/中性)
+binnie.circuit.garden.damp.neutral.fert=花园 (肥沃/潮湿/中性)
+binnie.circuit.garden.dry=花园 (干燥)
+binnie.circuit.garden.dry.fert=花园 (肥沃/干燥)
+binnie.circuit.garden.dry.acid=花园 (干燥/酸性)
+binnie.circuit.garden.dry.acid.fert=花园 (肥沃/干燥/酸性)
+binnie.circuit.garden.dry.alkaline=花园 (干燥/碱性)
+binnie.circuit.garden.dry.alkaline.fert=花园 (肥沃/干燥/碱性)
+binnie.circuit.garden.dry.neutral=花园 (干燥/中性)
+binnie.circuit.garden.dry.neutral.fert=花园 (肥沃/干燥/中性)
+binnie.circuit.garden.neutral.fert=花园 (肥沃/中性)
+ 
+binnie.circuit.garden.normal.manual=花园 (适中)
+binnie.circuit.garden.normal.manual.fert=花园 (肥沃)
+binnie.circuit.garden.normal.neutral.manual=花园 (中性)
+binnie.circuit.garden.normal.neutral.manual.fert=花园 (肥沃/中性)
+binnie.circuit.garden.normal.acid.manual=花园 (酸性)
+binnie.circuit.garden.normal.acid.manual.fert=花园 (肥沃/酸性)
+binnie.circuit.garden.normal.alkaline.manual=花园 (碱性)
+binnie.circuit.garden.normal.alkaline.manual.fert=花园 (肥沃/碱性)
+binnie.circuit.garden.damp.manual=花园 (潮湿)
+binnie.circuit.garden.damp.manual.fert=花园 (肥沃/潮湿)
+binnie.circuit.garden.damp.acid.manual=花园 (潮湿/酸性)
+binnie.circuit.garden.damp.acid.manual.fert=花园 (肥沃/潮湿/酸性)
+binnie.circuit.garden.damp.alkaline.manual=花园 (潮湿/碱性)
+binnie.circuit.garden.damp.alkaline.manual.fert=花园 (肥沃/潮湿/碱性)
+binnie.circuit.garden.damp.neutral.manual=花园 (潮湿/中性)
+binnie.circuit.garden.damp.neutral.manual.fert=花园 (肥沃/潮湿/中性)
+binnie.circuit.garden.dry.manual=花园 (干燥)
+binnie.circuit.garden.dry.manual.fert=花园 (肥沃/干燥)
+binnie.circuit.garden.dry.acid.manual=花园 (干燥/酸性)
+binnie.circuit.garden.dry.acid.manual.fert=花园 (肥沃/干燥,/酸性)
+binnie.circuit.garden.dry.alkaline.manual=花园 (干燥/碱性)
+binnie.circuit.garden.dry.alkaline.manual.fert=花园 (肥沃/干燥/碱性)
+binnie.circuit.garden.dry.neutral.manual=花园 (干燥/中性)
+binnie.circuit.garden.dry.neutral.manual.fert=花园 (肥沃/干燥/中性)
+binnie.circuit.garden.neutral.manual.fert=花园 (肥沃/中性)
+
 botany.gui.controls.colorMixSymbol.chance=当前概率：%f%%
 botany.gui.controls.pageSpeciesFurtherTitle=导向突变
 botany.gui.controls.pageColorFurtherTitle=次代突变
@@ -387,11 +439,11 @@ botany.gui.database.tab.genome=基因組
 botany.gui.database.tab.genome.temp=温度：
 botany.gui.database.tab.genome.moist=湿度：
 botany.gui.database.tab.genome.ph=pH值：
-botany.gui.database.tab.genome.fertility=Fertility :
+botany.gui.database.tab.genome.fertility=肥沃度:
 botany.gui.database.tab.genome.lifespan=生命周期：
 botany.gui.database.tab.genome.lifespan.value=%s 天
 botany.gui.database.tab.genome.nectar=花蜜：
-botany.gui.database.tab.genome.varieties=Varieties :
+botany.gui.database.tab.genome.varieties=品种:
 
 botany.gui.database.tab.species.classification=科学分类
 botany.gui.database.tab.species.resultant=导向突变

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

@@ -208,7 +208,7 @@ extrabees.machine.alveay.hatchery.info=Collect larvae laid by queen bees inside
 extrabees.machine.alveay.hatchery.tooltip=Larvae
 
 extrabees.machine.alveay.transmission=Alveary Transmission
-extrabees.machine.alveay.transmission.info=
+extrabees.machine.alveay.transmission.info=The Alveary Transmission accepts power and distributes it between all other alveary blocks that accept power.
 
 
 ##################################################
@@ -306,7 +306,7 @@ extrabees.species.desolate.name=Desolate
 extrabees.species.desolate.desc=They thrive in blasted wastelands where other life simply withers away.|Apiarist Manual
 extrabees.species.gnawing.name=Gnawing
 extrabees.species.rotten.name=Decaying
-extrabees.species.rotten.desc=These bees have an ususual attraction to dead, rotting meat and will store it in their combs. The smell also attracts other unsavoury types.|Apiarist Manual
+extrabees.species.rotten.desc=These bees have an unusual attraction to dead, rotting meat and will store it in their combs. The smell also attracts other unsavoury types.|Apiarist Manual
 extrabees.species.bone.name=Skeletal
 extrabees.species.bone.desc=Largely unable to defend their hives in the wild, they attract other creatures to guard their homes.|Apiarist Manual
 extrabees.species.creeper.name=Creepy

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

@@ -3,15 +3,15 @@
 
 extrabees.item.comb.barren=贫瘠蜂窝
 extrabees.item.comb.rotten=腐肉蜂窝
-extrabees.item.comb.bone=骨粉蜂窝
+extrabees.item.comb.bone=骨头蜂窝
 extrabees.item.comb.oil=石油蜂窝
-extrabees.item.comb.coal=化石蜂窝
-extrabees.item.comb.fuel=原油蜂窝
+extrabees.item.comb.coal=煤炭蜂窝
+extrabees.item.comb.fuel=燃油蜂窝
 extrabees.item.comb.water=潮湿蜂窝
 extrabees.item.comb.milk=牛奶蜂窝
-extrabees.item.comb.fruit=水果蜂窝
+extrabees.item.comb.fruit=果汁蜂窝
 extrabees.item.comb.seed=种子油蜂窝
-extrabees.item.comb.alcohol=酒精蜂窝
+extrabees.item.comb.alcohol=蜂蜜酒蜂窝
 extrabees.item.comb.stone=石头蜂窝
 extrabees.item.comb.redstone=红石蜂窝
 extrabees.item.comb.resin=树脂蜂窝
@@ -47,29 +47,29 @@ extrabees.item.comb.emerald=绿宝石蜂窝
 extrabees.item.comb.ruby=红宝石蜂窝
 extrabees.item.comb.sapphire=蓝宝石蜂窝
 extrabees.item.comb.diamond=钻石蜂窝
-extrabees.item.comb.red=染色蜂窝(红)
-extrabees.item.comb.yellow=染色蜂窝(黄)
-extrabees.item.comb.blue=染色蜂窝(蓝)
-extrabees.item.comb.green=染色蜂窝(绿)
-extrabees.item.comb.black=染色蜂窝(黑)
-extrabees.item.comb.white=染色蜂窝(白)
-extrabees.item.comb.brown=染色蜂窝(棕)
-extrabees.item.comb.orange=染色蜂窝(橙)
-extrabees.item.comb.cyan=染色蜂窝(青)
-extrabees.item.comb.purple=染色蜂窝(紫)
-extrabees.item.comb.gray=染色蜂窝(灰)
-extrabees.item.comb.lightblue=染色蜂窝(淡蓝)
-extrabees.item.comb.pink=染色蜂窝(粉红)
-extrabees.item.comb.limegreen=染色蜂窝(黄绿)
-extrabees.item.comb.magenta=染色蜂窝(品红)
-extrabees.item.comb.lightgray=染色蜂窝(淡灰)
+extrabees.item.comb.red=染色蜂窝（红）
+extrabees.item.comb.yellow=染色蜂窝（黄）
+extrabees.item.comb.blue=染色蜂窝（蓝）
+extrabees.item.comb.green=染色蜂窝（绿）
+extrabees.item.comb.black=染色蜂窝（黑）
+extrabees.item.comb.white=染色蜂窝（白）
+extrabees.item.comb.brown=染色蜂窝（棕）
+extrabees.item.comb.orange=染色蜂窝（橙）
+extrabees.item.comb.cyan=染色蜂窝（青）
+extrabees.item.comb.purple=染色蜂窝（紫）
+extrabees.item.comb.gray=染色蜂窝（灰）
+extrabees.item.comb.lightblue=染色蜂窝（淡蓝）
+extrabees.item.comb.pink=染色蜂窝（粉红）
+extrabees.item.comb.limegreen=染色蜂窝（黄绿）
+extrabees.item.comb.magenta=染色蜂窝（品红）
+extrabees.item.comb.lightgray=染色蜂窝（淡灰）
 extrabees.item.comb.nickel=镍蜂窝
 extrabees.item.comb.glowstone=荧石蜂窝
 extrabees.item.comb.saltpeter=硝石蜂窝
-extrabees.item.comb.compost=腐烂蜂窝
+extrabees.item.comb.compost=堆肥蜂窝
 extrabees.item.comb.sawdust=木屑蜂窝
 extrabees.item.comb.certus=赛特斯石英蜂窝
-extrabees.item.comb.enderpearl=闪光蜂窝
+extrabees.item.comb.enderpearl=微光蜂窝
 extrabees.item.comb.yellorium=黄铀蜂窝
 extrabees.item.comb.cyanite=蓝晶蜂窝
 extrabees.item.comb.blutonium=蓝钚蜂窝
@@ -87,22 +87,22 @@ extrabees.item.honeydrop.fruit=水果蜜汁
 extrabees.item.honeydrop.vegetable=菜叶蜜汁
 extrabees.item.honeydrop.pumpkin=新鲜蜜汁
 extrabees.item.honeydrop.melon=闪光蜜汁
-extrabees.item.honeydrop.red=染色蜜汁(红)
-extrabees.item.honeydrop.yellow=染色蜜汁(黄)
-extrabees.item.honeydrop.blue=染色蜜汁(蓝)
-extrabees.item.honeydrop.green=染色蜜汁(绿)
-extrabees.item.honeydrop.black=染色蜜汁(黑)
-extrabees.item.honeydrop.white=染色蜜汁(白)
-extrabees.item.honeydrop.brown=染色蜜汁(棕)
-extrabees.item.honeydrop.orange=染色蜜汁(橙)
-extrabees.item.honeydrop.cyan=染色蜜汁(青)
-extrabees.item.honeydrop.purple=染色蜜汁(紫)
-extrabees.item.honeydrop.gray=染色蜜汁(灰)
-extrabees.item.honeydrop.lightblue=染色蜜汁(淡蓝)
-extrabees.item.honeydrop.pink=染色蜜汁(粉)
-extrabees.item.honeydrop.limegreen=染色蜜汁(黄绿)
-extrabees.item.honeydrop.magenta=染色蜜汁(品红)
-extrabees.item.honeydrop.lightgray=染色蜜汁(淡灰)
+extrabees.item.honeydrop.red=染色蜜汁（红）
+extrabees.item.honeydrop.yellow=染色蜜汁（黄）
+extrabees.item.honeydrop.blue=染色蜜汁（蓝）
+extrabees.item.honeydrop.green=染色蜜汁（绿）
+extrabees.item.honeydrop.black=染色蜜汁（黑）
+extrabees.item.honeydrop.white=染色蜜汁（白）
+extrabees.item.honeydrop.brown=染色蜜汁（棕）
+extrabees.item.honeydrop.orange=染色蜜汁（橙）
+extrabees.item.honeydrop.cyan=染色蜜汁（青）
+extrabees.item.honeydrop.purple=染色蜜汁（紫）
+extrabees.item.honeydrop.gray=染色蜜汁（灰）
+extrabees.item.honeydrop.lightblue=染色蜜汁（淡蓝）
+extrabees.item.honeydrop.pink=染色蜜汁（粉）
+extrabees.item.honeydrop.limegreen=染色蜜汁（黄绿）
+extrabees.item.honeydrop.magenta=染色蜜汁（品红）
+extrabees.item.honeydrop.lightgray=染色蜜汁（淡灰）
 
 extrabees.item.propolis.water=含水蜂胶
 extrabees.item.propolis.oil=石油蜂胶
@@ -117,11 +117,11 @@ extrabees.item.frame.clay=治愈框架
 extrabees.item.frame.debug=新星框架
 
 extrabees.item.serum.tooltip.nocharge=空的
-extrabees.item.serum.tooltip.charge1=剩余 1 可用次数
-extrabees.item.serum.tooltip.manycharge=剩余 %d 可用次数
-extrabees.item.serum.corrupted=肮脏的血清瓶
+extrabees.item.serum.tooltip.charge1=当前可用 1 次
+extrabees.item.serum.tooltip.manycharge=当前可用 %d 次
+extrabees.item.serum.corrupted=脏血清瓶
 extrabees.item.serum.name=%s 血清瓶
-extrabees.item.serum.empty=空的血清瓶
+extrabees.item.serum.empty=空血清瓶
 
 extrabees.item.template.corrupted=脏的模版
 extrabees.item.template.name=%s 模版
@@ -185,48 +185,48 @@ extrabees.glacial=液氮
 ## Machines
 
 extrabees.machine.alveay.frame=框架栏
-extrabees.machine.alveay.frame.info=一个框架栏可以放一个框架，框架可以影响蜜蜂的属性。
+extrabees.machine.alveay.frame.info=框架栏内可以放入一个框架以影响蜜蜂的属性。
 extrabees.machine.alveay.frame.tooltip=蜂箱框架
 
-extrabees.machine.alveay.lighting=蜂箱日光灯
-extrabees.machine.alveay.lighting.info=日光灯的存在可以让蜜蜂以为黑夜还没到。
+extrabees.machine.alveay.lighting=蜂箱组日光灯
+extrabees.machine.alveay.lighting.info=蜂箱组日光灯欺骗了蜜蜂，让蜜蜂以为黑夜还没到。
 
 extrabees.machine.alveay.mutator=基因突变器
-extrabees.machine.alveay.mutator.info=突变器使用诱变剂来诱导基因突变。
-extrabees.machine.alveay.mutator.tooltip=需要诱变剂
+extrabees.machine.alveay.mutator.info=基因突变器使用诱变剂来诱导基因突变。
+extrabees.machine.alveay.mutator.tooltip=诱变剂
 extrabees.machine.alveay.mutator.mutagens=可用诱变剂：
 
 extrabees.machine.alveay.rainShield=挡雨方块
-extrabees.machine.alveay.rainShield.info=这方块可为蜜蜂遮风挡雨。
+extrabees.machine.alveay.rainShield.info=挡雨方块可为蜜蜂遮风挡雨，防止其受到降雨的影响。
 
-extrabees.machine.alveay.stimulator=电子增产器
-extrabees.machine.alveay.stimulator.info=利用和框架类似的原理，借助电路和能量来提高蜜蜂各种产物的产量。
-extrabees.machine.alveay.stimulator.tooltip=林业电路相关
+extrabees.machine.alveay.stimulator=电刺激器
+extrabees.machine.alveay.stimulator.info=利用和框架类似的原理，借助电路和能量来刺激蜜蜂。
+extrabees.machine.alveay.stimulator.tooltip=林业电路板
 
 extrabees.machine.alveay.hatchery=孵化间
 extrabees.machine.alveay.hatchery.info=收集蜂箱内蜂后身旁那些躺着的幼虫。
 extrabees.machine.alveay.hatchery.tooltip=幼虫
 
-extrabees.machine.alveay.transmission=蜂箱能量接口
-extrabees.machine.alveay.transmission.info=
+extrabees.machine.alveay.transmission=蜂箱组能量接口
+extrabees.machine.alveay.transmission.info=蜂箱组能量接口可以接收能量并将其分配到其他所有的接受能量的蜂箱组方块之间。
 
 
 ##################################################
 ## Misc
 
 extrabees.circuit.layout.stimulator=电子增产器
-extrabees.circuit.layout.stimulator.usage=在电子增产器内
+extrabees.circuit.layout.stimulator.usage=电子增产器
 extrabees.tab.genetics=基因
 
-for.binnie.circuit.stimulator.lowvoltage=低压激化
-for.binnie.circuit.stimulator.highvoltage=高压激化
-for.binnie.circuit.stimulator.plant=生物激化
-for.binnie.circuit.stimulator.death=充能激化
-for.binnie.circuit.stimulator.life=柔和激化
-for.binnie.circuit.stimulator.nether=熔融激化
-for.binnie.circuit.stimulator.mutation=突变激化
-for.binnie.circuit.stimulator.inhibitor=抑制激化
-for.binnie.circuit.stimulator.territory=不稳激化
+for.binnie.circuit.stimulator.lowvoltage=低压刺激
+for.binnie.circuit.stimulator.highvoltage=高压刺激
+for.binnie.circuit.stimulator.plant=生物刺激
+for.binnie.circuit.stimulator.death=充能刺激
+for.binnie.circuit.stimulator.life=柔和刺激
+for.binnie.circuit.stimulator.nether=灼热刺激
+for.binnie.circuit.stimulator.mutation=突变刺激
+for.binnie.circuit.stimulator.inhibitor=抑制刺激
+for.binnie.circuit.stimulator.territory=不稳刺激
 
 extrabees.genetics.quality.awful=极差
 extrabees.genetics.quality.poor=差
@@ -235,22 +235,22 @@ extrabees.genetics.quality.good=好
 extrabees.genetics.quality.excellent=极好
 extrabees.genetics.quality.tooltip=品质 %s
 
-extrabees.genetics.allele.noeffect=无特效
+extrabees.genetics.allele.noeffect=无特殊效果
 extrabees.genetics.allele.noflower=无特定花粉
-extrabees.genetics.allele.lifespan=%s 寿命周期
-extrabees.genetics.allele.production=%s 产速
+extrabees.genetics.allele.lifespan=%s 寿命
+extrabees.genetics.allele.production=%s 工作速度
 extrabees.genetics.allele.fertility=%s 生育能力
 extrabees.genetics.allele.flowering=%s 授粉速度
-extrabees.genetics.allele.territory=%s 工作范围
-extrabees.genetics.allele.tolerance=%s %s 忍受能力
-extrabees.genetics.allele.species=%s 种族
-extrabees.genetics.allele.effect=%s 效果
+extrabees.genetics.allele.territory=%s 活动范围
+extrabees.genetics.allele.tolerance=%s %s 适应性
+extrabees.genetics.allele.species=%s 品种
+extrabees.genetics.allele.effect=%s 特殊效果
 extrabees.genetics.allele.flower=%s 花粉
 extrabees.genetics.allele.humidity=湿度
 extrabees.genetics.allele.temperature=温度
-extrabees.genetics.allele.nocturnal=夜行
-extrabees.genetics.allele.caveDwelling=穴居
-extrabees.genetics.allele.tolerantFlyer=耐雨
+extrabees.genetics.allele.nocturnal=夜行性
+extrabees.genetics.allele.caveDwelling=穴居性
+extrabees.genetics.allele.tolerantFlyer=耐雨飞行性
 
 extrabees.genetics.corrupted=肮脏的
 extrabees.genetics.requirements.user=Can only be bred by %s
@@ -299,29 +299,29 @@ extrabees.flowers.fruit.name=水果
 extrabees.flowers.mystical.name=神秘
 
 extrabees.species.arid.name=干旱
-extrabees.species.arid.desc=他们喜欢干旱的大陆，他们的蜂巢几乎都由蜡组成，少有蜂蜜。|养蜂人手册
+extrabees.species.arid.desc=它们喜欢干旱的大陆，它们的蜂窝几乎都由蜡组成，少有蜂蜜。|养蜂人手册
 extrabees.species.barren.name=荒芜
-extrabees.species.barren.desc=这种对沙漠的偏爱，使得他们可以生活在完全没有花的世界。|养蜂人手册
+extrabees.species.barren.desc=这种对沙漠的偏爱，使得它们可以生活在完全没有花的世界。|养蜂人手册
 extrabees.species.desolate.name=荒凉
 extrabees.species.desolate.desc=被诅咒的荒芜之地对于别的生物来说是地狱，是万物的凋零，而这种蜜蜂却能在这种环境里生生不息。|养蜂人手册
 extrabees.species.gnawing.name=痛苦
 extrabees.species.rotten.name=腐烂
-extrabees.species.rotten.desc=这些蜜蜂对死去的动物的腐肉有种不寻常的兴趣，他们甚至会在蜂巢里储存腐肉。他们也会吸引一些比较难闻的生物(僵尸)。|养蜂人手册
+extrabees.species.rotten.desc=这些蜜蜂对死去的动物的腐肉有种不寻常的兴趣，它们甚至会在蜂巢里储存腐肉。它们的气味也会吸引一些比较难闻的生物（僵尸）。|养蜂人手册
 extrabees.species.bone.name=骷髅
-extrabees.species.bone.desc=因为在野外它们很难保卫他们的家，他们吸引了其他的生物(骷髅)来保卫他们的蜂房。|养蜂人手册
+extrabees.species.bone.desc=因为在野外它们很难保卫它们的家，所以它们吸引了其他的生物（骷髅）来保卫它们的蜂房。|养蜂人手册
 extrabees.species.creeper.name=爬行者
-extrabees.species.creeper.desc=你不是很确定你会不会听到他们发出爆炸声。|Binnie，养蜂人
+extrabees.species.creeper.desc=你不是很确定你会不会听到它们发出爆炸声。|Binnie，养蜂人
 extrabees.species.decomposing.name=分解
 extrabees.species.rock.name=石头
-extrabees.species.rock.desc=如果只有我能发现这些旋转的蜜蜂的话，我或许会听到一些美妙的音乐(摇滚乐)。|神秘的养蜂人
+extrabees.species.rock.desc=如果只有我能发现这些旋转的蜜蜂的话，我或许会听到一些美妙的音乐（摇滚乐）。|神秘的养蜂人
 extrabees.species.stone.name=忍耐
-extrabees.species.stone.desc=它们的蜂窝一部分以石头打造，并且消耗的蜡也比以往少。|养蜂人手册
+extrabees.species.stone.desc=它们的蜂巢一部分以石头打造，并且消耗的蜡也比以往少。|养蜂人手册
 extrabees.species.granite.name=坚毅
-extrabees.species.granite.desc=获得了于岩石中打洞的能力后，他们和隐藏于石头之中的矿物质有了令人惊异的密切关系。|养蜂人手册
+extrabees.species.granite.desc=获得了于岩石中打洞的能力后，它们和隐藏于石头之中的矿物质有了令人惊异的密切关系。|养蜂人手册
 extrabees.species.mineral.name=弹性
-extrabees.species.mineral.desc=起源于岩缝中的蜜蜂，他们的后代已经开始进化出以矿物质作为食粮的基因。|养蜂人手册
+extrabees.species.mineral.desc=起源于岩缝中的蜜蜂，它们的后代已经开始进化出以矿物质作为食粮的基因。|养蜂人手册
 extrabees.species.copper.name=铜绿
-extrabees.species.copper.desc=它们因啃咬墙壁中的铜缆造成的供电问题而声名狼藉。|养蜂人手册
+extrabees.species.copper.desc=它们因啃咬墙壁中的铜线缆造成的供电问题而声名狼藉。|养蜂人手册
 extrabees.species.tin.name=锡灰
 extrabees.species.tin.desc=它们的身体被金属所覆盖，它们还用这种金属打造它们的蜂巢。|养蜂人手册
 extrabees.species.iron.name=铁锈
@@ -338,7 +338,7 @@ extrabees.species.gold.name=金闪
 extrabees.species.silver.name=银辉
 extrabees.species.electrum.name=琥珀金
 extrabees.species.platinum.name=铂金
-extrabees.species.platinum.desc=喔喔，看这个闪光的蜜蜂。|Jadedcat， 养蜂人
+extrabees.species.platinum.desc=喔喔，看这个闪光的蜜蜂。|Jadedcat，养蜂人
 extrabees.species.lapis.name=青金石
 extrabees.species.sodalite.name=方钠
 extrabees.species.pyrite.name=黄铁
@@ -482,17 +482,17 @@ extrabees.gui.database.tab.species.overview=概述
 extrabees.gui.database.tab.species.classification=科学分类
 
 extrabees.gui.database.tab.species.genome=基因組
-extrabees.gui.database.tab.species.genome.speed=速度：
-extrabees.gui.database.tab.species.genome.lifespan=生命周期：
-extrabees.gui.database.tab.species.genome.fertility=生育力：
-extrabees.gui.database.tab.species.genome.flowering=授粉：
+extrabees.gui.database.tab.species.genome.speed=工作速度：
+extrabees.gui.database.tab.species.genome.lifespan=寿命：
+extrabees.gui.database.tab.species.genome.fertility=生育能力：
+extrabees.gui.database.tab.species.genome.flowering=授粉速度：
 extrabees.gui.database.tab.species.genome.territory=活动范围：
 extrabees.gui.database.tab.species.genome.behavior=行为：
 extrabees.gui.database.tab.species.genome.sunlight=日光：
 extrabees.gui.database.tab.species.genome.rain=降雨：
 extrabees.gui.database.tab.species.genome.flower=采蜜对象：
-extrabees.gui.database.tab.species.genome.effect=效果
-extrabees.gui.database.tab.species.genome.tolerated=耐受
+extrabees.gui.database.tab.species.genome.effect=特殊效果
+extrabees.gui.database.tab.species.genome.tolerated=适应性
 extrabees.gui.database.tab.species.genome.daytime=日间
 extrabees.gui.database.tab.species.genome.nighttime=夜间
 extrabees.gui.database.tab.species.genome.allDay=全天

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,7 +1,7 @@
 ##################################################
 ## Machines
 
-extratrees.machine.kitchen.bar=Bar
+extratrees.machine.kitchen.bar=酒吧
 extratrees.machine.kitchen.bottleRack=瓶架
 
 extratrees.machine.machine.brewery=发酵器
@@ -95,7 +95,7 @@ extratrees.block.planks.forestry.ebony=乌檀树
 extratrees.block.planks.forestry.mahogany=桃心树
 extratrees.block.planks.forestry.balsa=巴尔杉树
 extratrees.block.planks.forestry.willow=柳树
-extratrees.block.planks.forestry.walnut=胡桃树
+extratrees.block.planks.forestry.walnut=核桃树
 extratrees.block.planks.forestry.greenheart=绿樟树
 extratrees.block.planks.forestry.cherry=樱树
 extratrees.block.planks.forestry.mahoe=高槿树
@@ -284,103 +284,103 @@ extratrees.species.starfruit.name=杨桃
 extratrees.species.candlenut.name=石栗
 extratrees.species.dwarfhazel.name=矮榛
 
-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.butterflies.species.whiteAdmiral=白蛺蝶
+extratrees.butterflies.species.purpleEmperor=紫色帝王蝶
+extratrees.butterflies.species.redAdmiral=红蛺蝶
+extratrees.butterflies.species.paintedLady=姬红蛱蝶
+extratrees.butterflies.species.smallTortoiseshell=小麻蛱蝶
+extratrees.butterflies.species.camberwellBeauty=坎伯韦尔美人蝶
+extratrees.butterflies.species.peacock=孔雀蝶
+extratrees.butterflies.species.wall=棕蛱蝶
+extratrees.butterflies.species.crimsonRose=绯红玫瑰蝶
+extratrees.butterflies.species.kaiserIHind=喙凤蝶
+extratrees.butterflies.species.goldenBirdwing=金裳凤蝶
+extratrees.butterflies.species.marshFritillary=沼泽豹纹蝶
+extratrees.butterflies.species.pearlBorderedFritillary=珍珠豹纹蝶
+extratrees.butterflies.species.queenOfSpainFritillary=西班牙豹纹女王蝶
+extratrees.butterflies.species.speckledWood=帕眼蝶
+extratrees.butterflies.species.scotchAngus=苏格兰百眼蝶
+extratrees.butterflies.species.gatekeeper=链眼蝶
+extratrees.butterflies.species.meadowBrown=草地棕眼蝶
+extratrees.butterflies.species.smallHeath=潘非珍眼蝶
+extratrees.butterflies.species.ringlet=阿芬眼蝶
+extratrees.butterflies.species.monarch=黑脉金斑蝶
+extratrees.butterflies.species.marbledWhite=加勒白眼蝶
 
 extratrees.genetics.requirements.height=最低海拔要求：%d
 extratrees.genetics.unknown=<未知>
 extratrees.genetics.discoveredBy=由 %s 发现
 extratrees.genetics.complexity=复杂度：%d
 
-extratrees.item.carpentryHammer=木工大师的锤子
+extratrees.item.carpentryHammer=木工大师锤
 extratrees.item.masterCarpentryHammer=木工锤
 extratrees.item.sawdust=锯末
 extratrees.item.bark=树皮
 extratrees.item.provenGear=标定齿轮
-extratrees.item.woodWax=Wood Polish
+extratrees.item.woodWax=光泽剂
 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.osangeorange=桑橙
+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=林业员大师数据库

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

@@ -122,7 +122,7 @@ genetics.machine.incubator.error.noLiquid=Not enough incubation liquid
 genetics.machine.incubator.error.noRoom=No room for output
 
 genetics.machine.labMachine.acclimatiser=Acclimatiser
-genetics.machine.labMachine.acclimatiser.info=
+genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals.
 genetics.machine.acclimatiser.acclimatizingItems=Acclimatizing Items
 genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
 genetics.machine.acclimatiser.error.noAcclimatizingItems=No Acclimatising Items

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

@@ -9,27 +9,27 @@ genetics.item.fieldKit.tooltip.noPaper=没有纸
 genetics.item.fieldKit.tooltip.sheetsOfPaper=%d 张纸
 genetics.item.fieldKit.tooltip.sheetOfPaper=%d 张纸
 
-genetics.item.casingIron.name=强化外壳
-genetics.item.dnaDye.name=DNA 标记染料
+genetics.item.casingIron.name=硬化部件
+genetics.item.dnaDye.name=DNA 染料
 genetics.item.dyeFluor.name=荧光染料
 genetics.item.enzyme.name=酶
 genetics.item.growthMedium.name=培养基
 genetics.item.sequencerEmpty.name=空白序列
 genetics.item.serumEmpty.name=空血清瓶
 genetics.item.genomeEmpty.name=空血清阵列
-genetics.item.cylinderEmpty.name=玻璃瓶
+genetics.item.cylinderEmpty.name=玻璃罐
 genetics.item.integratedCircuit.name=集成电路板
 genetics.item.integratedCPU.name=集成 CPU
-genetics.item.casingCircuit.name=集成外壳
+genetics.item.casingCircuit.name=集成部件
 genetics.item.analyst.name=品种分析仪
 genetics.item.database.0.name=基因数据库
-genetics.item.database.1.name=主基因数据库
-genetics.item.registry.0.name=注册表
-genetics.item.registry.1.name=主注册表
+genetics.item.database.1.name=基因学大师数据库
+genetics.item.registry.0.name=图鉴
+genetics.item.registry.1.name=全图鉴
 genetics.item.serum.name=%s 血清
 genetics.item.serumArray.name=%s 血清阵列
 
-genetics.item.sequence=DNA序列
+genetics.item.sequence=DNA 序列
 genetics.item.sequence.0=极弱
 genetics.item.sequence.1=弱
 genetics.item.sequence.2=略弱
@@ -38,8 +38,8 @@ genetics.item.sequence.4=强
 genetics.item.sequence.5=极强
 
 genetics.gene.charge.empty=空
-genetics.gene.charge.one=1 次使用
-genetics.gene.charge.many=%d 次使用
+genetics.gene.charge.one=可使用 1 次
+genetics.gene.charge.many=可使用 %d 次
 genetics.gene.more=还有 %d 种基因，按下 Shift 显示全部。
 
 genetics.sequence.corrupted=损坏的 DNA 序列
@@ -50,7 +50,7 @@ genetics.sequence.fully=已测序
 genetics.sequence.partially=测序 %d%%
 
 genetics.machine.machine.isolator=基因分离器
-genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂、树苗或者其它的独立个体中随机提取基因片段，并复制到空序列瓶中。此过程需要乙醇作为溶剂，还需要酶来切断DNA。未测序的血清可以在序列分析器中测序，并在基因同化器中重新装填。
+genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂、树苗或者其它的独立个体中随机提取基因片段，并复制到空白序列中。此过程需要乙醇作为溶剂，还需要酶来切断DNA。未测序的序列可以在基因同化器中扩增，并在测序仪中进行测序。
 genetics.machine.isolator.error.noIndividual=没有个体样本
 genetics.machine.isolator.error.noRoom=没有空间
 genetics.machine.isolator.error.noVials=没有空白序列
@@ -58,8 +58,8 @@ genetics.machine.isolator.error.noLiquid=乙醇不足
 genetics.machine.isolator.error.noEnzyme=没有酶
 
 genetics.machine.machine.sequencer=测序仪
-genetics.machine.machine.sequencer.info=测序仪可以对血清中的基因片段进行测序。需要用到荧光染料。计算过程相当耗时。
-genetics.machine.sequencer.unsequencedDNA=未测序 DNA
+genetics.machine.machine.sequencer.info=测序仪可以确定未测序 DNA 序列中的等位基因片段。这个过程很慢并且需要使用荧光染料。
+genetics.machine.sequencer.unsequencedDNA=未测序 DNA 序列
 genetics.machine.sequencer.error.noSequence=没有 DNA 序列
 genetics.machine.sequencer.error.noOwner.title=无人认领此设备
 genetics.machine.sequencer.error.noOwner=重新放置此设备以重新认领
@@ -68,21 +68,21 @@ genetics.machine.sequencer.error.noDye=染料不足
 genetics.machine.sequencer.gui.sequensedBy=该基因将由 %s 完成序列化
 genetics.machine.sequencer.gui.willNotSave=无用序列，将直接丢弃
 
-genetics.machine.machine.polymeriser=基因同化器
-genetics.machine.machine.polymeriser.info=基因同化器将会用 DNA 液体和细菌来重新填充血清。该过程可用金粒加速。
+genetics.machine.machine.polymeriser=PCR 仪
+genetics.machine.machine.polymeriser.info=PCR 仪将会以原生 DNA 为原料，通过聚合菌提供的 DNA 聚合酶来重新填充血清。该过程可用金粒加速。
 genetics.machine.polymeriser.error.noItem=没有需要复制的物品
 genetics.machine.polymeriser.error.itemFilled=物品已填充
 genetics.machine.polymeriser.error.noLiquid=细菌不足
-genetics.machine.polymeriser.error.noDNA=DNA 液体不足
+genetics.machine.polymeriser.error.noDNA=原生 DNA 不足
 genetics.machine.polymeriser.replicatingWithGene=正在复制 1 个基因
 genetics.machine.polymeriser.replicatingWithGenes=正在复制 %d 个基因
 genetics.machine.polymeriser.unfilledSerum=没有填充的血清瓶
 
 genetics.machine.machine.inoculator=基因注射器
-genetics.machine.machine.inoculator.info=基因注射器可将血清中含有的特定基因注入可杂交个体中。这个过程相当耗时，并且需要细菌作为催化剂，但必定会成功。
+genetics.machine.machine.inoculator.info=基因注射器可将血清中含有的特定基因注入可杂交个体中。这个过程相当耗时，并且需要细菌质粒，但必定会成功。
 genetics.machine.inoculator.error.noIndividual=没有可供基因注射的个体
 genetics.machine.inoculator.error.noSerum=没有血清
-genetics.machine.inoculator.error.noLiquid=液体不足
+genetics.machine.inoculator.error.noLiquid=细菌质粒不足
 genetics.machine.inoculator.error.emptySerum.title=空白血清
 genetics.machine.inoculator.error.emptySerum=血清为空
 genetics.machine.inoculator.error.invalidSerum.title=血清无效
@@ -96,36 +96,36 @@ genetics.machine.inoculator.inoculableIndividual=可植入基因的个体
 genetics.machine.inoculator.serums=血清瓶／序列
 
 genetics.machine.labMachine.genepool=基因池
-genetics.machine.labMachine.genepool.info=基因液体池使用酶和乙醇来破坏活体组织并将其转化为DNA液体。所有遗传信息都会丢失，DNA来源也会被破坏。
+genetics.machine.labMachine.genepool.info=基因池使用酶和乙醇将个体分解成原生 DNA 。在此过程中，所有遗传信息都会丢失，而原生 DNA 的来源个体也将被破坏。
 genetics.machine.genepool.error.noIndividual=没有个体
-genetics.machine.genepool.error.noRoom=储罐已满
+genetics.machine.genepool.error.noRoom=原生 DNA 已满
 genetics.machine.genepool.error.noEthanol=乙醇不足
 genetics.machine.genepool.error.insufficientEnzyme=酶不足
 
 genetics.machine.labMachine.labMachine=实验台
 
 genetics.machine.labMachine.analyser=分析仪
-genetics.machine.labMachine.analyser.info=分析仪将会解析可增殖的DNA序列，并确定当前的基因类型。此过程需要DNA标记染料，可由紫色染料和荧石粉合成得到。
-genetics.machine.analyser.dnaDye=DNA标记染料
+genetics.machine.labMachine.analyser.info=分析仪可分析可增殖个体和 DNA 序列，并确定当前的基因类型。此过程需要 DNA 染料，可由紫色染料和荧石粉合成得到。
+genetics.machine.analyser.dnaDye=DNA 染料
 genetics.machine.analyser.unanalysedItem=未经分析的物品
 genetics.machine.analyser.error.alreadyAnalysed.title=已经过分析
 genetics.machine.analyser.error.alreadyAnalysed=目标物品已经过分析
 genetics.machine.analyser.error.insufficientDye.title=染料不足
-genetics.machine.analyser.error.insufficientDye=DNA 染料数量不足
+genetics.machine.analyser.error.insufficientDye=DNA 染料不足以完成分析
 genetics.machine.analyser.error.noItem=没有物品可供分析
 
 genetics.machine.labMachine.incubator=恒温箱
 genetics.machine.labMachine.incubator.info=恒温箱使用特定液体和物品来进行恒温，确保细菌能够在理想的环境下快速增殖。
 genetics.machine.incubator.error.noRecipe.title=没有配方
 genetics.machine.incubator.error.noRecipe=没有找到任何有效配方
-genetics.machine.incubator.error.noLiquid=培养液数量不足
-genetics.machine.incubator.error.noRoom=输出已满
+genetics.machine.incubator.error.noLiquid=液体不足
+genetics.machine.incubator.error.noRoom=输出槽已满
 
-genetics.machine.labMachine.acclimatiser=气候改造器
-genetics.machine.labMachine.acclimatiser.info=
-genetics.machine.acclimatiser.acclimatizingItems=气候改造物品
-genetics.machine.acclimatiser.error.noIndividual=没有可供气候改造的个体
-genetics.machine.acclimatiser.error.noAcclimatizingItems=没有气候改造所需物品
+genetics.machine.labMachine.acclimatiser=适应性调整器
+genetics.machine.labMachine.acclimatiser.info=适应性调整器使用适应性调整物品来调整个体的温度和湿度适应性。
+genetics.machine.acclimatiser.acclimatizingItems=适应性调整物品
+genetics.machine.acclimatiser.error.noIndividual=没有可供调整适应性的个体
+genetics.machine.acclimatiser.error.noAcclimatizingItems=没有适应性调整物品
 genetics.machine.acclimatiser.error.invalidAcclimatizingItems=该个体不能使用给定物品进行气候改造
 
 genetics.machine.advMachine.splicer=基因拼接器
@@ -146,16 +146,16 @@ genetics.machine.splicer.splicingIn.1=正在拼接 %d/%d 个基因
 genetics.machine.splicer.splicingIn.2=正在拼接 %d 个基因
 genetics.machine.splicer.splicingIn.3=正在拼接 %d 个基因
 
-genetics.gui.geneBank=基因库
+genetics.gui.geneBank=基因数据库
 genetics.gui.geneBank.info=信息
 genetics.gui.geneBank.stats=状态
 genetics.gui.geneBank.ranking=评级
-genetics.gui.geneBank.project=全基因解析工程
+genetics.gui.geneBank.project=全基因组计划
 genetics.gui.geneBank.sequencedGenes=已测序 %d/%d 基因
 genetics.gui.geneBank.sequencedGenes.short=%d/%d 基因
 
 genetics.gui.analyst.info=将蜜蜂、树苗、花或蝴蝶等样本放置于左上格子中。若样本还未经分析过，则还需要添加 DNA 染料。本设备还可将原版树苗转化成可供杂交的树苗。
-genetics.gui.analyst.registry=注册表
+genetics.gui.analyst.registry=图鉴
 genetics.gui.analyst.page.hours=%s 小时
 genetics.gui.analyst.page.minutes=%s 分钟
 genetics.gui.analyst.page.seconds=%s 秒
@@ -187,7 +187,7 @@ genetics.gui.analyst.biology.underground=可在地下活动
 genetics.gui.analyst.biology.notUnderground=不能在地下活动
 genetics.gui.analyst.biology.flammable=可燃
 genetics.gui.analyst.biology.nonflammable=抗燃
-genetics.gui.analyst.biology.sappiness=树液：%s
+genetics.gui.analyst.biology.sappiness=多汁：%s
 genetics.gui.analyst.biology.fertility.drones=每个蜂巢产出 %d 工蜂
 genetics.gui.analyst.biology.fertility.drone=每个蜂巢产出 1 工蜂
 genetics.gui.analyst.biology.fertility.moths=死亡前产出 %d 只幼虫

src/main/resources/mcmod.info

@@ -1,10 +1,10 @@
 [
   {
-    "modid": "BinnieCore",
-    "name": "Binnie Core",
+    "modid": "${modId}",
+    "name": "${modName}",
     "description": "Base mod for Binnie's Mods, with lots of common code.",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
+    "version": "${modVersion}",
+    "mcversion": "${minecraftVersion}",
     "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods",
     "updateUrl": "",
     "authorList": [ "Binnie" ],
@@ -20,8 +20,8 @@
     "modid": "ExtraBees",
     "name": "Extra Bees",
     "description": "Adds new bees and products to expand the bee breeding in Forestry.",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
+    "version": "${modVersion}",
+    "mcversion": "${minecraftVersion}",
     "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods",
     "updateUrl": "",
     "authorList": [ "Binnie" ],
@@ -34,8 +34,8 @@
     "modid": "ExtraTrees",
     "name": "Extra Trees",
     "description": "Adds new trees, aesthetic blocks and alcohol production.",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
+    "version": "${modVersion}",
+    "mcversion": "${minecraftVersion}",
     "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods",
     "updateUrl": "",
     "authorList": [ "Binnie" ],
@@ -48,8 +48,8 @@
     "modid": "Botany",
     "name": "Botany",
     "description": "Adds breedable flowers.",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
+    "version": "${modVersion}",
+    "mcversion": "${minecraftVersion}",
     "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods",
     "updateUrl": "",
     "authorList": [ "Binnie" ],
@@ -62,8 +62,8 @@
     "modid": "Genetics",
     "name": "Genetics",
     "description": "Adds genetic manipulation for bees, trees, butterflies and flowers.",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
+    "version": "${modVersion}",
+    "mcversion": "${minecraftVersion}",
     "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods",
     "updateUrl": "",
     "authorList": [ "Binnie" ],