Fix log spam with DImensional Transceiver (#73 )

Patch 1 (#72 )
* Update TileConduitBundle.java * Update TileConduitBundle.java * Update TileConduitBundle.java
2026-11-15 17:45:08 +00:00 · 2022-06-22 11:30:09 +02:00 · 2022-06-20 20:05:49 +02:00 · 2022-06-10 16:50:16 +02:00 · 2022-05-30 09:06:46 +02:00 · 2022-05-27 12:46:35 +02:00
47 changed files with 1194 additions and 1221 deletions
@@ -0,0 +1,23 @@
+# This is the universal Text Editor Configuration
+# for all GTNewHorizons projects
+# See: https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{bat,ini}]
+end_of_line = crlf
+
+[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
+indent_size = 2
+
+[*.java]
+indent_size = 2
+ij_java_space_before_if_parentheses = false
@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
-  echo "Crash reports detected:"
-  cat $directory/*
-  exit 1
-else
-  echo "No crash reports detected"
-  exit 0
-fi
@@ -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
+
@@ -14,32 +14,32 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-      with: 
+      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 setupDecompWorkspace
-    
+      run: ./gradlew setupCIWorkspace
+
    - name: Build the mod
      run: ./gradlew build

-    - name: Run server for 1 minute
+    - name: Run server for 1.5 minutes
      run: |
        mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 60 ./gradlew runServer || true
+        echo "eula=true" > run/eula.txt
+        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true

-    - name: Test no crashes happend
+    - name: Test no errors reported during server run
      run: |
-        chmod +x .github/scripts/test-no-crash-reports.sh
-        .github/scripts/test-no-crash-reports.sh
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh
@@ -43,3 +43,9 @@ jobs:
          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 }}
@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- 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.
-
-                            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 <https://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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.1996
@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- 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.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-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.
@@ -1,30 +0,0 @@
-#### Issue Description:
-Note: If this bug occurs in a modpack, please report this to the modpack author. Otherwise, delete this line and add your description here. If you are using an unreleased version of Ender IO (e.g. for 1.8.9), please don't open an issue for features that have not been announced as "finished" or "working".
-
-
-#### What happens:
-
-
-
-#### What you expected to happen:
-
-
-
-#### Steps to reproduce:
-
-1.
-2.
-3.
-...
-
-____
-#### Affected Versions (Do *not* use "latest"):
-
- EnderIO:
- EnderCore:
- Minecraft: 1.7.10
- Forge:
-
-#### Your most recent log file where the issue was present: 
-
-[pastebin/gist/etc link here]
@@ -3,10 +3,14 @@ EnderIO-Unofficial
 [![Build Status](http://jenkins.usrv.eu:8080/buildStatus/icon?job=Ender-IO)](http://jenkins.usrv.eu:8080/job/Ender-IO/)
 This is a unofficial version of EndeIO for 1.7.10, in case of any bugs or problems please do not contact the original developers of EnderIO!

-All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) are released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
+Issues can be reported to the [GTNH tracker](https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues).
+
+All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) were released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
 Do what you want with it, as long as you smile while doing so.

+###GTNH Modifications:

+LGPL v3.0 or later. Feel free to use our changes, just give back any changes you make to the community as well!

 ###Sound Credits

@@ -18,4 +22,3 @@ Credits:
 - http://freesound.org/people/Anton/
 - http://freesound.org/people/pj1s/
 - http://freesound.org/people/Syna-Max/
- 
@@ -1,49 +1,65 @@
-//version: ffe7b130f98fdfa1ac7c6ba4bd34722a55ab28d4
+//version: 1652851397
 /*
 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/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
- */
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+*/


 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+import org.gradle.internal.logging.text.StyledTextOutputFactory

 import java.util.concurrent.TimeUnit

 buildscript {
    repositories {
        maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
+            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 {
-            name = "Scala CI dependencies"
-            url = "https://repo1.maven.org/maven2/"
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
        }
        maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
+            name 'jitpack'
+            url 'https://jitpack.io'
        }
    }
    dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
    }
 }

 plugins {
+    id 'java-library'
    id 'idea'
+    id 'eclipse'
    id 'scala'
-    id("org.ajoberstar.grgit") version("3.1.1")
-    id("com.github.johnrengelman.shadow") version("4.0.4")
-    id("com.palantir.git-version") version("0.12.3")
+    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 'com.google.devtools.ksp'         version '1.5.30-1.0.0' 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'

 def projectJavaVersion = JavaLanguageVersion.of(8)
@@ -87,33 +103,32 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")

-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/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
-}
-
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()

 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("\\.", "/")
-if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+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("\\.", "/")
-    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    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(new File(targetFile).exists() == false) {
+    if(!getFile(targetFile).exists()) {
        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
    }
 }
@@ -125,15 +140,17 @@ if(usesMixins.toBoolean()) {

    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    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"
-    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    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)
    }
 }

@@ -141,8 +158,9 @@ 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"
-    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    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)
    }
 }

@@ -155,20 +173,64 @@ configurations.all {
 }

 // Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-'git config core.fileMode false'.execute()
-// Pulls version from git tag
 try {
-    version = minecraftVersion + "-" + gitVersion()
+    'git config core.fileMode false'.execute()
 }
-catch (Exception e) {
-    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+catch (Exception ignored) {
+    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 ignored) {
+    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 == versionOverride) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
+}
+
 group = modGroup
-archivesBaseName = modId
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+def arguments = []
+def jvmArguments = []
+
+if (usesMixins.toBoolean()) {
+    arguments += [
+        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    if (usesMixinDebug.toBoolean()) {
+        jvmArguments += [
+            "-Dmixin.debug.countInjections=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true"
+        ]
+    }
+}

 minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'

    if (replaceGradleTokenInFile) {
        replaceIn replaceGradleTokenInFile
@@ -179,78 +241,99 @@ minecraft {
            replace gradleTokenModName, modName
        }
        if(gradleTokenVersion) {
-            replace gradleTokenVersion, versionDetails().lastTag
+            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"
+if(file('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
 }

 apply from: 'repositories.gradle'

 configurations {
-    implementation.extendsFrom(shadowImplementation)
+    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/"
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
    }
    if(usesMixins.toBoolean()) {
        maven {
-            name = "sponge"
-            url = "https://repo.spongepowered.org/repository/maven-public"
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
        }
        maven {
-            url = "https://jitpack.io"
+            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")
+        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("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+        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"
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
        }
-        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
    }
 }

 apply from: 'dependencies.gradle'

-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+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()) {
-        new File(projectDir.toString() + "/src/main/resources/", "mixins." + modId + ".json").text = """{
+    if (usesMixins.toBoolean()) {
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        if (!mixinConfigFile.exists()) {
+            mixinConfigFile.text = """{
  "required": true,
  "minVersion": "0.7.11",
  "package": "${modGroup}.${mixinsPackage}",
  "plugin": "${modGroup}.${mixinPlugin}",
  "refmap": "${mixingConfigRefMap}",
  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [],
+  "server": []
 }
-
 """
+        }
    }
 }

@@ -260,16 +343,28 @@ task relocateShadowJar(type: ConfigureShadowRelocation) {
 }

 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]
+    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())
    }
@@ -302,15 +397,6 @@ afterEvaluate {
 }

 runClient {
-    def arguments = []
-
-    if(usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
    if(developmentEnvironmentUserName) {
        arguments += [
                "--username",
@@ -319,19 +405,12 @@ runClient {
    }

    args(arguments)
+    jvmArgs(jvmArguments)
 }

 runServer {
-    def arguments = []
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
    args(arguments)
+    jvmArgs(jvmArguments)
 }

 tasks.withType(JavaExec).configureEach {
@@ -342,36 +421,35 @@ tasks.withType(JavaExec).configureEach {
    )
 }

-processResources
-        {
-            // this will ensure that this task is redone when the versions change.
-            inputs.property "version", project.version
-            inputs.property "mcversion", project.minecraft.version
+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'
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'

-                // replace version and mcversion
-                expand "minecraftVersion": project.minecraft.version,
-                        "modVersion": versionDetails().lastTag,
-                        "modId": modId,
-                        "modName": modName
-            }
+        // replace modVersion and minecraftVersion
+        expand "minecraftVersion": project.minecraft.version,
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
+    }

-            if(usesMixins.toBoolean()) {
-                from refMap
-            }
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }

-            // copy everything else, thats not the mcmod.info
-            from(sourceSets.main.resources.srcDirs) {
-                exclude 'mcmod.info'
-            }
-        }
+    // copy everything else that's not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}

 def getManifestAttributes() {
    def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
    }

@@ -387,19 +465,25 @@ def getManifestAttributes() {
        manifestAttributes += [
                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
        ]
    }
    return manifestAttributes
 }

 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
+    from (sourceSets.main.allSource)
    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")

@@ -408,7 +492,7 @@ task shadowDevJar(type: ShadowJar) {
    }

    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation]
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
 }

 task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -423,6 +507,12 @@ task circularResolverJar(type: Jar) {
 }

 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")

@@ -437,12 +527,12 @@ task devJar(type: Jar) {
 }

 task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
+    from (sourceSets.main.allSource) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
    }

    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
    }

    from (sourceSets.main.resources.srcDirs) {
@@ -453,48 +543,111 @@ task apiJar(type: Jar) {
 }

 artifacts {
-    archives sourcesJar
+    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
+}
+
+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "sources"
+            }
+            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 minecraft and minecraftDeps configuration
+            pom.withXml {
+                def badArtifacts = [:].withDefault {[] as Set<String>}
+                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                    for (dependency in configuration.allDependencies) {
+                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+                    }
+                }
+                // example for specifying extra stuff to ignore
+                // badArtifacts["org.example.group"] += "artifactName"
+
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    badArtifacts[it.groupId.text()].contains(it.artifactId.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 (updateBuildScript()) return
+        if (performBuildScriptUpdate(projectDir.toString())) return

        print("Build script already up-to-date!")
    }
 }

-if (isNewBuildScriptVersionAvailable()) {
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
    if (autoUpdateBuildScript.toBoolean()) {
-        updateBuildScript()
+        performBuildScriptUpdate(projectDir.toString())
    } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
    }
 }

 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
 }

-static boolean updateBuildScript() {
-    if (isNewBuildScriptVersionAvailable()) {
-        def buildscriptFile = new File("build.gradle")
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
        return true
    }
    return false
 }

-static boolean isNewBuildScriptVersionAvailable() {
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]

-    String currentBuildScript = new File("build.gradle").getText()
+    String currentBuildScript = getFile("build.gradle").getText()
    String currentBuildScriptHash = getVersionHash(currentBuildScript)
    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
    String availableBuildScriptHash = getVersionHash(availableBuildScript)
@@ -515,3 +668,81 @@ 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)) {
+        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)
+}
@@ -1,48 +1,24 @@
 // Add your dependencies here

 dependencies {
-    compile("com.github.GTNewHorizons:EnderCore:master-SNAPSHOT:dev")
-    compile("com.github.GTNewHorizons:ForestryMC:master-SNAPSHOT:dev")
+    compile('com.github.GTNewHorizons:EnderCore:0.2.6:dev')
+    compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev')
+    compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
+    compile('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
+    shadowImplementation('cglib:cglib-nodep:3.3.0')

-    compile("curse.maven:cofh-lib-220333:2388748")
-    shadowImplementation("cglib:cglib-nodep:3.3.0")
-
-    compileOnly("com.github.GTNewHorizons:waila:master-SNAPSHOT:api") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:api") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Baubles:master-SNAPSHOT:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Railcraft:master-SNAPSHOT:api") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:StorageDrawers:master-SNAPSHOT:api") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Chisel:master-SNAPSHOT:dev") {
-        transitive = false
-    }
-
-    compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {
-        transitive = false
-    }
-    compileOnly("curse.maven:computercraft-67504:2269339") {  // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
-        transitive = false
-    }
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
-        transitive = false
-    }
-    compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:api") {
-        transitive = false
-    }
-    compileOnly("curse.maven:mekanism-268560:2475797") {  // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
-        transitive = false
-    }
-    compileOnly("curse.maven:ee3-65509:2305023") {  // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
-        transitive = false
-    }
-    compileOnly files("dependencies/immibis-microblocks-59.1.2.jar")
+    compileOnly('com.github.GTNewHorizons:waila:1.5.19:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-85-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
+    compile('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.25-GTNH:api') {transitive = false}
+    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
+    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
+    compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
+    compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
+    compileOnly(deobf('https://media.forgecdn.net/files/2426/270/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/
+    compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar'))
 }
@@ -19,7 +19,7 @@ forgeVersion = 10.13.4.1614
 # 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"
+developmentEnvironmentUserName = Developer

 # Define a source file of your project with:
 # public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -2,25 +2,25 @@

 repositories {
    maven {
-        name = "ic2"
-        url = "http://maven.ic2.player.to/"
+        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 {
-        name "OpenComputers Repo"
-        url = "http://maven.cil.li/"
-        metadataSources {
-            mavenPom()
-            artifact()
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
        }
    }
    maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        url = "https://jitpack.io"
+        url = 'https://jitpack.io'
    }
 }
@@ -12,7 +12,6 @@ import java.util.List;
 import java.util.Locale;

 import com.enderio.core.common.Lang;
-import com.enderio.core.common.network.MessageTileNBT;
 import com.enderio.core.common.util.EntityUtil;
 import com.google.common.collect.ImmutableList;

@@ -30,6 +29,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -173,6 +173,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;

@@ -591,7 +592,6 @@ public class EnderIO {

    instance = this;

-    PacketHandler.INSTANCE.registerMessage(MessageTileNBT.class, MessageTileNBT.class, PacketHandler.nextID(), Side.SERVER);
    PacketHandler.INSTANCE.registerMessage(PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER);

    NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler);
@@ -830,9 +830,16 @@ public class EnderIO {
    ServerChannelRegister.load();
  }

+  @SubscribeEvent
+  public void worldSaved(WorldEvent.Save event) {
+    // Only save together with the overworld, because this gets called for every dimension separately
+    if (event.world.provider != null && event.world.provider.dimensionId == 0) {
+      ServerChannelRegister.store();
+    }
+  }
+
  @EventHandler
  public void serverStopped(FMLServerStoppedEvent event) {
    HyperCubeRegister.unload();
-    ServerChannelRegister.store();
  }
 }
@@ -13,7 +13,7 @@ import crazypants.util.UserIdent;

 public interface ITravelAccessable {

-  public enum AccessMode {
+  enum AccessMode {
    PUBLIC,
    PRIVATE,
    PROTECTED
@@ -53,8 +53,22 @@ public interface ITravelAccessable {

  void setPlacedBy(EntityPlayer player);

-  public void clearAuthorisedUsers();
+  void clearAuthorisedUsers();

-  public BlockCoord getLocation();
+  BlockCoord getLocation();
+
+  /**
+   * Is this block a travel target for the staff or a travel anchor?
+   */
+  default boolean isTravelSource() {
+    return true;
+  }
+
+  default boolean isVisible() {
+    return true;
+  }
+
+  default void setVisible(boolean visible) {
+  }

 }
@@ -284,6 +284,9 @@ public class ConduitUtil {
    if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) {
      Log.debug("ConduitUtil.readConduitFromNBT: Converted pre 0.7.3 fluid conduit to advanced fluid conduit.");
      typeName = "crazypants.enderio.conduit.liquid.AdvancedLiquidConduit";
+    } else if ("crazypants.enderio.conduit.liquid.AdvancedEnderLiquidConduit".equals(typeName)) {
+      Log.debug("ConduitUtil.readConduitFromNBT: Converted advanced ender fluid conduit to crystalline ender fluid conduit.");
+      typeName = "crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit";
    }
    IConduit result;
    try {
@@ -55,6 +55,8 @@ import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.geom.Offsets;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
+import crazypants.enderio.conduit.liquid.AbstractTankConduit;
+import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.me.IMEConduit;
 import crazypants.enderio.conduit.oc.IOCConduit;
 import crazypants.enderio.conduit.power.IPowerConduit;
@@ -164,11 +166,15 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
    facadeMeta = nbtRoot.getInteger("facadeMeta");

    if(worldObj != null && worldObj.isRemote) {
-      if (conduits.size() == 1 && conduits.get(0) instanceof IItemConduit) {
+	  boolean stableConduit = true;
+	  for(IConduit iConduit: conduits) {
+	    if ((iConduit instanceof IRedstoneConduit) || (iConduit instanceof AbstractTankConduit)) stableConduit = false;
+	  }
+      if (stableConduit) {
        boolean itemConduitClientUpdated = false;
        for (Object o : Minecraft.getMinecraft().theWorld.playerEntities) {
          Entity e = ((Entity) o);
-          if (e.getDistanceSq(this.xCoord, yCoord, zCoord) < 36) {
+          if (e.getDistanceSq(this.xCoord, yCoord, zCoord) < 25) {
            itemConduitClientUpdated = true;
            break;
          }
@@ -74,11 +74,6 @@ public class BigItemFilterGui implements IItemFilterGui {
    useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData"));
    useMetaB.setPaintSelectedBorder(false);

-    stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
-    stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
-    stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
-    stickyB.setPaintSelectedBorder(false);
-
    y -= 20;
    useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT);
    useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled"));
@@ -93,6 +88,12 @@ public class BigItemFilterGui implements IItemFilterGui {

    y -= 20;
    fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+
+    x -= 20;
+    stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
+    stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
+    stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
+    stickyB.setPaintSelectedBorder(false);
  }

  public void createFilterSlots() {
@@ -161,6 +161,7 @@ public final class Config {
      "Thaumcraft:blockWarded"
  };
  public static float travelAnchorZoomScale = 0.2f;
+  public static boolean travelStaffSearchOptimize = true;

  public static int enderIoRange = 8;
  public static boolean enderIoMeAccessEnabled = true;
@@ -386,6 +387,13 @@ public final class Config {
  public static int poweredSpawnerLevelOnePowerPerTickRF = 160;
  public static int poweredSpawnerLevelTwoPowerPerTickRF = 500;
  public static int poweredSpawnerLevelThreePowerPerTickRF = 1500;
+  public static int poweredSpawnerLevelFourPowerPerTickRF = 4500;
+  public static int poweredSpawnerLevelFivePowerPerTickRF = 2000;
+  public static int poweredSpawnerLevelSixPowerPerTickRF = 1000;
+  public static int poweredSpawnerLevelSevenPowerPerTickRF = 500;
+  public static int poweredSpawnerLevelEightPowerPerTickRF = 160;
+  public static int poweredSpawnerLevelNinePowerPerTickRF = 500;
+  public static int poweredSpawnerLevelTenPowerPerTickRF = 1500;
  public static int poweredSpawnerMaxPlayerDistance = 0;
  public static int poweredSpawnerDespawnTimeSeconds = 120;
  public static int poweredSpawnerSpawnCount = 4;
@@ -439,6 +447,13 @@ public final class Config {
  public static int soulBinderLevelOnePowerPerTickRF = 500;
  public static int soulBinderLevelTwoPowerPerTickRF = 1000;
  public static int soulBinderLevelThreePowerPerTickRF = 2000;
+  public static int soulBinderLevelFourPowerPerTickRF = 4000;
+  public static int soulBinderLevelFivePowerPerTickRF = 8000;
+  public static int soulBinderLevelSixPowerPerTickRF = 16000;
+  public static int soulBinderLevelSevenPowerPerTickRF = 32000;
+  public static int soulBinderLevelEightPowerPerTickRF = 500;
+  public static int soulBinderLevelNinePowerPerTickRF = 1000;
+  public static int soulBinderLevelTenPowerPerTickRF = 2000;
  public static int soulBinderBrokenSpawnerRF = 2500000;
  public static int soulBinderBrokenSpawnerLevels = 15;
  public static int soulBinderReanimationRF = 100000;
@@ -463,6 +478,13 @@ public final class Config {
  public static int sliceAndSpliceLevelOnePowerPerTickRF = 80;
  public static int sliceAndSpliceLevelTwoPowerPerTickRF = 160;
  public static int sliceAndSpliceLevelThreePowerPerTickRF = 320;
+  public static int sliceAndSpliceLevelFourPowerPerTickRF = 640;
+  public static int sliceAndSpliceLevelFivePowerPerTickRF = 1280;
+  public static int sliceAndSpliceLevelSixPowerPerTickRF = 2560;
+  public static int sliceAndSpliceLevelSevenPowerPerTickRF = 5120;
+  public static int sliceAndSpliceLevelEightPowerPerTickRF = 80;
+  public static int sliceAndSpliceLevelNinePowerPerTickRF = 160;
+  public static int sliceAndSpliceLevelTenPowerPerTickRF = 320;

  public static boolean soulBinderRequiresEndermanSkull = true;

@@ -849,6 +871,11 @@ public final class Config {
        "Lists the blocks that cannot be teleported through in the form 'modID:blockName'");
    travelAnchorZoomScale = config.getFloat("travelAnchorZoomScale", sectionStaff.name, travelAnchorZoomScale, 0, 1,
        "Set the max zoomed size of a travel anchor as an aprox. percentage of screen height");
+    travelStaffSearchOptimize = config.get(sectionStaff.name, "travelStaffSearchOptimize", travelStaffSearchOptimize,
+            "If set to true: blinking by travel staff has reduced search branch. " +
+            "You can now teleport onto the roof. " +
+            "This config is experimental, so if you encounter any strange behavior, please report to GTNH developer.")
+        .getBoolean(travelStaffSearchOptimize);


    enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange,
@@ -1231,6 +1258,27 @@ public final class Config {
    poweredSpawnerLevelThreePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTickRF",
        poweredSpawnerLevelThreePowerPerTickRF,
        "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF);
+    poweredSpawnerLevelFourPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFourPowerPerTickRF",
+        poweredSpawnerLevelFourPowerPerTickRF,
+        "RF per tick for a level 4 spawner").getInt(poweredSpawnerLevelFourPowerPerTickRF);
+    poweredSpawnerLevelFivePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFivePowerPerTickRF",
+        poweredSpawnerLevelFivePowerPerTickRF,
+        "RF per tick for a level 5 spawner").getInt(poweredSpawnerLevelFivePowerPerTickRF);
+    poweredSpawnerLevelSixPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSixPowerPerTickRF",
+        poweredSpawnerLevelSixPowerPerTickRF,
+        "RF per tick for a level 6 spawner").getInt(poweredSpawnerLevelSixPowerPerTickRF);
+    poweredSpawnerLevelSevenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSevenPowerPerTickRF",
+        poweredSpawnerLevelSevenPowerPerTickRF,
+        "RF per tick for a level 7 spawner").getInt(poweredSpawnerLevelSevenPowerPerTickRF);
+    poweredSpawnerLevelEightPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelEightPowerPerTickRF",
+            poweredSpawnerLevelEightPowerPerTickRF,
+            "RF per tick for a level 1 spawner").getInt(poweredSpawnerLevelEightPowerPerTickRF);
+    poweredSpawnerLevelNinePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelNinePowerPerTickRF",
+            poweredSpawnerLevelNinePowerPerTickRF,
+            "RF per tick for a level 2 spawner").getInt(poweredSpawnerLevelNinePowerPerTickRF);
+    poweredSpawnerLevelTenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelTenPowerPerTickRF",
+            poweredSpawnerLevelTenPowerPerTickRF,
+            "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelTenPowerPerTickRF);
    poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance,
        "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance);
    poweredSpawnerDespawnTimeSeconds = config.get(sectionSpawner.name, "poweredSpawnerDespawnTimeSeconds" , poweredSpawnerDespawnTimeSeconds,
@@ -1303,9 +1351,23 @@ public final class Config {
    soulBinderLevelOnePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTickRF", soulBinderLevelOnePowerPerTickRF,
        "The number of RF/t consumed by an unupgraded soul binder.").getInt(soulBinderLevelOnePowerPerTickRF);
    soulBinderLevelTwoPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTickRF", soulBinderLevelTwoPowerPerTickRF,
-        "The number of RF/t consumed by a soul binder with a double layer capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF);
+        "The number of RF/t consumed by a soul binder with a double layer capacitor or a endergetic capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF);
    soulBinderLevelThreePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTickRF", soulBinderLevelThreePowerPerTickRF,
-        "The number of RF/t consumed by a soul binder with an octadic capacitor upgrade.").getInt(soulBinderLevelThreePowerPerTickRF);
+        "The number of RF/t consumed by a soul binder with an octadic capacitor or a endergised upgrade.").getInt(soulBinderLevelThreePowerPerTickRF);
+    soulBinderLevelFourPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFourPowerPerTickRF", soulBinderLevelFourPowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an crystalline capacitor upgrade.").getInt(soulBinderLevelFourPowerPerTickRF);
+    soulBinderLevelFivePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFivePowerPerTickRF", soulBinderLevelFivePowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an melodic capacitor upgrade.").getInt(soulBinderLevelFivePowerPerTickRF);
+    soulBinderLevelSixPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSixPowerPerTickRF", soulBinderLevelSixPowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an stellar capacitor upgrade.").getInt(soulBinderLevelSixPowerPerTickRF);
+    soulBinderLevelSevenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSevenPowerPerTickRF", soulBinderLevelSevenPowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an totemic capacitor upgrade.").getInt(soulBinderLevelSevenPowerPerTickRF);
+    soulBinderLevelEightPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelEightPowerPerTickRF", soulBinderLevelEightPowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an silver capacitor upgrade.").getInt(soulBinderLevelEightPowerPerTickRF);
+    soulBinderLevelNinePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelNinePowerPerTickRF", soulBinderLevelNinePowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an endergetic capacitor upgrade.").getInt(soulBinderLevelNinePowerPerTickRF);
+    soulBinderLevelTenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTenPowerPerTickRF", soulBinderLevelTenPowerPerTickRF,
+            "The number of RF/t consumed by a soul binder with an endergised capacitor upgrade.").getInt(soulBinderLevelTenPowerPerTickRF);
    soulBinderBrokenSpawnerRF = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerRF", soulBinderBrokenSpawnerRF,
        "The number of RF required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerRF);
    soulBinderReanimationRF = config.get(sectionSoulBinder.name, "soulBinderReanimationRF", soulBinderReanimationRF,
@@ -1341,6 +1403,21 @@ public final class Config {
        "The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade.").getInt(sliceAndSpliceLevelTwoPowerPerTickRF);
    sliceAndSpliceLevelThreePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelThreePowerPerTickRF", sliceAndSpliceLevelThreePowerPerTickRF,
        "The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade.").getInt(sliceAndSpliceLevelThreePowerPerTickRF);
+    sliceAndSpliceLevelFourPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFourPowerPerTickRF", sliceAndSpliceLevelFourPowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an crystalline capacitor upgrade.").getInt(sliceAndSpliceLevelFourPowerPerTickRF);
+    sliceAndSpliceLevelFivePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFivePowerPerTickRF", sliceAndSpliceLevelFivePowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an melodic capacitor upgrade.").getInt(sliceAndSpliceLevelFivePowerPerTickRF);
+    sliceAndSpliceLevelSixPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSixPowerPerTickRF", sliceAndSpliceLevelSixPowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an stellar capacitor upgrade.").getInt(sliceAndSpliceLevelSixPowerPerTickRF);
+    sliceAndSpliceLevelSevenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSevenPowerPerTickRF", sliceAndSpliceLevelSevenPowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an totemic capacitor upgrade.").getInt(sliceAndSpliceLevelSevenPowerPerTickRF);
+    sliceAndSpliceLevelEightPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelEightPowerPerTickRF", sliceAndSpliceLevelEightPowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an silver capacitor upgrade.").getInt(sliceAndSpliceLevelEightPowerPerTickRF);
+    sliceAndSpliceLevelNinePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelNinePowerPerTickRF", sliceAndSpliceLevelNinePowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an endergetic capacitor upgrade.").getInt(sliceAndSpliceLevelNinePowerPerTickRF);
+    sliceAndSpliceLevelTenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelTenPowerPerTickRF", sliceAndSpliceLevelTenPowerPerTickRF,
+            "The number of RF/t consumed by a Slice'N'Splice with an endergised capacitor upgrade.").getInt(sliceAndSpliceLevelTenPowerPerTickRF);
+

    attractorRangeLevelOne = config.get(sectionAttractor.name, "attractorRangeLevelOne", attractorRangeLevelOne,
        "The range of the mob attractor with no upgrades").getInt(attractorRangeLevelOne);
@@ -123,7 +123,10 @@ public enum IconEIO implements IWidgetIcon {
  SORT_SIZE_DOWN(224, 240, SORT_DIR_DOWN),
  SORT_SIZE_UP(224, 240, SORT_DIR_UP),
  SORT_MOD_DOWN(240, 240, SORT_DIR_DOWN),
-  SORT_MOD_UP(240, 240, SORT_DIR_UP);
+  SORT_MOD_UP(240, 240, SORT_DIR_UP),
+
+  VISIBLE_NO(224, 160),
+  VISIBLE_YES(240, 160);

  // Texture size is actually 512 but everything is aligned to a 256 grid
  private static final int TEX_SIZE = 256;
@@ -41,9 +41,9 @@ public class TooltipHandlerFluid implements ITooltipCallback {
      } else {
        IFluidCoolant coolant = FluidFuelRegister.instance.getCoolant(fluid);
        if (coolant != null) {
-          list.add(EnderIO.lang.localize("enderio.coolant.tooltip.heading"));
+          list.add(EnderIO.lang.localize("coolant.tooltip.heading"));
          list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerFloat(coolant.getDegreesCoolingPerMB(100) * 1000) + " "
-              + EnderIO.lang.localize("enderio.coolant.tooltip.degreesPerBucket"));
+              + EnderIO.lang.localize("coolant.tooltip.degreesPerBucket"));
        }
      }
    }    
@@ -7,9 +7,11 @@ import crazypants.enderio.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

+import java.util.stream.Stream;
+
 public class TravelUpgrade extends AbstractUpgrade {

-  private static String UPGRADE_NAME = "travel";
+  private static final String UPGRADE_NAME = "travel";

  public static final TravelUpgrade INSTANCE = new TravelUpgrade();

@@ -32,17 +34,18 @@ public class TravelUpgrade extends AbstractUpgrade {
  }

  public TravelUpgrade() {
-    super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial,1,Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost);
+    super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost);
  }

  @Override
  public boolean canAddToItem(ItemStack stack) {
-    if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
-      return false;
-    }
-    TravelUpgrade up = loadFromItem(stack);
-    if(up == null) {
-      return true;
+    if(stack == null) return false;
+    if(Stream.of(
+      DarkSteelItems.itemDarkSteelSword, DarkSteelItems.itemEndSteelSword, DarkSteelItems.itemStellarSword,
+      DarkSteelItems.itemDarkSteelPickaxe, DarkSteelItems.itemEndSteelPickaxe, DarkSteelItems.itemStellarPickaxe,
+      DarkSteelItems.itemEndSteelAxe, DarkSteelItems.itemStellarAxe
+    ).anyMatch(item -> stack.getItem() == item)) {
+      return EnergyUpgrade.itemHasAnyPowerUpgrade(stack) && loadFromItem(stack) == null;
    }
    return false;
  }
@@ -1,8 +1,5 @@
 package crazypants.enderio.machine.farm;

-import java.util.Iterator;
-import java.util.regex.Pattern;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -38,7 +35,9 @@ public final class FarmersRegistry {
    addIC2();
    addThaumcraft();
    addFlowers();
-    ForestryFarmer.init();
+    if (Loader.isModLoaded("Forestry")) {
+        ForestryFarmer.init();
+    }

    FarmersCommune.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds)));
    FarmersCommune.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus)));
@@ -196,7 +196,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
    if(inventory[upg] == null) {
      return 0;
    } else {
-      return Config.farmBonusSize * EnderIO.itemBasicCapacitor.getCapacitor(inventory[upg]).getTier();
+      return Config.farmBonusSize * (EnderIO.itemBasicCapacitor.getCapacitor(inventory[upg]).getTier()-1);
    }
  }

@@ -3,6 +3,7 @@ package crazypants.enderio.machine.farm.farmers;
 import java.util.ArrayList;
 import java.util.List;

+import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.init.Blocks;
@@ -41,7 +42,11 @@ public class CustomSeedFarmer implements IFarmerJoe {
    this.grownBlockMeta = grownBlockMeta;
    this.seeds = seeds;
    FarmStationContainer.slotItemsSeeds.add(seeds);
-    addTilledBlock(Blocks.farmland);   
+    addTilledBlock(Blocks.farmland);
+    Block ztonesSoil = GameRegistry.findBlock("Ztones", "cleanDirt");
+    if (ztonesSoil != null) {
+      addTilledBlock(ztonesSoil);
+    }
  }
  
  public void addTilledBlock(Block block) {
@@ -92,16 +92,20 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange

  @Override
  public void onCapacitorTypeChange() {
-    switch (getCapacitorType()) {
-    case ACTIVATED_CAPACITOR:
+    switch (getCapacitor().getTier()) {
+    case 2:
      range = Config.attractorRangeLevelTwo;
      powerPerTick = Config.attractorPowerPerTickLevelTwo;
      break;
-    case ENDER_CAPACITOR:
+    case 3:
+      case 4:
+      case 5:
+      case 6:
+      case 7:
      range = Config.attractorRangeLevelThree;
      powerPerTick = Config.attractorPowerPerTickLevelThree;
      break;
-    case BASIC_CAPACITOR:
+    case 1:
    default:
      range = Config.attractorRangeLevelOne;
      powerPerTick = Config.attractorPowerPerTickLevelOne;
@@ -70,16 +70,20 @@ public class TileAversionObelisk extends AbstractPowerConsumerEntity implements

  @Override
  public void onCapacitorTypeChange() {
-    switch (getCapacitorType()) {
-    case BASIC_CAPACITOR:
+    switch (getCapacitor().getTier()) {
+    case 1:
    	range = Config.spawnGuardRangeLevelOne;
    	powerPerTick = Config.spawnGuardPowerPerTickLevelOne;
    	break;
-    case ACTIVATED_CAPACITOR:
+    case 2:
      range = Config.spawnGuardRangeLevelTwo;
      powerPerTick = Config.spawnGuardPowerPerTickLevelTwo;
      break;
-    case ENDER_CAPACITOR:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
      range = Config.spawnGuardRangeLevelThree;
      powerPerTick = Config.spawnGuardPowerPerTickLevelThree;
      break;
@@ -39,6 +39,48 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
      Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(),
      POWER_PER_TICK_THREE);

+  public static final int POWER_PER_TICK_FOUR = Config.sliceAndSpliceLevelFourPowerPerTickRF;
+  private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,
+          POWER_PER_TICK_FOUR * 2,
+          Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_FOUR);
+
+  public static final int POWER_PER_TICK_FIVE = Config.sliceAndSpliceLevelFivePowerPerTickRF;
+  private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,
+          POWER_PER_TICK_FIVE * 2,
+          Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_FIVE);
+
+  public static final int POWER_PER_TICK_SIX = Config.sliceAndSpliceLevelSixPowerPerTickRF;
+  private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,
+          POWER_PER_TICK_SIX * 2,
+          Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_SIX);
+
+  public static final int POWER_PER_TICK_SEVEN = Config.sliceAndSpliceLevelSevenPowerPerTickRF;
+  private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,
+          POWER_PER_TICK_SEVEN * 2,
+          Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_SEVEN);
+
+  public static final int POWER_PER_TICK_EIGHT = Config.sliceAndSpliceLevelEightPowerPerTickRF;
+  private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,
+          POWER_PER_TICK_EIGHT * 2,
+          Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_EIGHT);
+
+  public static final int POWER_PER_TICK_NINE = Config.sliceAndSpliceLevelNinePowerPerTickRF;
+  private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,
+          POWER_PER_TICK_NINE * 2,
+          Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_NINE);
+
+  public static final int POWER_PER_TICK_TEN = Config.sliceAndSpliceLevelTenPowerPerTickRF;
+  private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,
+          POWER_PER_TICK_TEN * 2,
+          Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(),
+          POWER_PER_TICK_TEN);
+
  private final int axeIndex = 6;
  private final int shearsIndex = 7;
  private EntityLivingBase fakePlayer;
@@ -67,6 +109,27 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
      setCapacitor(CAP_TWO);
      break;
    case ENDER_CAPACITOR:
+      setCapacitor(CAP_THREE);
+      break;
+    case CRYSTALLINE_CAPACITOR:
+      setCapacitor(CAP_FOUR);
+      break;
+    case MELODIC_CAPACITOR:
+      setCapacitor(CAP_FIVE);
+      break;
+    case STELLAR_CAPACITOR:
+      setCapacitor(CAP_SIX);
+      break;
+    case TOTEMIC_CAPACITOR:
+      setCapacitor(CAP_SEVEN);
+      break;
+    case SILVER_CAPACITOR:
+      setCapacitor(CAP_ONE);
+      break;
+    case ENDERGETIC_CAPACITOR:
+      setCapacitor(CAP_TWO);
+      break;
+    case ENDERGISED_CAPACITOR:
      setCapacitor(CAP_THREE);
      break;
 	default:
@@ -43,6 +43,35 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
  private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2,
      Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE);

+  public static final int  POWER_PER_TICK_FOUR = Config.soulBinderLevelFourPowerPerTickRF;
+  private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,POWER_PER_TICK_FOUR * 2,
+          Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FOUR);
+
+  public static final int  POWER_PER_TICK_FIVE = Config.soulBinderLevelFivePowerPerTickRF;
+  private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,POWER_PER_TICK_FIVE * 2,
+          Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FIVE);
+
+  public static final int  POWER_PER_TICK_SIX = Config.soulBinderLevelSixPowerPerTickRF;
+  private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,POWER_PER_TICK_SIX * 2,
+          Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SIX);
+
+  public static final int  POWER_PER_TICK_SEVEN = Config.soulBinderLevelSevenPowerPerTickRF;
+  private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,POWER_PER_TICK_SEVEN * 2,
+          Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SEVEN);
+
+  public static final int  POWER_PER_TICK_EIGHT = Config.soulBinderLevelEightPowerPerTickRF;
+  private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,POWER_PER_TICK_EIGHT * 2,
+          Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_EIGHT);
+
+  public static final int  POWER_PER_TICK_NINE = Config.soulBinderLevelNinePowerPerTickRF;
+  private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,POWER_PER_TICK_NINE * 2,
+          Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_NINE);
+
+  public static final int  POWER_PER_TICK_TEN = Config.soulBinderLevelTenPowerPerTickRF;
+  private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,POWER_PER_TICK_TEN * 2,
+          Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TEN);
+
+
  private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel));

  public TileSoulBinder() {
@@ -170,18 +199,25 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
      setCapacitor(CAP_THREE);
      break;
 	case CRYSTALLINE_CAPACITOR:
-		break;
-	case ENDERGETIC_CAPACITOR:
-		break;
-	case ENDERGISED_CAPACITOR:
+      setCapacitor(CAP_FOUR);
 		break;
 	case MELODIC_CAPACITOR:
-		break;
-	case SILVER_CAPACITOR:
+      setCapacitor(CAP_FIVE);
 		break;
 	case STELLAR_CAPACITOR:
+      setCapacitor(CAP_SIX);
 		break;
 	case TOTEMIC_CAPACITOR:
+      setCapacitor(CAP_SEVEN);
+		break;
+	case SILVER_CAPACITOR:
+      setCapacitor(CAP_EIGHT);
+		break;
+	case ENDERGETIC_CAPACITOR:
+      setCapacitor(CAP_NINE);
+		break;
+	case ENDERGISED_CAPACITOR:
+      setCapacitor(CAP_TEN);
 		break;
 	default:
 		break;
@@ -25,15 +25,34 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
  public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks;

  public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF;
-  private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, (int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored());
+  private static final BasicCapacitor CAP_ONE = new BasicCapacitor(Capacitors.BASIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored());

  public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF;
-  private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,(int) (POWER_PER_TICK_TWO * 1.25),
-      Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored());
+  private static final BasicCapacitor CAP_TWO = new BasicCapacitor(Capacitors.ACTIVATED_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_TWO * 1.25), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored());

  public static final int POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTickRF;
-  private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,(int) (POWER_PER_TICK_THREE * 1.25),
-      Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored());
+  private static final BasicCapacitor CAP_THREE = new BasicCapacitor(Capacitors.ENDER_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_THREE * 1.25), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_FOUR = Config.poweredSpawnerLevelFourPowerPerTickRF;
+  private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_FOUR * 1.25), Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_FIVE = Config.poweredSpawnerLevelFivePowerPerTickRF;
+  private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(Capacitors.MELODIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_FIVE * 1.25), Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_SIX = Config.poweredSpawnerLevelSixPowerPerTickRF;
+  private static final BasicCapacitor CAP_SIX = new BasicCapacitor(Capacitors.STELLAR_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_SIX * 1.25), Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_SEVEN = Config.poweredSpawnerLevelSevenPowerPerTickRF;
+  private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(Capacitors.TOTEMIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_SEVEN * 1.25), Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_EIGHT = Config.poweredSpawnerLevelEightPowerPerTickRF;
+  private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(Capacitors.SILVER_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_EIGHT * 1.25), Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_NINE = Config.poweredSpawnerLevelNinePowerPerTickRF;
+  private static final BasicCapacitor CAP_NINE = new BasicCapacitor(Capacitors.ENDERGETIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_NINE * 1.25), Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored());
+
+  public static final int POWER_PER_TICK_TEN = Config.poweredSpawnerLevelTenPowerPerTickRF;
+  private static final BasicCapacitor CAP_TEN = new BasicCapacitor(Capacitors.ENDERGISED_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_TEN * 1.25), Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored());

  public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance;
  public static final boolean USE_VANILLA_SPAWN_CHECKS = Config.poweredSpawnerUseVanillaSpawChecks;
@@ -99,9 +118,37 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
      refCap = CAP_THREE;
      basePowerUse = POWER_PER_TICK_THREE;
      break;
+    case CRYSTALLINE_CAPACITOR:
+      refCap = CAP_FOUR;
+      basePowerUse = POWER_PER_TICK_FOUR;
+      break;
+    case MELODIC_CAPACITOR:
+      refCap = CAP_FIVE;
+      basePowerUse = POWER_PER_TICK_FIVE;
+      break;
+    case STELLAR_CAPACITOR:
+      refCap = CAP_SIX;
+      basePowerUse = POWER_PER_TICK_SIX;
+      break;
+    case TOTEMIC_CAPACITOR:
+      refCap = CAP_SEVEN;
+      basePowerUse = POWER_PER_TICK_SEVEN;
+      break;
+    case SILVER_CAPACITOR:
+      refCap = CAP_EIGHT;
+      basePowerUse = POWER_PER_TICK_EIGHT;
+      break;
+    case ENDERGETIC_CAPACITOR:
+      refCap = CAP_NINE;
+      basePowerUse = POWER_PER_TICK_NINE;
+      break;
+    case ENDERGISED_CAPACITOR:
+      refCap = CAP_TEN;
+      basePowerUse = POWER_PER_TICK_TEN;
+      break;
    }
    double multiplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(getEntityName());
-    setCapacitor(new BasicCapacitor((int) (refCap.getMaxEnergyExtracted() * multiplier), refCap.getMaxEnergyStored()));
+    setCapacitor(new BasicCapacitor(refCap.getTier(), (int) (refCap.getMaxEnergyExtracted() * multiplier), refCap.getMaxEnergyStored()));
    powerUsePerTick = (int) Math.ceil(basePowerUse * multiplier);
    forceClientUpdate = true;
  }
@@ -211,11 +258,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
    } else {
      ticksDelay = TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - ((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) / 2);
    }
-    if(getCapacitorType().ordinal() == 1) {
-      ticksDelay /= 2;
-    } else if(getCapacitorType().ordinal() == 2) {
-      ticksDelay /= 4;
-    }
+    ticksDelay >>= Math.min(3, getCapacitor().getTier() - 1);
    int powerPerTick = getPowerUsePerTick();
    res.setRequiredEnergy(powerPerTick * ticksDelay);
    return res;
@@ -130,7 +130,6 @@ public class ServerChannelRegister extends ChannelRegister {
        return;
      }
    }
-    Log.info("ServerChannelRegister: Dimensional Transceiver data saved to " + dataFile.getAbsolutePath());
  }

  private static boolean createFolderAndWriteFile(ListMultimap<ChannelType, Channel> channels, File dataFile) {
@@ -305,7 +304,7 @@ public class ServerChannelRegister extends ChannelRegister {
    return 0;
  }

-  //Item 
+  //Item

  public void sendItem(TileTransceiver from, Set<Channel> channels, int slot, ItemStack contents) {
    if(!from.hasPower()) {
@@ -332,7 +331,7 @@ public class ServerChannelRegister extends ChannelRegister {
    if(!to.getReceiveItemFilter().doesItemPassFilter(null, contents)) {
      return contents;
    }
-    //try merging into existing stacks    
+    //try merging into existing stacks

    boolean sendComplete = false; // Only allow 1 stack per item type
    for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot && !sendComplete; i++) {
@@ -2,6 +2,9 @@ package crazypants.enderio.teleport;

 import java.awt.Color;

+import com.enderio.core.client.gui.button.ToggleButton;
+import crazypants.enderio.gui.IconEIO;
+import crazypants.enderio.teleport.packet.PacketVisibility;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -29,18 +32,23 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO {
  private static final int ID_PUBLIC = 0;
  private static final int ID_PRIVATE = 1;
  private static final int ID_PROTECTED = 2;
+  private static final int ID_VISIBLE = -1;

-  private CheckBox publicCB;
-  private CheckBox privateCB;
-  private CheckBox protectedCB;
+  private final CheckBox publicCB;
+  private final CheckBox privateCB;
+  private final CheckBox protectedCB;
+  private final ToggleButton visibleCB;

-  private TextFieldEnder tf;
+  private final TextFieldEnder tf;

-  private String publicStr;
-  private String privateStr;
-  private String protectedStr;
+  private final String publicStr;
+  private final String privateStr;
+  private final String protectedStr;
+  private final String visibleStr;
+  private final String visibleDesc1Str;
+  private final String visibleDesc2Str;

-  private ITravelAccessable te;
+  private final ITravelAccessable te;
  private int col0x;
  private int col1x;
  private int col2x;
@@ -59,6 +67,9 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO {
    publicStr = EnderIO.lang.localize("gui.travelAccessable.public");
    privateStr = EnderIO.lang.localize("gui.travelAccessable.private");
    protectedStr = EnderIO.lang.localize("gui.travelAccessable.protected");
+    visibleStr = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible");
+    visibleDesc1Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc1");
+    visibleDesc2Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc2");

    FontRenderer fr = Minecraft.getMinecraft().fontRenderer;

@@ -84,6 +95,10 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO {
    publicCB = new CheckBox(this, ID_PUBLIC, x, y);
    publicCB.setSelected(te.getAccessMode() == AccessMode.PUBLIC);

+    visibleCB = new ToggleButton(this, ID_VISIBLE, 150, 10, IconEIO.VISIBLE_NO, IconEIO.VISIBLE_YES);
+    visibleCB.setSelected(te.isVisible());
+    visibleCB.setToolTip(visibleStr, visibleDesc1Str, visibleDesc2Str);
+
    ySize = 185;
    
    textFields.add(tf);
@@ -91,16 +106,24 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO {

  @Override
  protected void actionPerformed(GuiButton b) {
-    privateCB.setSelected(b.id == ID_PRIVATE);
-    protectedCB.setSelected(b.id == ID_PROTECTED);
-    publicCB.setSelected(b.id == ID_PUBLIC);
+    if (b.id >= 0) {
+      privateCB.setSelected(b.id == ID_PRIVATE);
+      protectedCB.setSelected(b.id == ID_PROTECTED);
+      publicCB.setSelected(b.id == ID_PUBLIC);

-    AccessMode curMode = b.id == ID_PRIVATE ? AccessMode.PRIVATE : b.id == ID_PROTECTED ? AccessMode.PROTECTED : AccessMode.PUBLIC;
-    te.setAccessMode(curMode);
+      AccessMode curMode = b.id == ID_PRIVATE ? AccessMode.PRIVATE : b.id == ID_PROTECTED ? AccessMode.PROTECTED : AccessMode.PUBLIC;
+      te.setAccessMode(curMode);
+      BlockCoord bc = te.getLocation();
+      PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode);
+      PacketHandler.INSTANCE.sendToServer(p);
+    } else if (b == visibleCB) {
+      boolean visible = visibleCB.isSelected();
+      te.setVisible(visible);
+      BlockCoord bc = te.getLocation();
+      PacketVisibility p = new PacketVisibility(bc.x, bc.y, bc.z, visible);
+      PacketHandler.INSTANCE.sendToServer(p);
+    }

-    BlockCoord bc = te.getLocation();
-    PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode);
-    PacketHandler.INSTANCE.sendToServer(p);
  }

  @Override
@@ -112,6 +135,7 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO {
    publicCB.onGuiInit();
    privateCB.onGuiInit();
    protectedCB.onGuiInit();
+    visibleCB.onGuiInit();

    tf.setMaxStringLength(32);
    tf.setFocused(true);
@@ -5,19 +5,15 @@ import java.awt.Color;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

 import org.lwjgl.opengl.GL11;

 import com.enderio.core.client.render.ColorUtil;
-import com.enderio.core.client.render.RenderUtil;
-import com.enderio.core.common.network.MessageTileNBT;

 import crazypants.enderio.EnderIO;
 import crazypants.enderio.api.teleport.ITravelAccessable;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
-import crazypants.enderio.network.PacketHandler;

 public class GuiTravelAuth extends GuiContainerBaseEIO {

@@ -51,9 +47,6 @@ public class GuiTravelAuth extends GuiContainerBaseEIO {
  protected void actionPerformed(GuiButton par1GuiButton) {
    ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots;
    if(ta.authoriseUser(player, poo.getInv().getInventory())) {
-      TileEntity te = ((TileEntity) ta);
-      PacketHandler.INSTANCE.sendToServer(new MessageTileNBT(te));
-
      this.mc.displayGuiScreen((GuiScreen) null);
      this.mc.setIngameFocus();
    } else {
@@ -63,7 +63,7 @@ public class TravelController {

  private int delayTimer = 0;

-  private int timer = Config.travelAnchorCooldown;
+  private final int timer = Config.travelAnchorCooldown;

  private boolean tempJump;

@@ -71,6 +71,8 @@ public class TravelController {

  private boolean showTargets = false;

+  private boolean insufficientPower;
+
  public BlockCoord onBlockCoord;

  public BlockCoord selectedCoord;
@@ -211,15 +213,17 @@ public class TravelController {
  }

  private boolean doBlinkAround(EntityPlayer player, Vector3d sample, boolean conserveMomentum) {
-    if(doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) - 1, (int) Math.floor(sample.z)), conserveMomentum)) {
-      return true;
-    }
    if(doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)), conserveMomentum)) {
      return true;
    }
    if(doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)), conserveMomentum)) {
      return true;
    }
+    if (!Config.travelStaffSearchOptimize) {
+      if (doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) - 1, (int) Math.floor(sample.z)), conserveMomentum)) {
+        return true;
+      }
+    }
    return false;
  }

@@ -307,23 +311,25 @@ public class TravelController {
      if((input.jump && !wasJumping && onBlock && selectedCoord != null && delayTimer == 0)
          || (input.sneak && !wasSneaking && onBlock && selectedCoord != null && delayTimer == 0 && Config.travelAnchorSneak)) {

-        onInput(player);
-        delayTimer = timer;
+        if (onInput(player)) {
+          delayTimer = timer;
+        }
      }
      // If there is no selected coordinate and the input is jump, go up
      if(input.jump && !wasJumping && onBlock && selectedCoord == null && delayTimer == 0) {

        updateVerticalTarget(player, 1);
-        onInput(player);
-        delayTimer = timer;
-
+        if (onInput(player)) {
+          delayTimer = timer;
+        }
      }

      // If there is no selected coordinate and the input is sneak, go down
      if(input.sneak && !wasSneaking && onBlock && selectedCoord == null && delayTimer == 0) {
        updateVerticalTarget(player, -1);
-        onInput(player);
-        delayTimer = timer;
+        if (onInput(player)) {
+          delayTimer = timer;
+        }
      }

      if(delayTimer != 0) {
@@ -333,6 +339,7 @@ public class TravelController {
      wasJumping = tempJump;
      wasSneaking = tempSneak;
      candidates.clear();
+      insufficientPower = false;
    }
  }

@@ -434,7 +441,11 @@ public class TravelController {
    requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF());
    int canUsePower = getEnergyInTravelItem(staff);
    if(requiredPower > canUsePower) {
-      player.addChatComponentMessage(new ChatComponentTranslation("enderio.itemTravelStaff.notEnoughPower"));
+      // make sure chat is sent only once per trial
+      if (!insufficientPower) {
+        player.addChatComponentMessage(new ChatComponentTranslation("enderio.itemTravelStaff.notEnoughPower"));
+        insufficientPower = true;
+      }
      return -1;
    }
    return requiredPower;
@@ -604,12 +615,12 @@ public class TravelController {
  }

  @SideOnly(Side.CLIENT)
-  private void onInput(EntityClientPlayerMP player) {
+  private boolean onInput(EntityClientPlayerMP player) {

    MovementInput input = player.movementInput;
    BlockCoord target = TravelController.instance.selectedCoord;
    if(target == null) {
-      return;
+      return false;
    }

    TileEntity te = player.worldObj.getTileEntity(target.x, target.y, target.z);
@@ -618,12 +629,13 @@ public class TravelController {
      if(ta.getRequiresPassword(player)) {
        PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z);
        PacketHandler.INSTANCE.sendToServer(p);
-        return;
+        return false;
      }
    }

    if(isTargetEnderIO()) {
      openEnderIO(null, player.worldObj, player);
+      return true;
    } else if(Config.travelAnchorEnabled && travelToSelectedTarget(player, TravelSource.BLOCK, false)) {
      input.jump = false;
      try {
@@ -631,8 +643,9 @@ public class TravelController {
      } catch (Exception e) {
        //ignore
      }
+      return true;
    }
-
+    return false;
  }

  public double getScaleForCandidate(Vector3d loc) {
@@ -720,8 +733,11 @@ public class TravelController {
      int x = MathHelper.floor_double(player.posX);
      int y = MathHelper.floor_double(player.boundingBox.minY) - 1;
      int z = MathHelper.floor_double(player.posZ);
-      if(world.getBlock(x, y, z) == EnderIO.blockTravelPlatform) {
-        return new BlockCoord(x, y, z);
+      TileEntity tileEntity = world.getTileEntity(x, y, z);
+      if(tileEntity instanceof ITravelAccessable) {
+        if (((ITravelAccessable) tileEntity).isTravelSource()) {
+          return new BlockCoord(x, y, z);
+        }
      }
    }
    return null;
@@ -2,6 +2,7 @@ package crazypants.enderio.teleport.anchor;

 import javax.annotation.Nullable;

+import crazypants.enderio.teleport.packet.PacketVisibility;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -62,6 +63,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt
    PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER);
    PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER);
    PacketHandler.INSTANCE.registerMessage(PacketPassword.Handler.class, PacketPassword.class, PacketHandler.nextID(), Side.SERVER);
+    PacketHandler.INSTANCE.registerMessage(PacketVisibility.class, PacketVisibility.class, PacketHandler.nextID(), Side.SERVER);

    BlockTravelAnchor result = new BlockTravelAnchor();
    result.init();
@@ -44,13 +44,23 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable

  private List<UserIdent> authorisedUsers = new ArrayList<UserIdent>();

+  private boolean visible = true;
+
+  private boolean isAuthorisedUser(UserIdent ident) {
+    return authorisedUsers.contains(ident);
+  }
+
+  private boolean isOwnerUser(UserIdent ident) {
+    return owner.equals(ident);
+  }
+
  @Override
  public boolean canBlockBeAccessed(EntityPlayer playerName) {
    if(accessMode == AccessMode.PUBLIC) {
      return true;
    }
    // Covers protected and private access modes
-    return owner.equals(playerName.getGameProfile()) || authorisedUsers.contains(playerName.getGameProfile());
+    return isOwnerUser(UserIdent.create(playerName.getGameProfile())) || isAuthorisedUser(UserIdent.create(playerName.getGameProfile()));

  }

@@ -81,7 +91,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
  @Override
  public boolean getRequiresPassword(EntityPlayer playerName) {
    return getAccessMode() == AccessMode.PROTECTED && !canUiBeAccessed(playerName)
-        && !authorisedUsers.contains(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()));
+      && !isAuthorisedUser(UserIdent.create(playerName.getGameProfile()));
  }

  @Override
@@ -95,7 +105,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable

  @Override
  public boolean canUiBeAccessed(EntityPlayer playerName) {
-    return owner.equals(playerName.getGameProfile());
+    return isOwnerUser(UserIdent.create(playerName.getGameProfile()));
  }

  @Override
@@ -103,7 +113,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
    if(accessMode != AccessMode.PRIVATE) {
      return true;
    }
-    return owner.equals(playerName.getGameProfile());
+    return isOwnerUser(UserIdent.create(playerName.getGameProfile()));
  }

  @Override
@@ -210,6 +220,11 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
      //keep behavior the same for blocks placed prior to this update
      accessMode = AccessMode.PUBLIC;
    }
+    if (root.hasKey("visible")) {
+      visible = root.getBoolean("visible");
+    } else {
+      visible = true;
+    }
    if (root.hasKey("placedBy")) {
      owner = UserIdent.create(root.getString("placedBy"));
    } else {
@@ -264,6 +279,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
  @Override
  protected void writeCustomNBT(NBTTagCompound root) {
    root.setShort("accessMode", (short) accessMode.ordinal());
+    root.setBoolean("visible", visible);
    owner.saveToNbt(root, "owner");
    for (int i = 0; i < password.length; i++) {
      ItemStack stack = password[i];
@@ -308,4 +324,14 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
  public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
    readCustomNBT(pkt.func_148857_g());
  }
+
+  @Override
+  public boolean isVisible() {
+    return visible;
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    this.visible = visible;
+  }
 }
@@ -54,6 +54,10 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {

    ITravelAccessable ta = (ITravelAccessable) tileentity;

+    if (!ta.isVisible()) {
+      return;
+    }
+
    BlockCoord onBlock = TravelController.instance.onBlockCoord;
    if(onBlock != null && onBlock.equals(ta.getLocation())) {
      return;
@@ -0,0 +1,52 @@
+package crazypants.enderio.teleport.packet;
+
+import cpw.mods.fml.common.network.simpleimpl.IMessage;
+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
+import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.api.teleport.ITravelAccessable;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+
+public class PacketVisibility implements IMessage, IMessageHandler<PacketVisibility, IMessage> {
+    int x, y, z;
+    boolean visible;
+
+    @SuppressWarnings("unused")
+    public PacketVisibility() {}
+
+    public PacketVisibility(int x, int y, int z, boolean visible) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.visible = visible;
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(x);
+        buf.writeInt(y);
+        buf.writeInt(z);
+        buf.writeBoolean(visible);
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        x = buf.readInt();
+        y = buf.readInt();
+        z = buf.readInt();
+        visible = buf.readBoolean();
+    }
+
+    @Override
+    public IMessage onMessage(PacketVisibility message, MessageContext ctx) {
+        EntityPlayer player = ctx.getServerHandler().playerEntity;
+        TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z);
+        if(te instanceof ITravelAccessable) {
+            ((ITravelAccessable) te).setVisible(message.visible);
+            player.worldObj.markBlockForUpdate(message.x, message.y, message.z);
+            player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te);
+        }
+        return null;
+    }
+}
@@ -419,6 +419,17 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei
    return this;
  }

+  /* ITravelAccessable */
+  @Override
+  public boolean isTravelSource() {
+    return isMaster() && inNetwork();
+  }
+
+  @Override
+  public boolean isVisible() {
+    return super.isVisible() && isTravelSource();
+  }
+
  /* ITelePad */

  @Override
@@ -27,14 +27,14 @@ public class EnderIOCrashCallable implements ICrashCallable {

    for (ModContainer modContainer : ModAPIManager.INSTANCE.getAPIList()) {
      if ("appliedenergistics2|API".equals(modContainer.getModId())) {
-        if ("rv1".equals(modContainer.getVersion())) {
+        if ("rv1".equals(modContainer.getVersion()) || "rv2".equals(modContainer.getVersion())) {
          result.add(" * An unsupportted old AE2 API is installed (" + modContainer.getVersion() + " from "
              + modContainer.getSource().getName() + ").");
-          result.add("   Ender IO was build against API version rv2 and will NOT work with older versions.");
-        } else if (!"rv2".equals(modContainer.getVersion())) {
+          result.add("   Ender IO was build against API version rv3 and will NOT work with older versions.");
+        } else if (!"rv3".equals(modContainer.getVersion())) {
          result.add(" * An unknown AE2 API is installed (" + modContainer.getVersion() + " from "
              + modContainer.getSource().getName() + ").");
-          result.add("   Ender IO was build against API version rv2 and may or may not work with a newer version.");
+          result.add("   Ender IO was build against API version rv3 and may or may not work with a newer version.");
        }
      } else if ("CoFHAPI|energy".equals(modContainer.getModId())) {
        if ("1.7.10R1.0.0".equals(modContainer.getVersion()) || "1.7.10R1.0.1".equals(modContainer.getVersion())) {
@@ -29,7 +29,8 @@ public class ExperienceContainer extends FluidTank {
  
  public ExperienceContainer(int maxStored) {
    super(null, 0);
-    maxXp = maxStored;
+    // enforce overflow-safe value
+    maxXp = Math.min(maxStored, XpUtil.liquidToExperience(Integer.MAX_VALUE));
  }
  
  public int getMaximumExperiance() {    
@@ -1023,12 +1023,14 @@ enderio.gui.machine.button.storelevels=Store 10
 enderio.gui.machine.tooltip.storelevels=levels of player XP
 enderio.gui.machine.button.storeall=Store all
 enderio.gui.machine.tooltip.storeall=player XP
+
 enderio.gui.machine.button.retrievelevel=Retrieve 1
 enderio.gui.machine.tooltip.retrievelevel=player XP level
 enderio.gui.machine.button.retrievelevels=Retrieve 10
 enderio.gui.machine.tooltip.retrievelevels=player XP levels
 enderio.gui.machine.button.retrieveall=Retrieve all
 enderio.gui.machine.tooltip.retrieveall=player XP levels
+
 enderio.gui.machine.ioMode.overlay.tooltip=Configure IO
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift click to reset all sides
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting
@@ -1156,6 +1158,9 @@ enderio.gui.travelAccessable.ok=Authorise
 enderio.gui.travelAccessable.skipLocked=Skipped locked anchor, use targeted teleport.
 enderio.gui.travelAccessable.skipObstructed=Skipped obstructed anchor.
 enderio.gui.travelAccessable.skipPrivate=Skipped private anchor.
+enderio.gui.travelAccessable.tooltip.visible=Visibility
+enderio.gui.travelAccessable.tooltip.visible.desc1=When off, you cannot see this block through other blocks.
+enderio.gui.travelAccessable.tooltip.visible.desc2=Handy for use as elevators.

 enderio.gui.telepad.configure.travel=Travel Settings
 enderio.gui.telepad.configure.telepad=Telepad Settings
@@ -1238,7 +1243,7 @@ enderio.weatherObelisk.fuelTank=Barometric Flux Tank

 #Enchants
 enchantment.enderio.soulBound=Soulbound
-description.enchantment.enderio.soulBound=Prevents item from being lost on death
+description.enchantment.enderio.soulBound=When the player dies the item/tool/armor will be kept in the inventory and not drop on the ground.

 #Configuration
 enderio.config.title=Ender IO Configuration
@@ -29,9 +29,22 @@ item.enderio.itemConduitFacade.tooltip.detailed.line3=Скрыт, когда г
 item.enderio.itemConduitFacade.tooltip.detailed.line4=экипированы
 item.enderio.itemConduitFacade.hardened.tooltip=Упрочнён: Выдерживает удары и взрывы

-enderio.itemPowerConduit.name=Энергетическая труба
-enderio.itemPowerConduitEnhanced.name=Улучшенная энергетическая труба
-enderio.itemPowerConduitEnder.name=Энергетическая труба Края
+enderio.itemPowerConduit.name=Энергопровод из проводящего железа
+enderio.itemPowerConduitEnhanced.name=Энергопровод из энергетического сплава
+enderio.itemPowerConduitEnder.name=Энергопровод из вибрирующего сплава
+
+enderio.itemPowerConduitEndergyCrude.name=Энергопровод из глинистого состава
+enderio.itemPowerConduitEndergyIron.name=Энергопровод из железа
+enderio.itemPowerConduitEndergyAluminum.name=Энергопровод из алюминия
+enderio.itemPowerConduitEndergyGold.name=Энергопровод из золота
+enderio.itemPowerConduitEndergyCopper.name=Энергопровод из меди 
+enderio.itemPowerConduitEndergySilver.name=Энергопровод из серебра 
+enderio.itemPowerConduitEndergyElectrum.name=Энергопровод из электрума 
+enderio.itemPowerConduitEndergyEnergeticSilver.name=Энергопровод из энергетического серебра 
+enderio.itemPowerConduitEndergyCrystalline.name=Энергопровод из кристалического сплава
+enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Энергопровод из кристаллической розовой слизи
+enderio.itemPowerConduitEndergyMelodic.name=Энергопровод из мелодичного сплава
+enderio.itemPowerConduitEndergyStellar.name=Энергопровод из звёздного сплава

 enderio.itemRedstoneConduit.name=Красная труба
 enderio.itemRedstoneConduitSwitch.name=Переключатель труб
@@ -40,12 +53,10 @@ enderio.itemRedstoneConduitInsulated.name=Изолированная красн
 enderio.itemLiquidConduit.name=Жидкостная труба
 enderio.itemLiquidConduitAdvanced.name=Жидкостная труба высокого давления
 enderio.itemLiquidConduitEnder.name=Жидкостная труба Края
-# BEGIN needs translation
-enderio.itemLiquidConduitCrystallineEnder.name=Crystalline Ender Fluid Conduit
-enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Crystalline Pink Slime Ender Fluid Conduit
-enderio.itemLiquidConduitMelodicEnder.name=Melodic Ender Fluid Conduit
-enderio.itemLiquidConduitStellarEnder.name=Stellar Ender Fluid Conduit
-# END needs translation
+enderio.itemLiquidConduitCrystallineEnder.name=Жидкостная труба из кристалического сплава
+enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Жидкостная труба из кристаллической розовой слизи
+enderio.itemLiquidConduitMelodicEnder.name=Жидкостная труба из мелодичного сплава
+enderio.itemLiquidConduitStellarEnder.name=Жидкостная труба из звёздного сплава
 enderio.itemLiquidConduit.lockedType=Тип жидкости установлен на
 enderio.itemLiquidConduit.unlockedType=Тип жидкости не установлен
 enderio.itemLiquidConduit.lockedWaila=Установленная жидкость 
@@ -64,8 +75,9 @@ enderio.itemItemConduit.name=Предметная труба

 enderio.filterUpgradeBasic.name=Основной предметный фильтр
 enderio.filterUpgradeAdvanced.name=Продвинутый предметный фильтр
+enderio.filterUpgradeBigAdvanced.name=Большой и расширенный предметный фильтр
+enderio.filterUpgradeBig.name=Большой предметный фильтр
 enderio.itemConduitFilterUpgrade=Улучшение для предметных труб
-
 enderio.itemConduitFilterUpgrade.configured=Настроенный
 enderio.itemConduitFilterUpgrade.clearConfigMethod=Положите в сетку создания, чтобы очистить
 enderio.itemConduitFilterUpgrade.clearConfigWarning=Это очистит все сохранённые настройки фильтра!
@@ -74,7 +86,7 @@ item.itemExistingItemFilter.name=Существующий предметный
 item.itemExistingItemFilter.tooltip.basic.line1=Улучшение для предметных труб
 item.itemExistingItemFilter.tooltip.detailed.line1=Выбирает предметы только
 item.itemExistingItemFilter.tooltip.detailed.line2=в инвентаре
-item.itemExistingItemFilter.tooltip.detailed.line3=ПКМ, сидя,
+item.itemExistingItemFilter.tooltip.detailed.line3=Shift-ПКМ
 item.itemExistingItemFilter.tooltip.detailed.line4=по инвентарю, чтобы добавить
 item.itemExistingItemFilter.tooltip.detailed.line5=содержимое в фильтр

@@ -133,6 +145,8 @@ enderio.conduitBinder.name=Связующий элемент труб
 enderio.binderComposite.name=Составной связующий элемент
 enderio.phasedIronNugget.name=Пульсирующий железный самородок
 tile.blockDarkIronBars.name=Решётка из тёмного железа
+tile.blockSoulariumBars.name=Решётка из призрачного сплава
+tile.blockEndSteelBars.name=Решётка из стали Края
 tile.blockEndermanSkull.name=Череп странника Края
 tile.blockEndermanSkull.base.name=Голова странника Края
 tile.blockEndermanSkull.reanimated.name=Реанимированная голова странника Края
@@ -158,12 +172,35 @@ item.bucketNutrient_distillation.name=Ведро питательного дис
 fluid.hootch=Самогон
 tile.fluid.hootch.name=Самогон
 item.bucketHootch.name=Ведро самогона
+
 fluid.fire_water=Огненная вода
 tile.fluid.fire_water.name=Огненная вода
 item.bucketFire_water.name=Ведро огненной воды
+
 fluid.rocket_fuel=Ракетное топливо
 tile.fluid.rocket_fuel.name=Ракетное топливо
 item.bucketRocket_fuel.name=Ведро ракетного топлива
+
+fluid.liquid_sunshine=Жидкий солнечный свет
+tile.fluid.liquid_sunshine.name=Солнечный свет
+item.bucketLiquid_sunshine.name=Ведро жидкого солнечного света
+
+fluid.cloud_seed=Облако семян
+tile.fluid.cloud_seed.name=Облако семян
+item.bucketCloud_seed.name=Ведро c облаком семян
+
+fluid.cloud_seed_concentrated=Концентрированное облако семян
+tile.fluid.cloud_seed_concentrated.name=Концентрированное облако семян
+item.bucketCloud_seed_concentrated.name=Ведро c концентрированным облаком семян
+
+fluid.ender_distillation=Роса пустоты
+tile.fluid.ender_distillation.name=Роса пустоты
+item.bucketEnder_distillation.name=Ведро росы пустоты
+
+fluid.vapor_of_levity=Пар лёгкости
+tile.fluid.vapor_of_levity.name=Пар лёгкости
+item.bucketVapor_of_levity.name=Ведро пара лёгкости
+
 fluid.eio.xpjuice=Жидкий опыт
 tile.fluid.eio.xpjuice.name=Жидкий опыт
 item.bucketXpjuice.name=Ведро опыта
@@ -186,11 +223,24 @@ enderio.vibrantCrystal.name=Вибрирующий кристалл
 enderio.enderCrystal.name=Кристалл Края
 enderio.attractorCrystal.name=Привлекающий кристалл
 enderio.weatherCrystal.name=Погодный кристалл
+enderio.soulMachineChassi.name=Корпус механизма из призрачного сплава
+enderio.endSteelMachineChassi.name=Корпус механизма из стали Края
+
 enderio.darkGrindingBall.name=Шарик тёмной стали
+enderio.electricalGrindingBall.name=Шарик наэлектризованной стали
+enderio.energeticGrindingBall.name=Шарик энергетического сплава
+enderio.vibrantGrindingBall.name=Шарик вибрирующего сплава
+enderio.redstoneGrindingBall.name=Шарик сплава из красного камня
+enderio.conductiveGrindingBall.name=Шарик проводящего железа
+enderio.pulsatingGrindingBall.name=Шарик пульсирующего железа
+enderio.soulariumGrindingBall.name=Шарик призрачного сплава
+enderio.endSteelGrindingBall.name=Шарик стали Края
+
 enderio.darkGrindingBall.tooltip.detailed.line1=Измельчающий шарик для дробилки
 enderio.darkGrindingBall.tooltip.detailed.line2=Основной выход
 enderio.darkGrindingBall.tooltip.detailed.line3=Бонусный выход
 enderio.darkGrindingBall.tooltip.detailed.line4=Снижение мощности
+enderio.darkSteelRod.name=Стержень из тёмной стали

 tile.blockReinforcedObsidian.name=Укреплённый обсидиан
 tile.blockReinforcedObsidian.tooltip.common.line1=Защищён от иссушителей
@@ -217,7 +267,43 @@ enderio.conductiveIron.name=Проводящее железо
 enderio.phasedIron.name=Пульсирующее железо
 enderio.vibrantNugget.name=Самородок вибрирующего сплава
 enderio.darkSteel.name=Тёмная сталь
-enderio.soularium.name=Соуларий
+enderio.soularium.name=Призрачный сплав
+enderio.endSteel.name=Сталь Края
+enderio.endSteelNugget.name=Самородок стали Края
+
+enderio.crudeSteel.name=Состав глины
+enderio.crystallineAlloy.name=Кристаллический сплав
+enderio.melodicAlloy.name=Мелодичный сплав
+enderio.stellarAlloy.name=Звёздный сплав
+enderio.crystallinePinkSlime.name=Кристаллическая розовая слизь
+enderio.energeticSilver.name=Энергетическое серебро
+enderio.vividAlloy.name=Яркий сплав
+
+enderio.crudeSteelGrindingBall.name=Шлифовальный шар из глинистого состава
+enderio.crystallineAlloyGrindingBall.name=Шлифовальный шар из кристаллического сплава
+enderio.melodicAlloyGrindingBall.name=Шлифовальный шар из мелодичного сплава
+enderio.stellarAlloyGrindingBall.name=Шлифовальный шар из звёздного сплава
+enderio.crystallinePinkSlimeGrindingBall.name=Шлифовальный шар из кристаллической розовой слизи
+enderio.energeticSilverGrindingBall.name=Энергетический серебряный шлифовальный шар
+enderio.vividAlloyGrindingBall.name=Шлифовальный шар из яркого сплава
+
+enderio.precientCrystal.name=Древний кристалл
+enderio.pulsatingPowder.name=Пыль пульсирующего сплава
+enderio.vibrantPowder.name=Пыль вибрирующего сплава
+enderio.enderCrystalPowder.name=Пыль кристалла Края
+enderio.precientPowder.name=Пыль древнего кристалла
+
+#Balls
+enderio.electricalSteel_ball.name=Шарик наэлектризованной стали
+enderio.energeticAlloy_ball.name=Шарик энергетического сплава
+enderio.phasedGold_ball.name=Шарик вибрирующего сплава
+enderio.redstoneAlloy_ball.name=Шарик сплава красного камня
+enderio.conductiveIron_ball.name=Шарик проводящего железа
+enderio.phasedIron_ball.name=Шарик пульсирующего железа
+enderio.vibrantNugget_ball.name=Шарик вибрирующего сплава
+enderio.darkSteel_ball.name=Шарик тёмной стали
+enderio.soularium_ball.name=Шарик призрачного сплава
+enderio.endSteel_ball.name=Шарик стали Края

 tile.blockIngotStorage.name=Хранилище слитков
 tile.enderio.electricalSteel.name=Блок наэлектризованной стали
@@ -228,7 +314,16 @@ tile.enderio.conductiveIron.name=Блок проводящего железа
 tile.enderio.phasedIron.name=Блок пульсирующего железа
 tile.enderio.vibrantNugget.name=Блок самородка вибрирующего сплава
 tile.enderio.darkSteel.name=Блок тёмной стали
-tile.enderio.soularium.name=Блок соулария
+tile.enderio.soularium.name=Блок призрачного сплава
+tile.enderio.endSteel.name=Блок стали Края
+
+tile.enderio.crudeSteel.name=Блок глинистого состава
+tile.enderio.crystallineAlloy.name=Блок кристаллического сплава
+tile.enderio.melodicAlloy.name=Блок из мелодичного сплава
+tile.enderio.stellarAlloy.name=Блок звёздного сплава
+tile.enderio.crystallinePinkSlime.name=Блок из кристаллической розовой слизи
+tile.enderio.energeticSilver.name=Блок энергетического серебра
+tile.enderio.vividAlloy.name=Блок яркого сплава

 #Powder / Ingot
 enderio.powderCoal.name=Угольный порошок
@@ -245,6 +340,13 @@ enderio.itemBasicCapacitor.name=Конденсатор
 enderio.basicCapacitor.name=Основной конденсатор
 enderio.activatedCapacitor.name=Двухслойный конденсатор
 enderio.enderCapacitor.name=Восьмислойный конденсатор
+enderio.crystallineCapacitor.name=Кристаллический конденсатор
+enderio.melodicCapacitor.name=Мелодичный конденсатор
+enderio.stellarCapacitor.name=Звёздный конденсатор
+enderio.silverCapacitor.name=Серебряный конденсатор
+enderio.endergeticCapacitor.name=Эндергетический конденсатор
+enderio.endergisedCapacitor.name=Сияющий конденсатор
+enderio.totemicCapacitor.name=Тотемный конденсатор

 enderio.machine.tooltip.upgrade=Улучшение механизма
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Увеличивает хранилище энергии и
@@ -272,12 +374,13 @@ tile.blockAlloySmelter.tooltip.detailed.line3=питающаяся энерги
 tile.blockAlloySmelter.tooltip.detailed.line4=Добавьте конденсаторы, чтобы увеличить
 tile.blockAlloySmelter.tooltip.detailed.line5=скорость и хранилище энергии

-tile.blockSolarPanel.name=Фотовольтовая ячейка
-tile.blockSolarPanel.advanced.name=Продвинутая фотовольтовая ячейка
+tile.blockSolarPanel.name=Фотовольтовая панель
+tile.blockSolarPanel.advanced.name=Продвинутая фотовольтовая панель
+tile.blockSolarPanel.vibrant.name=Вибрирующая фотовольтовая панель
 tile.blockSolarPanel.tooltip.common.line1=Солнечная энергия!
 tile.blockSolarPanel.tooltip.detailed.line1=Производит энергию в светлое время суток
-tile.blockSolarPanel.tooltip.detailed.line2=Должна иметь чистое пространство
-tile.blockSolarPanel.tooltip.detailed.line3=к небу
+tile.blockSolarPanel.tooltip.detailed.line2=Должна быть четкая линия обзора
+tile.blockSolarPanel.tooltip.detailed.line3=неба
 enderio.maxSolorProduction=Макс. выход
 enderio.tooltip.efficiency=Эффективность
 enderio.tooltip.sunlightBlocked=Небо закрыто!
@@ -403,6 +506,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=для производства
 enderio.zombieGenerator.fuelTank=Питательный резервуар
 enderio.gui.fluid.minReq=Для активации требуется: %s

+tile.blockFrankenzombieGenerator.name=Генератор Frank'N'Zombie
+tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Потребляет питательный дистиллят
+tile.blockFrankenzombieGenerator.tooltip.detailed.line2=для производства энергии
+enderio.frankenzombieGenerator.fuelTank=Резервуар для питательных веществ
+
+tile.blockEnderGenerator.name=Генератор Края
+tile.blockEnderGenerator.tooltip.detailed.line1=Потребляет росу пустоты
+tile.blockEnderGenerator.tooltip.detailed.line2=для производства энергии
+enderio.enderGenerator.fuelTank=Резервуар пустоты
+
 tile.blockKillerJoe.name=Киллер Джо
 tile.blockKillerJoe.tooltip.detailed.line1=Атакует ближайших существ, если
 tile.blockKillerJoe.tooltip.detailed.line2=снабжён мечом и
@@ -665,7 +778,7 @@ item.enderio.itemConduitProbe.name=Зонд для труб
 item.enderio.itemConduitProbe.tooltip.detailed.line1=ПКМ по трубе, чтобы отобразить
 item.enderio.itemConduitProbe.tooltip.detailed.line2=детали о её сети
 item.enderio.itemConduitProbe.tooltip.detailed.line3=Shift-ПКМ по трубе, чтобы
-item.enderio.itemConduitProbe.tooltip.detailed.line4=получить доступ к её параметрам подключения
+item.enderio.itemConduitProbe.tooltip.detailed.line4=скопировать её параметры подключения
 item.enderio.itemConduitProbe.tooltip.detailed.line5=ПКМ, чтобы вставить их
 item.enderio.itemConduitProbe.tooltip.detailed.line6=Используйте Shift-колёсико мыши или 'Y', чтобы изменить режим

@@ -689,6 +802,8 @@ skullZombieController.name=Зомби-контроллер
 skullZombieFrankenstien.name=Зомби Фрэнк
 skullEnderResonator.name=Резонатор Края
 skullSentientEnder.name=Разумный Край
+skullSkeletalContractor.name=Скелетный подрядчик
+skullGuardianDiode.name=Диод охраны

 item.itemSpawnEggEnderIO.name=Призвать существо - 

@@ -697,54 +812,107 @@ item.darkSteel_helmet.name=Тёмный шлем
 item.darkSteel_chestplate.name=Тёмная кираса
 item.darkSteel_leggings.name=Тёмные поножи
 item.darkSteel_boots.name=Тёмные ботинки
-item.darkSteel_sword.name=Край
+item.darkSteel_sword.name=Тёмный меч
 item.darkSteel_pickaxe.name=Тёмная кирка
 item.darkSteel_axe.name=Тёмный топор
 item.darkSteel_shears.name=Тёмные ножницы

+#End Steel
+item.endSteel_helmet.name=Шлем из стали Края
+item.endSteel_chestplate.name=Кираса из стали Края
+item.endSteel_leggings.name=Поножи из стали Края
+item.endSteel_boots.name=Ботинки из стали Края
+item.endSteel_sword.name=Меч из стали Края
+item.endSteel_pickaxe.name=Кирка из стали Края
+item.endSteel_axe.name=Топор из стали Края
+
+#Stellar
+item.stellar_helmet.name=Шлем из звёздного сплава
+item.stellar_chestplate.name=Кираса из звёздного сплава
+item.stellar_leggings.name=Поножи из звёздного сплава
+item.stellar_boots.name=Ботинки из звёздного сплава
+item.stellar_sword.name=Меч из звёздного сплава
+item.stellar_pickaxe.name=Кирка из звёздного сплава
+item.stellar_axe.name=Топор из звёздного сплава
+
 enderio.item.darkSteel.tooltip.lvs=уровней

 enderio.item.darkSteel_pickaxe.tooltip.effPowered=Эффективность при питании
 enderio.item.darkSteel_pickaxe.tooltip.effObs=Эффективность уничтожения обсидиана
 enderio.item.darkSteel_pickaxe.tooltip.cost=стоит

+enderio.item.endSteel_pickaxe.tooltip.effPowered=Эффективность при питании
+enderio.item.endSteel_pickaxe.tooltip.effObs=Эффективность уничтожения обсидиана
+enderio.item.endSteel_pickaxe.tooltip.cost=стоит
+
+enderio.item.stellar_pickaxe.tooltip.effPowered=Эффективность при питании
+enderio.item.stellar_pickaxe.tooltip.effObs=Эффективность уничтожения обсидиана
+enderio.item.stellar_pickaxe.tooltip.cost=стоит
+
 enderio.item.darkSteel_axe.tooltip.multiHarvest=Присядьте, чтобы срубить несколько брёвен
+enderio.item.endSteel_axe.tooltip.multiHarvest=Присядьте, чтобы срубить несколько брёвен
+enderio.item.stellar_axe.tooltip.multiHarvest=Присядьте, чтобы срубить несколько брёвен

 enderio.item.darkSteel_shears.tooltip.multiHarvest=Стригут несколько блоков/овец, если запитаны

 enderio.item.darkSteel_sword.tooltip.line1=Увеличено выпадение черепов и жемчуга Края.
 enderio.item.darkSteel_sword.tooltip.line2=Странник Края не может телепортироваться после удара.
-enderio.item.darkSteel_sword.tooltip.line3=+1 Урон, при питании
+enderio.item.darkSteel_sword.tooltip.line3=+1 урон, если меч запитан
+
+enderio.item.endSteel_sword.tooltip.line1=Увеличено выпадение черепов и жемчуга Края.
+enderio.item.endSteel_sword.tooltip.line2=Странник Края не может телепортироваться после удара.
+enderio.item.endSteel_sword.tooltip.line3=+2 урона, если меч запитан
+
+enderio.item.stellar_sword.tooltip.line1=Увеличено выпадение черепов и жемчуга Края.
+enderio.item.stellar_sword.tooltip.line2=Странник Края не может телепортироваться после удара.
+enderio.item.stellar_sword.tooltip.line3=+2 урона, если меч запитан

 enderio.item.darkSteel_armor.tooltip.line1=Алмазный уровень защиты,
 enderio.item.darkSteel_armor.tooltip.line2=если есть питание

+enderio.item.endSteel_armor.tooltip.line1=Алмазный+ уровень защиты,
+enderio.item.endSteel_armor.tooltip.line2=если есть питание
+
+enderio.item.stellar_armor.tooltip.line1=Алмазный+ уровень защиты,
+enderio.item.stellar_armor.tooltip.line2=если есть питание
+
 enderio.item.darkSteel_boots.tooltip.line1=Урон от падения поглощается,
 enderio.item.darkSteel_boots.tooltip.line2=если есть питание

-enderio.darksteel.upgrade.empowered_one.name=Усиление
+enderio.item.endSteel_boots.tooltip.line1=Урон от падения поглощается,
+enderio.item.endSteel_boots.tooltip.line2=если есть питание
+
+enderio.item.stellar_boots.tooltip.line1=Урон от падения поглощается,
+enderio.item.stellar_boots.tooltip.line2=если есть питание
+
+enderio.darksteel.upgrade.empowered_one.name=Усиление I
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Энергия: $P
-enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=Поглощается $D% урона
-enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line3=энергией
+enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=Поглощается $D% урона,
+enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line3=если есть питание

 enderio.darksteel.upgrade.empowered_two.name=Усиление II
 enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line1=Энергия: $P
-enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line2=Поглощается $D% урона
-enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line3=энергией
+enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line2=Поглощается $D% урона,
+enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line3=если есть питание

 enderio.darksteel.upgrade.empowered_three.name=Усиление III
 enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line1=Энергия: $P
-enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line2=Поглощается $D% урона
-enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line3=энергией
+enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line2=Поглощается $D% урона,
+enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line3=если есть питание

 enderio.darksteel.upgrade.empowered_four.name=Усиление IV
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=Энергия: $P
-enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=Поглощается $D% урона
-enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=энергией
+enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=Поглощается $D% урона,
+enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=если есть питание
+
+enderio.darksteel.upgrade.empowered_five.name=Усиление V
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=Энергия: $P
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=Поглощается $D% урона,
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=если есть питание

 enderio.darksteel.upgrade.travel.name=Путешествие
-enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Зажмите shift и нажмите ПКМ, для телепорта или
-enderio.darksteel.upgrade.travel.tooltip.detailed.line2=активируйте якорь путешествия, или Ender IO
+enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Зажмите shift и нажмите ПКМ, для телепорта. 
+enderio.darksteel.upgrade.travel.tooltip.detailed.line2=Так же можно телепортироваться на якоря путешествия.

 enderio.darksteel.upgrade.spoon.name=Ложка
 enderio.darksteel.upgrade.spoon.tooltip.detailed.line1=Кому нужна лопата, когда
@@ -815,15 +983,18 @@ enderio.darksteel.upgrade.speed_three.tooltip.detailed.line1=Увеличива

 enderio.darksteel.upgrade.swim.name=Ласты

-enderio.darksteel.upgrade.nightVision.name=Ночное видение
-enderio.darksteel.upgrade.nightVision.enabled=Ночное видение включено
-enderio.darksteel.upgrade.nightVision.disabled=Ночное видение выключено
+enderio.darksteel.upgrade.nightVision.name=Ночное зрение
+enderio.darksteel.upgrade.nightVision.enabled=Ночное зрение включено
+enderio.darksteel.upgrade.nightVision.disabled=Ночное зрение выключено

 enderio.darksteel.upgrade.solar_one.name=Солнечная батарея I
-enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Генерирует энергию от солнца.
+enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.

 enderio.darksteel.upgrade.solar_two.name=Солнечная батарея II
-enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует энергию от солнца.
+enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.
+
+enderio.darksteel.upgrade.solar_three.name=Солнечная батарея III
+enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.

 #------GUI

@@ -852,12 +1023,14 @@ enderio.gui.machine.button.storelevels=Отдать 10
 enderio.gui.machine.tooltip.storelevels=уровней опыта игрока
 enderio.gui.machine.button.storeall=Отдать весь
 enderio.gui.machine.tooltip.storeall=опыт игрока
+
 enderio.gui.machine.button.retrievelevel=Забрать 1
 enderio.gui.machine.tooltip.retrievelevel=уровень опыта игрока
 enderio.gui.machine.button.retrievelevels=Забрать 10
 enderio.gui.machine.tooltip.retrievelevels=уровней опыта игрока
 enderio.gui.machine.button.retrieveall=Забрать все
 enderio.gui.machine.tooltip.retrieveall=уровни опыта игрока
+
 enderio.gui.machine.ioMode.overlay.tooltip=Настроить вход/выход
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift-клик, чтобы сбросить все стороны
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=на настройки по-умолчанию
@@ -1015,10 +1188,10 @@ enderio.gui.conduit.item.channel=Канал
 enderio.gui.conduit.item.ignoreMetaData=Игнорировать метаданные
 enderio.gui.conduit.item.matchMetaData=Соблюдать метаданные
 enderio.gui.conduit.item.whitelist=Белый список
-enderio.gui.conduit.item.whitelist.tooltip.0=Если список предметов пуст, ни один
+enderio.gui.conduit.item.whitelist.tooltip.0=Если список предметов пуст, то ни один
 enderio.gui.conduit.item.whitelist.tooltip.1=предмет не будет принят
 enderio.gui.conduit.item.blacklist=Чёрный список
-enderio.gui.conduit.item.blacklist.tooltip.0=Если список предметов пуст,
+enderio.gui.conduit.item.blacklist.tooltip.0=Если список предметов пуст, то
 enderio.gui.conduit.item.blacklist.tooltip.1=все предметы будут приняты
 enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на этот|или другие "липкие" выходы.
 enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен
@@ -1062,6 +1235,8 @@ enderio.gui.conduit.gas.autoExtract=Авто-извлечение
 enderio.gui.weather.task.clear=Ясная погода
 enderio.gui.weather.task.rain=Дождливая погода
 enderio.gui.weather.task.storm=Гроза
+enderio.gui.weather.requiredfluid=Требуется жидкость: %s L
+enderio.weatherObelisk.fuelTank=Barometric Flux Tank

 #Enchants
 enchantment.enderio.soulBound=Печать души
@@ -1128,7 +1303,7 @@ enderio.nei.alloysmelter=Завод сплавов
 enderio.nei.enchanter=Зачарователь
 enderio.nei.sagmill=Дробитель
 enderio.nei.sagmill.outputchance=Шанс: {0,choice,0#'<1'|0<{0,number}}%
-enderio.nei.slicensplice=«Отрубатель и сращиватель»
+enderio.nei.slicensplice=Отрубатель и сращиватель
 enderio.nei.soulbinder=Связыватель душ
 enderio.nei.vat=Чан
 enderio.tooltip.burntime=Время горения:
Author	SHA1	Message	Date
miozune	f8e96eaa59	Fix log spam with DImensional Transceiver (#73 )	2022-06-22 11:30:09 +02:00
TataTawa	1eeddad48f	Patch 1 (#72 ) * Update TileConduitBundle.java * Update TileConduitBundle.java * Update TileConduitBundle.java	2022-06-20 20:05:49 +02:00
Raven Szewczyk	7e625f2bff	Save ServerChannelRegister together with every world save, and avoid saving it on server crashes. (#70 )	2022-06-10 16:50:16 +02:00
MuXiu1997andKiwi	47bd7efd19	Update en_US.lang (#69 ) Co-authored-by: Kiwi <[email protected]> Co-authored-by: Kiwi <[email protected]>	2022-05-30 09:06:46 +02:00
DianeXD	4f8336dc5b	Fix powered spawner wrong behavior (#67 ) * Fix powered spawner wrong behavior * Fix powered spawner wrong behavior	2022-05-27 12:46:35 +02:00
miozune	b19a4c98b8	Add Garden Soil from Ztones to recognized farmland list for CustomSeedFarmer (#68 )	2022-05-26 09:49:33 +02:00
Martin Robertz	5f4a9794b0	update mekanism link	2022-05-17 18:14:44 +02:00
MuXiu1997	6a00ab5d88	Fix TravelUpgrade (#66 )	2022-05-02 20:06:16 +02:00
miozune	da6e0c5ba0	Allow blinking onto the roof (#65 ) * Allow blinking onto the roof * swap	2022-04-25 15:32:07 +02:00
miozune	edc8786d79	Fix overflow with XP container machines (#64 )	2022-04-20 11:49:19 +02:00
miozune	88d7baef0a	Fix chat spam when try to blink but staff does not have enough power (#63 )	2022-04-19 11:18:50 +02:00
miozune	efc8eba67b	Travel Anchor improvements (#62 ) * No penalty for failed teleportation * Allow Travel Anchors to be hidden * Fix protected mode not working * Fix visibility not written to disk	2022-04-08 18:58:04 +02:00
TheyuGin	f4f2b857b7	fix: moving around buttons in Big Advanced Item Filter (#61 ) * fix: moving around buttons in Big Advanced Item Filter * fix: moved sticky button to not split other buttons in extract	2022-04-05 07:09:35 +02:00
boubou19	958da172e4	fix farming station range (#60 )	2022-03-30 20:03:22 +02:00
miozune	3669b5a690	Fix tooltip for coolant (#59 ) * Fix tooltip for coolant * Update OC	2022-03-19 15:49:39 +01:00
Pnc6lx	d46289b0e1	EIO capacitor fix (#58 ) * EIO capacitor fix fix new capacitor behave in some machine * Update TilePoweredSpawner.java * Update TilePoweredSpawner.java	2022-03-04 16:10:13 +01:00
repo-alt	07152aaee0	fix AE2 version check in crash callback (#57 )	2022-02-26 14:32:09 +01:00
bombcar	86da15ac65	Update .github scripts and buildscript (#56 ) * additional dep cleanup * build and test * remove library	2022-02-12 22:16:35 +01:00
glowredman	979957a4c0	Make Forestry a soft-dependency (#55 ) * Update Buildscript * Only load Forestry Farmer if Forestry is installed	2022-02-12 07:38:56 -06:00
Zereff06	13634ef7c8	small correction "==" - "=" (#54 )	2022-02-08 21:15:38 +01:00
bombcar	def6497c99	update buildcraft (#53 )	2022-02-07 00:34:31 +01:00
bombcar	1448342910	update dependencies, including buildscript and buildcraft (#52 )	2022-02-06 21:24:43 +01:00
bombcar	35c2828696	nei	2022-01-27 21:21:38 -08:00
bombcar	a661799beb	update buildscript and readme	2022-01-27 21:21:38 -08:00
bombcar	018ee58dcc	LGPL-3.0	2022-01-27 21:21:38 -08:00
Jason Mitchell	36d17585a3	add CCC dep	2022-01-18 00:13:04 -08:00
Jason Mitchell	0f8b438443	add more (formerly) transitive deps	2022-01-18 00:09:26 -08:00
Jason Mitchell	2db8a4e926	add nei explicit dep	2022-01-18 00:03:50 -08:00
Jason Mitchell	32edaf1acb	update to explicit dependencies	2022-01-17 23:53:37 -08:00
Jason Mitchell	56fedda2d8	maven publish buildscript update	2022-01-17 23:53:37 -08:00
Eldrinn-Elantey	016f14f4f4	Update en_US.lang, Update en_US.lang (#50 ) * Update en_US.lang * Update ru_RU.lang	2022-01-16 12:12:44 +01:00
Zereff06	7bfbc17d2d	Update ru_RU.lang (#49 ) * Update ru_RU.lang * Update ru_RU.lang * Update ru_RU.lang	2022-01-10 21:06:56 +01:00
Zereff06	8c442521a6	Update ru_RU.lang (#48 ) * Update ru_RU.lang * Update ru_RU.lang	2022-01-10 12:46:00 +01:00
Martin Robertz	21545ccf49	Merge pull request #47 from D-Cysteine/master Fix error migrating advanced ender fluid conduits	2021-12-23 12:52:31 +01:00
D-Cysteine	fd8cf1f516	Fix error migrating advanced ender fluid conduits	2021-12-23 03:31:48 -07:00