Try to fix energy overflow

* imrpove canConnectToExternal()

* needUpdateConnections

* add comments for needUpdateconnections

.editorconfig

@@ -18,9 +18,5 @@ 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
-
 [*.lang]
 trim_trailing_whitespace = false

build.gradle

@@ -1,4 +1,4 @@
-//version: 1675110695
+//version: 1677938302
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -9,13 +9,18 @@
 import com.diffplug.blowdryer.Blowdryer
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute
 import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
+import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
 import com.matthewprenger.cursegradle.CurseArtifact
 import com.matthewprenger.cursegradle.CurseRelation
 import com.modrinth.minotaur.dependencies.ModDependency
 import com.modrinth.minotaur.dependencies.VersionDependency
+import cpw.mods.fml.relauncher.Side
+import org.gradle.api.tasks.options.Option;
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.internal.xml.XmlTransformer
 import org.jetbrains.gradle.ext.*
 
 import java.nio.file.Files
@@ -23,10 +28,10 @@ import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
+import javax.inject.Inject
 
 buildscript {
     repositories {
-        mavenLocal()
         mavenCentral()
 
         maven {
@@ -47,6 +52,8 @@ buildscript {
             name 'Scala CI dependencies'
             url 'https://repo1.maven.org/maven2/'
         }
+
+        mavenLocal()
     }
 }
 plugins {
@@ -66,7 +73,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.7.2' apply false
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.2.2'
 }
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
@@ -122,6 +129,9 @@ propertyDefaultIfUnset("gradleTokenGroupName", "")
 propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only
 propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only
 
+// this is meant to be set using the user wide property file. by default we do nothing.
+propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
+
 project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
 if (!disableSpotless) {
     apply plugin: 'com.diffplug.spotless'
@@ -186,11 +196,21 @@ configurations {
 }
 
 if (enableModernJavaSyntax.toBoolean()) {
+    repositories {
+        mavenCentral {
+            mavenContent {
+                includeGroup("me.eigenraven.java8unsupported")
+            }
+        }
+    }
+
     dependencies {
         annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
         compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
             transitive = false // We only care about the 1 annotation class
         }
+        // Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937.
+        patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0')
     }
 
     tasks.withType(JavaCompile).configureEach {
@@ -234,12 +254,14 @@ if (apiPackage) {
 }
 
 if (accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if (!getFile(targetFile).exists()) {
-        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    for (atFile in accessTransformersFile.split(",")) {
+        String targetFile = "src/main/resources/META-INF/" + atFile.trim()
+        if (!getFile(targetFile).exists()) {
+            throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+        }
+        tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
+        tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
     }
-    tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
-    tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
 } else {
     boolean atsFound = false
     for (File at : sourceSets.getByName("main").resources.files) {
@@ -367,6 +389,10 @@ minecraft {
         injectMissingGenerics.set(true)
     }
 
+    username = developmentEnvironmentUserName.toString()
+
+    lwjgl3Version = "3.3.2-SNAPSHOT"
+
     // Enable assertions in the current mod
     extraRunJvmArguments.add("-ea:${modGroup}")
 
@@ -401,6 +427,16 @@ configurations.configureEach {
             }
         }
     }
+    def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE)
+    if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            // Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server
+            if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') {
+                details.useVersion '2388750'
+                details.because 'Pick obfuscated jar'
+            }
+        }
+    }
 }
 
 // Ensure tests have access to minecraft classes
@@ -430,8 +466,9 @@ repositories.configureEach { repo ->
 apply from: 'repositories.gradle'
 
 configurations {
+    runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
+    testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
     for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) {
-        config.extendsFrom(runtimeOnlyNonPublishable)
         if (usesShadowedDependencies.toBoolean()) {
             config.extendsFrom(shadowImplementation)
             // TODO: remove Compile after all uses are refactored to Implementation
@@ -484,6 +521,13 @@ repositories {
             }
         }
     }
+    maven {
+        name 'sonatype'
+        url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        content {
+            includeGroup "org.lwjgl"
+        }
+    }
     if (includeWellKnownRepositories.toBoolean()) {
         maven {
             name "CurseMaven"
@@ -520,20 +564,20 @@ dependencies {
         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('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
         if (usesMixinDebug.toBoolean()) {
             runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        implementation('com.gtnewhorizon:gtnhmixins:2.1.10')
+        implementation('com.gtnewhorizon:gtnhmixins:2.1.13')
     }
 }
 
 pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
     if (usesMixins.toBoolean()) {
         dependencies {
-            kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+            kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
         }
     }
 }
@@ -633,9 +677,150 @@ tasks.named("processResources", ProcessResources).configure {
 
     if (usesMixins.toBoolean()) {
         from refMap
+        dependsOn("compileJava", "compileScala")
     }
 }
 
+ext.java17Toolchain = (JavaToolchainSpec spec) -> {
+    spec.languageVersion.set(JavaLanguageVersion.of(17))
+    spec.vendor.set(JvmVendorSpec.matching("jetbrains"))
+}
+
+ext.java17DependenciesCfg = configurations.create("java17Dependencies") {
+    extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution
+    canBeConsumed = false
+}
+ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") {
+    canBeConsumed = false
+}
+
+dependencies {
+    def lwjgl3ifyVersion = '1.1.35'
+    def asmVersion = '9.4'
+    if (modId != 'lwjgl3ify') {
+        java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
+    }
+    if (modId != 'hodgepodge') {
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.40')
+    }
+
+    java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
+    java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
+    java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
+    java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
+    java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
+}
+
+ext.java17JvmArgs = [
+    // Java 9+ support
+    "--illegal-access=warn",
+    "-Djava.security.manager=allow",
+    "-Dfile.encoding=UTF-8",
+    "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED",
+    "--add-opens", "java.base/java.net=ALL-UNNAMED",
+    "--add-opens", "java.base/java.nio=ALL-UNNAMED",
+    "--add-opens", "java.base/java.io=ALL-UNNAMED",
+    "--add-opens", "java.base/java.lang=ALL-UNNAMED",
+    "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
+    "--add-opens", "java.base/java.text=ALL-UNNAMED",
+    "--add-opens", "java.base/java.util=ALL-UNNAMED",
+    "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED",
+    "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
+    "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming",
+    "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED",
+    "--add-modules", "jdk.dynalink",
+    "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED",
+    "--add-modules", "java.sql.rowset",
+    "--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED"
+]
+
+ext.hotswapJvmArgs = [
+    // DCEVM advanced hot reload
+    "-XX:+AllowEnhancedClassRedefinition",
+    "-XX:HotswapAgent=fatjar"
+]
+
+ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") {
+    group = "GTNH Buildscript"
+    description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory"
+    def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar'
+    def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")}
+    def targetFilename = "hotswap-agent.jar"
+    onlyIf {
+        !targetFolderProvider.get().file(targetFilename).asFile.exists()
+    }
+    doLast {
+        def targetFolder = targetFolderProvider.get()
+        targetFolder.asFile.mkdirs()
+        download.run {
+            src hsaUrl
+            dest targetFolder.file(targetFilename).asFile
+            overwrite false
+            tempAndMove true
+        }
+    }
+}
+
+public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
+    // IntelliJ doesn't seem to allow commandline arguments so we also support an env variable
+    private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP"));
+
+    @Input
+    public boolean getEnableHotswap() { return enableHotswap }
+    @Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger")
+    public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
+
+    @Inject
+    public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
+        super(side, gradle)
+
+        this.lwjglVersion = 3
+        this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain)
+        this.extraJvmArgs.addAll(project.java17JvmArgs)
+        this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
+
+        this.classpath(project.java17PatchDependenciesCfg)
+        if (side == Side.CLIENT) {
+            this.classpath(project.minecraftTasks.lwjgl3Configuration)
+        }
+        // Use a raw provider instead of map to not create a dependency on the task
+        this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath))
+        this.classpath.filter { file ->
+            !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2
+        }
+        this.classpath(project.java17DependenciesCfg)
+
+        if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) {
+            this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
+        }
+    }
+}
+
+def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
+runClient17Task.configure {
+    setup(project)
+    group = "Modded Minecraft"
+    description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge"
+    dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
+    mainClass = "GradleStart"
+    username = minecraft.username
+    userUUID = minecraft.userUUID
+}
+
+def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
+runServer17Task.configure {
+    setup(project)
+    group = "Modded Minecraft"
+    description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge"
+    dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
+    mainClass = "GradleStartServer"
+    extraArgs.add("nogui")
+}
+
 def getManifestAttributes() {
     def manifestAttributes = [:]
     if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
@@ -670,7 +855,7 @@ if (usesShadowedDependencies.toBoolean()) {
     tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
         target = tasks.shadowJar
         prefix = modGroup + ".shadow"
-        enabled = minimizeShadowedDependencies.toBoolean()
+        enabled = relocateShadowedDependencies.toBoolean()
     }
     tasks.named("shadowJar", ShadowJar).configure {
         manifest {
@@ -686,7 +871,7 @@ if (usesShadowedDependencies.toBoolean()) {
             project.configurations.shadeCompile
         ]
         archiveClassifier.set('dev')
-        if (minimizeShadowedDependencies.toBoolean()) {
+        if (relocateShadowedDependencies.toBoolean()) {
             dependsOn(relocateShadowJar)
         }
     }
@@ -705,7 +890,7 @@ if (usesShadowedDependencies.toBoolean()) {
     javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
         skip()
     }
-    for (runTask in ["runClient", "runServer"]) {
+    for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
         tasks.named(runTask).configure {
             dependsOn("shadowJar")
         }
@@ -743,9 +928,23 @@ idea {
     module {
         downloadJavadoc = true
         downloadSources = true
+        inheritOutputDirs = true
     }
     project {
         settings {
+            if (ideaOverrideBuildType != "") {
+                delegateActions {
+                    if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) {
+                        delegateBuildRunToGradle = true
+                        testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE
+                    } else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) {
+                        delegateBuildRunToGradle = false
+                        testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
+                    } else {
+                        throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.')
+                    }
+                }
+            }
             runConfigurations {
                 "1. Run Client"(Gradle) {
                     taskNames = ["runClient"]
@@ -753,6 +952,20 @@ idea {
                 "2. Run Server"(Gradle) {
                     taskNames = ["runServer"]
                 }
+                "1a. Run Client (Java 17)"(Gradle) {
+                    taskNames = ["runClient17"]
+                }
+                "2a. Run Server (Java 17)"(Gradle) {
+                    taskNames = ["runServer17"]
+                }
+                "1b. Run Client (Java 17, Hotswap)"(Gradle) {
+                    taskNames = ["runClient17"]
+                    envs = ["HOTSWAP": "true"]
+                }
+                "2b. Run Server (Java 17, Hotswap)"(Gradle) {
+                    taskNames = ["runServer17"]
+                    envs = ["HOTSWAP": "true"]
+                }
                 "3. Run Obfuscated Client"(Gradle) {
                     taskNames = ["runObfClient"]
                 }
@@ -770,7 +983,7 @@ idea {
                 }
                 "Run Client (IJ Native)"(Application) {
                     mainClass = "GradleStart"
-                    moduleName = project.name + ".main"
+                    moduleName = project.name + ".ideVirtualMain"
                     afterEvaluate {
                         workingDirectory = tasks.runClient.workingDir.absolutePath
                         programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -781,7 +994,7 @@ idea {
                 }
                 "Run Server (IJ Native)"(Application) {
                     mainClass = "GradleStartServer"
-                    moduleName = project.name + ".main"
+                    moduleName = project.name + ".ideVirtualMain"
                     afterEvaluate {
                         workingDirectory = tasks.runServer.workingDir.absolutePath
                         programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -798,6 +1011,51 @@ idea {
                     ]
                 }
             }
+            withIDEADir { File ideaDir ->
+                if (!ideaDir.path.contains(".idea")) {
+                    // If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory
+                    ideaDir = new File(ideaDir, ".idea")
+                }
+                if (ideaDir.isDirectory()) {
+                    def miscFile = new File(ideaDir, "misc.xml")
+                    if (miscFile.isFile()) {
+                        boolean dirty = false
+                        def miscTransformer = new XmlTransformer()
+                        miscTransformer.addAction { root ->
+                            Node rootNode = root.asNode()
+                            def rootManager = rootNode
+                                .component.find { it.@name == 'ProjectRootManager' }
+                            if (!rootManager) {
+                                rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2'])
+                                dirty = true
+                            }
+                            def output = rootManager.output
+                            if (!output) {
+                                output = rootManager.appendNode('output')
+                                dirty = true
+                            }
+                            if (!output.@url) {
+                                // Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow.
+                                // This is a sensible default for most setups
+                                output.@url = 'file://$PROJECT_DIR$/build/ideaBuild'
+                                dirty = true
+                            }
+                        }
+                        def result = miscTransformer.transform(miscFile.text)
+                        if (dirty) {
+                            miscFile.write(result)
+                        }
+                    } else {
+                        miscFile.text = """<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2">
+    <output url="file://\$PROJECT_DIR\$/out" />
+  </component>
+</project>
+"""
+                    }
+                }
+            }
         }
     }
 }
@@ -945,10 +1203,21 @@ def addCurseForgeRelation(String type, String name) {
 }
 
 // Updating
+
+def buildscriptGradleVersion = "8.0.1"
+
+tasks.named('wrapper', Wrapper).configure {
+    gradleVersion = buildscriptGradleVersion
+}
+
 tasks.register('updateBuildScript') {
     group = 'GTNH Buildscript'
     description = 'Updates the build script to the latest version'
 
+    if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) {
+        dependsOn('wrapper')
+    }
+
     doLast {
         if (performBuildScriptUpdate()) return
 
@@ -961,6 +1230,9 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
         performBuildScriptUpdate()
     } else {
         out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
+        if (gradle.gradleVersion != buildscriptGradleVersion) {
+            out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n")
+        }
     }
 }
 

dependencies.gradle

@@ -1,20 +1,20 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:EnderCore:0.2.9:dev')
-    compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-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
+    api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.5.8:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.35-GTNH:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
+    api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    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:waila:1.5.23:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-168-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}
+    implementation('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.13-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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

repositories.gradle

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

src/main/java/crazypants/enderio/EnderIO.java

@@ -206,6 +206,8 @@ public class EnderIO {
 
     public static final Lang lang = new Lang("enderio");
 
+    public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
+
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
     public static ItemAlloy itemAlloy;

src/main/java/crazypants/enderio/conduit/AbstractConduit.java

@@ -84,6 +84,18 @@ public abstract class AbstractConduit implements IConduit {
 
     protected boolean connectionsDirty = true;
 
+    /**
+     * This shows if the currently running connection update should not finish with settings connectionsDirty to false.
+     * If this is true, it will trigger a reconnection on the next Tick.
+     * <p>
+     * Use the method needUpdateConnections() instead of setting this to true.
+     * 
+     * @see needUpdateConnections()
+     */
+    private boolean needUpdateConnections = false;
+
+    private boolean isUpdatingConnections = false;
+
     protected AbstractConduit() {}
 
     @Override
@@ -434,10 +446,13 @@ public abstract class AbstractConduit implements IConduit {
     }
 
     private void updateConnections() {
-        if (!connectionsDirty) {
+        if (!connectionsDirty && !needUpdateConnections) {
             return;
         }
 
+        isUpdatingConnections = true;
+        needUpdateConnections = false;
+
         boolean externalConnectionsChanged = false;
         List<ForgeDirection> copy = new ArrayList<ForgeDirection>(externalConnections);
         // remove any no longer valid connections
@@ -462,6 +477,21 @@ public abstract class AbstractConduit implements IConduit {
         }
 
         connectionsDirty = false;
+        isUpdatingConnections = false;
+    }
+
+    /**
+     * This method prevents connection update from getting completed successfully by not settings connectionsDirty to
+     * false. This will trigger an connection update at the next Tick.
+     * <p>
+     * Only use this while executing updateConnections().
+     * <p>
+     * See this PR for more info: https://github.com/GTNewHorizons/EnderIO/pull/111
+     */
+    protected void needUpdateConnections() {
+        if (isUpdatingConnections) {
+            needUpdateConnections = true;
+        }
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/ConduitRecipes.java

@@ -682,6 +682,11 @@ public class ConduitRecipes {
         addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber);
 
         res.stackSize = 1;
-        addShaped(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
+        ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1);
+        ItemStack resUltra = new ItemStack(EnderIO.itemMEConduit, 1, 2);
+        addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
+        if (Config.enableMEUltraDenseConduits) {
+            addShaped(resUltra, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', resDense);
+        }
     }
 }

src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java

@@ -213,9 +213,11 @@ public class ItemSettings extends BaseSettingsPanel {
         } else if (guiButton.id == ID_EXTRACT_CHANNEL) {
             DyeColor col = DyeColor.fromIndex(extractChannelB.getColorIndex());
             itemConduit.setInputColor(gui.getDir(), col);
+        } else {
+            if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton);
+            if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton);
+            return;
         }
-        if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton);
-        if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton);
         PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
     }
 

src/main/java/crazypants/enderio/conduit/me/IMEConduit.java

@@ -14,5 +14,7 @@ public interface IMEConduit extends IConduit {
 
     boolean isDense();
 
+    boolean isDenseUltra();
+
     int getChannelsInUse();
 }

src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java

@@ -15,7 +15,8 @@ public class ItemMEConduit extends AbstractItemConduit {
 
     private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
             new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"),
-            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") };
+            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense"),
+            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "DenseUltra", "enderio:itemMeConduitDenseUltra") };
 
     public static ItemMEConduit create() {
         ItemMEConduit result = new ItemMEConduit();

src/main/java/crazypants/enderio/conduit/me/MEConduit.java

@@ -13,6 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import appeng.api.AEApi;
+import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridConnection;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
@@ -44,6 +45,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public static IIcon[] longTextures;
 
     private boolean isDense;
+    private boolean isDenseUltra;
     private int playerID = -1;
 
     public MEConduit() {
@@ -51,6 +53,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     }
 
     public MEConduit(int itemDamage) {
+        isDenseUltra = itemDamage == 2;
         isDense = itemDamage == 1;
     }
 
@@ -59,14 +62,16 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
             @Override
             public void registerIcons(IIconRegister register) {
-                coreTextures = new IIcon[2];
-                longTextures = new IIcon[2];
+                coreTextures = new IIcon[3];
+                longTextures = new IIcon[3];
 
                 coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore");
                 coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense");
+                coreTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDenseUltra");
 
                 longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit");
                 longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense");
+                longTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDenseUltra");
             }
 
             @Override
@@ -76,8 +81,14 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         });
     }
 
-    public static int getDamageForState(boolean isDense) {
-        return isDense ? 1 : 0;
+    public static int getDamageForState(boolean isDense, boolean isDenseUltra) {
+        if (isDenseUltra) {
+            return 2;
+        }
+        if (isDense) {
+            return 1;
+        }
+        return 0;
     }
 
     @Override
@@ -87,7 +98,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Override
     public ItemStack createItem() {
-        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense));
+        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense, isDenseUltra));
     }
 
     @Override
@@ -105,6 +116,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public void writeToNBT(NBTTagCompound nbtRoot) {
         super.writeToNBT(nbtRoot);
         nbtRoot.setBoolean("isDense", isDense);
+        nbtRoot.setBoolean("isDenseUltra", isDenseUltra);
         nbtRoot.setInteger("playerID", playerID);
     }
 
@@ -117,6 +129,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         } else {
             playerID = -1;
         }
+        if (nbtRoot.hasKey("isDenseUltra")) {
+            isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
+        }
     }
 
     public void setPlayerID(int playerID) {
@@ -148,26 +163,44 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
         // because the AE2 API doesn't allow an easy query like "which side can connect to an ME cable" it needs this
         // mess
+        IGridNode node = null;
         if (te instanceof IPartHost) {
             IPart part = ((IPartHost) te).getPart(dir.getOpposite());
             if (part == null) {
                 part = ((IPartHost) te).getPart(ForgeDirection.UNKNOWN);
-                return part != null;
             }
-            if (part.getExternalFacingNode() != null) {
-                return true;
+            if (part != null) {
+                node = part.getExternalFacingNode();
+                if (node == null) {
+                    node = part.getGridNode();
+                }
+                if (node == null) {
+                    // The GridNode has not been initialized yet, let's try on the next Tick.
+                    needUpdateConnections();
+                }
             }
-            String name = part.getClass().getSimpleName();
-            return "PartP2PTunnelME".equals(name) || "PartQuartzFiber".endsWith(name)
-                    || "PartToggleBus".equals(name)
-                    || "PartInvertedToggleBus".equals(name);
         } else if (te instanceof IGridHost) {
-            IGridNode node = ((IGridHost) te).getGridNode(dir.getOpposite());
+            node = ((IGridHost) te).getGridNode(dir.getOpposite());
             if (node == null) {
                 node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN);
             }
-            if (node != null) {
-                return node.getGridBlock().getConnectableSides().contains(dir.getOpposite());
+        }
+        if (node != null) {
+            return canConnectToGridNode(node, dir);
+        }
+        return false;
+    }
+
+    @Method(modid = "appliedenergistics2")
+    private Boolean canConnectToGridNode(IGridNode node, ForgeDirection dir) {
+        if (node.getGridBlock().getConnectableSides().contains(dir.getOpposite())) {
+            if (isDenseUltra()) {
+                return node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY)
+                        || ((node.hasFlag(GridFlags.DENSE_CAPACITY)) && !node.hasFlag(GridFlags.CANNOT_CARRY));
+            } else if (isDense()) {
+                return true;
+            } else {
+                return !node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY);
             }
         }
         return false;
@@ -175,7 +208,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Override
     public IIcon getTextureForState(CollidableComponent component) {
-        int state = getDamageForState(isDense);
+        int state = getDamageForState(isDense, isDenseUltra);
         if (component.dir == ForgeDirection.UNKNOWN) {
             return coreTextures[state];
         } else {
@@ -343,4 +376,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public boolean isDense() {
         return isDense;
     }
+
+    @Override
+    public boolean isDenseUltra() {
+        return isDenseUltra;
+    }
 }

src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java

@@ -43,7 +43,13 @@ public class MEConduitGrid implements IGridBlock {
 
     @Override
     public EnumSet<GridFlags> getFlags() {
-        return conduit.isDense() ? EnumSet.of(GridFlags.DENSE_CAPACITY) : EnumSet.noneOf(GridFlags.class);
+        if (conduit.isDenseUltra()) {
+            return EnumSet.of(GridFlags.ULTRA_DENSE_CAPACITY);
+        }
+        if (conduit.isDense()) {
+            return EnumSet.of(GridFlags.DENSE_CAPACITY);
+        }
+        return EnumSet.noneOf(GridFlags.class);
     }
 
     @Override

src/main/java/crazypants/enderio/config/Config.java

@@ -288,6 +288,10 @@ public final class Config {
     public static int maxPhotovoltaicAdvancedOutputRF = 40;
     public static int maxPhotovoltaicVibrantOutputRF = 160;
 
+    public static int photovoltaicCellCapacityRF = 10000;
+    public static int photovoltaicAdvancedCellCapacityRF = 10000;
+    public static int photovoltaicVibrantCellCapacityRF = 10000;
+
     public static int zombieGeneratorRfPerTick = 80;
     public static int zombieGeneratorTicksPerBucketFuel = 12000;
 
@@ -434,6 +438,7 @@ public final class Config {
 
     public static boolean isGasConduitEnabled = true;
     public static boolean enableMEConduits = true;
+    public static boolean enableMEUltraDenseConduits = false;
     public static boolean enableOCConduits = true;
     public static boolean enableOCConduitsAnimatedTexture = true;
 
@@ -808,6 +813,26 @@ public final class Config {
                         "Maximum output in RF/t of the Vibrant Photovoltaic Panels.")
                 .getInt(maxPhotovoltaicVibrantOutputRF);
 
+        photovoltaicCellCapacityRF = config.get(
+                sectionPower.name,
+                "photovoltaicCellCapacityRF",
+                photovoltaicCellCapacityRF,
+                "Maximum capacity in RF/t of the Photovoltaic Panels.").getInt(photovoltaicCellCapacityRF);
+        photovoltaicAdvancedCellCapacityRF = config
+                .get(
+                        sectionPower.name,
+                        "photovoltaicAdvancedCellCapacityRF",
+                        photovoltaicAdvancedCellCapacityRF,
+                        "Maximum capacity in RF/t of the Advanced Photovoltaic Panels.")
+                .getInt(photovoltaicAdvancedCellCapacityRF);
+        photovoltaicVibrantCellCapacityRF = config
+                .get(
+                        sectionPower.name,
+                        "photovoltaicVibrantCellCapacityRF",
+                        photovoltaicVibrantCellCapacityRF,
+                        "Maximum capacity in RF/t of the Vibrant Photovoltaic Panels.")
+                .getInt(photovoltaicVibrantCellCapacityRF);
+
         useAlternateBinderRecipe = config
                 .get(
                         sectionRecipe.name,
@@ -2274,6 +2299,11 @@ public final class Config {
                 sectionItems.name,
                 enableMEConduits,
                 "Allows ME conduits. Only has an effect with AE2 installed.");
+        enableMEUltraDenseConduits = config.getBoolean(
+                "enableMEUltraDenseConduits",
+                sectionItems.name,
+                enableMEUltraDenseConduits,
+                "Allows ME Ultra Dense conduits. Only has an effect with AE2 installed.");
         enableOCConduits = config.getBoolean(
                 "enableOCConduits",
                 sectionItems.name,

src/main/java/crazypants/enderio/config/PacketConfigSync.java

@@ -22,6 +22,9 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
         buf.writeInt(Config.travelStaffMaxDistance);
         buf.writeInt(Config.travelStaffMaxBlinkDistance);
         buf.writeFloat(Config.travelStaffPowerPerBlockRF);
+        buf.writeInt(Config.teleportStaffMaxDistance);
+        buf.writeInt(Config.teleportStaffMaxBlinkDistance);
+        buf.writeInt(Config.teleportStaffFailedBlinkDistance);
         buf.writeBoolean(Config.telepadLockCoords);
         buf.writeBoolean(Config.telepadLockDimension);
     }
@@ -38,6 +41,9 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
         Config.travelStaffMaxDistance = data.readInt();
         Config.travelStaffMaxBlinkDistance = data.readInt();
         Config.travelStaffPowerPerBlockRF = data.readFloat();
+        Config.teleportStaffMaxDistance = data.readInt();
+        Config.teleportStaffMaxBlinkDistance = data.readInt();
+        Config.teleportStaffFailedBlinkDistance = data.readInt();
         Config.telepadLockCoords = data.readBoolean();
         Config.telepadLockDimension = data.readBoolean();
     }

src/main/java/crazypants/enderio/enderface/GuiEnderface.java

@@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -180,7 +181,11 @@ public class GuiEnderface extends GuiScreen {
             }
         }
 
-        distance -= Mouse.getDWheel() * 0.01;
+        int wheelD = Mouse.getEventDWheel();
+        if (!EnderIO.hasLwjgl3) {
+            wheelD = MathHelper.clamp_int(wheelD, -1, 1);
+        }
+        distance -= wheelD;
         distance = VecmathUtil.clamp(distance, 0.1, 20);
 
         long elapsed = EnderIO.proxy.getTickCount() - initTime;

src/main/java/crazypants/enderio/gui/IoConfigRenderer.java

@@ -17,6 +17,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -156,7 +157,11 @@ public class IoConfigRenderer {
             }
         }
 
-        distance -= Mouse.getEventDWheel() * 0.01;
+        int wheelD = Mouse.getEventDWheel();
+        if (!EnderIO.hasLwjgl3) {
+            wheelD = MathHelper.clamp_int(wheelD, -1, 1);
+        }
+        distance -= wheelD;
         distance = VecmathUtil.clamp(distance, 0.01, 200);
 
         long elapsed = System.currentTimeMillis() - initTime;

src/main/java/crazypants/enderio/item/ItemMagnet.java

@@ -131,6 +131,10 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
 
     @Override
     public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+        if (maxReceive < 0) {
+            return 0;
+        }
+
         int res = super.receiveEnergy(container, maxReceive, simulate);
         if (res != 0 && !simulate) {
             updateDamage(container);
@@ -148,6 +152,10 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
     }
 
     public int extractEnergyInternal(ItemStack container, int maxExtract, boolean simulate) {
+        if (maxExtract < 0) {
+            return 0;
+        }
+
         int res = super.extractEnergy(container, maxExtract, simulate);
         if (res != 0 && !simulate) {
             updateDamage(container);

src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java

@@ -54,7 +54,7 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
     private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(
             0,
             POWER_PER_TICK_FIVE * 2,
-            Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(),
+            Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored(),
             POWER_PER_TICK_FIVE);
 
     public static final int POWER_PER_TICK_SIX = Config.sliceAndSpliceLevelSixPowerPerTickRF;
@@ -135,13 +135,13 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
                 setCapacitor(CAP_SEVEN);
                 break;
             case SILVER_CAPACITOR:
-                setCapacitor(CAP_ONE);
+                setCapacitor(CAP_EIGHT);
                 break;
             case ENDERGETIC_CAPACITOR:
-                setCapacitor(CAP_TWO);
+                setCapacitor(CAP_NINE);
                 break;
             case ENDERGISED_CAPACITOR:
-                setCapacitor(CAP_THREE);
+                setCapacitor(CAP_TEN);
                 break;
             default:
                 break;

src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java

@@ -10,6 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cofh.api.energy.EnergyStorage;
 
 import com.google.common.collect.Lists;
+import crazypants.enderio.config.Config;
 
 public class SolarPanelNetwork {
 
@@ -17,6 +18,7 @@ public class SolarPanelNetwork {
     private boolean empty = true;
 
     private EnergyStorage energy;
+    private boolean hasAppliedMaxEnergyConfig = false;
 
     public static final int ENERGY_PER = 10000;
 
@@ -25,12 +27,13 @@ public class SolarPanelNetwork {
 
     public SolarPanelNetwork() {
         panels = Lists.newArrayList();
-        energy = new EnergyStorage(ENERGY_PER);
+        energy = new EnergyStorage(getCapacity());
     }
 
     SolarPanelNetwork(TileEntitySolarPanel initial) {
         this();
         panels.add(initial);
+        energy.setCapacity(getCapacity(initial, 1));
         empty = false;
     }
 
@@ -83,8 +86,49 @@ public class SolarPanelNetwork {
         destroyNetwork();
     }
 
+    private int getCapacity() {
+        int capacity = ENERGY_PER;
+
+        if (panels.size() > 0) {
+            TileEntitySolarPanel masterPanel = getMaster();
+            capacity = getCapacity(masterPanel, panels.size());
+        }
+
+        return capacity;
+    }
+
+    private int getCapacity(TileEntitySolarPanel panel, int panelsCount) {
+        int capacity = ENERGY_PER;
+
+        if (panel != null && panel.hasWorldObj()) {
+            int meta = panel.getBlockMetadata();
+            switch (meta) {
+                case 0: // Default
+                    capacity = Config.photovoltaicCellCapacityRF;
+                    break;
+                case 1: // Advanced
+                    capacity = Config.photovoltaicAdvancedCellCapacityRF;
+                    break;
+                case 2: // Vibrant
+                    capacity = Config.photovoltaicVibrantCellCapacityRF;
+                    break;
+            }
+            hasAppliedMaxEnergyConfig = true;
+        }
+
+        capacity = capacity * panelsCount;
+
+        return capacity;
+    }
+
+    private void updateEnergyIfNeeded() {
+        if (!hasAppliedMaxEnergyConfig) {
+            updateEnergy();
+        }
+    }
+
     private void updateEnergy() {
-        energy.setCapacity(ENERGY_PER * panels.size());
+        energy.setCapacity(getCapacity());
         energy.setMaxExtract(energy.getMaxEnergyStored());
     }
 
@@ -119,6 +163,7 @@ public class SolarPanelNetwork {
     }
 
     public int setEnergyStored(int energy) {
+        updateEnergyIfNeeded();
         if (isValid()) {
             this.energy.setEnergyStored(energy);
         }

src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java

@@ -67,6 +67,12 @@ public class ItemTeleportStaff extends ItemTravelStaff {
         return equipped;
     }
 
+    @Override
+    public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+        // Don't allow receiving energy, since we have infinite energy.
+        return 0;
+    }
+
     @Override
     public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
         // Don't allow extracting energy.

src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java

@@ -103,6 +103,10 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave
 
     @Override
     public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+        if (maxReceive < 0) {
+            return 0;
+        }
+
         int res = super.receiveEnergy(container, maxReceive, simulate);
         if (res != 0 && !simulate) {
             updateDamage(container);
@@ -112,6 +116,10 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave
 
     @Override
     public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+        if (maxExtract < 0) {
+            return 0;
+        }
+
         int res = super.extractEnergy(container, maxExtract, simulate);
         if (res != 0 && !simulate) {
             updateDamage(container);

src/main/java/crazypants/enderio/teleport/TravelController.java

@@ -554,8 +554,8 @@ public class TravelController {
             return null;
         }
         ItemStack equipped = ep.getCurrentEquippedItem();
-        if (equipped.getItem() instanceof ItemTravelStaff) {
-            if (((ItemTravelStaff) equipped.getItem()).isActive(ep, equipped)) {
+        if (equipped.getItem() instanceof ItemTeleportStaff) {
+            if (((ItemTeleportStaff) equipped.getItem()).isActive(ep, equipped)) {
                 return TravelSource.TELEPORT_STAFF;
             }
         } else if (equipped.getItem() instanceof IItemOfTravel) {

src/main/java/crazypants/enderio/waila/WailaCompat.java

@@ -301,7 +301,7 @@ public class WailaCompat implements IWailaDataProvider {
             return;
         }
 
-        if (itemStack.getItem() == EnderIO.itemPowerConduit) {
+        if (itemStack.getItem() == EnderIO.itemPowerConduit || itemStack.getItem() == EnderIO.itemPowerConduitEndergy) {
             NBTTagCompound nbtRoot = _accessor.getNBTData();
             if (nbtRoot.hasKey("storedEnergyRF")) {
                 int stored = nbtRoot.getInteger("storedEnergyRF");
@@ -353,13 +353,14 @@ public class WailaCompat implements IWailaDataProvider {
         } else if (itemStack.getItem() == EnderIO.itemMEConduit) {
             NBTTagCompound nbtRoot = _accessor.getNBTData();
             if (nbtRoot.hasKey("isDense")) {
+                boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
                 boolean isDense = nbtRoot.getBoolean("isDense");
                 int channelsInUse = nbtRoot.getInteger("channelsInUse");
                 currenttip.add(
                         MessageFormat.format(
                                 EnderIO.lang.localize("itemMEConduit.channelsUsed"),
                                 channelsInUse,
-                                isDense ? 32 : 8));
+                                isDenseUltra ? 128 : (isDense ? 32 : 8)));
             }
         }
     }
@@ -395,6 +396,7 @@ public class WailaCompat implements IWailaDataProvider {
             if (mec != null) {
                 tag.setInteger("channelsInUse", mec.getChannelsInUse());
                 tag.setBoolean("isDense", mec.isDense());
+                tag.setBoolean("isDenseUltra", mec.isDenseUltra());
             }
         } else if (te instanceof IInternalPoweredTile) {
             IInternalPoweredTile ipte = (IInternalPoweredTile) te;

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

@@ -33,6 +33,19 @@ enderio.itemPowerConduit.name=Energieleitung
 enderio.itemPowerConduitEnhanced.name=Verbesserte Energieleitung
 enderio.itemPowerConduitEnder.name=Ender-Energieleitung
 
+enderio.itemPowerConduitEndergyCrude.name=Lehm-Energieleitung
+enderio.itemPowerConduitEndergyIron.name=Eisen-Energieleitung
+enderio.itemPowerConduitEndergyAluminum.name=Aluminium-Energieleitung
+enderio.itemPowerConduitEndergyGold.name=Gold-Energieleitung
+enderio.itemPowerConduitEndergyCopper.name=Kupfer-Energieleitung
+enderio.itemPowerConduitEndergySilver.name=Silber-Energieleitung
+enderio.itemPowerConduitEndergyElectrum.name=Elektrum-Energieleitung
+enderio.itemPowerConduitEndergyEnergeticSilver.name=Elektrisches Silber-Energieleitung
+enderio.itemPowerConduitEndergyCrystalline.name=Kristallin-Energieleitung
+enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Kristalliner Rosa Schleim Energieleitung
+enderio.itemPowerConduitEndergyMelodic.name=Melodische Energieleitung
+enderio.itemPowerConduitEndergyStellar.name=Hervorragende Energieleitung
+
 enderio.itemRedstoneConduit.name=Redstone-Leitung
 enderio.itemRedstoneConduitSwitch.name=Leitungsschalter
 enderio.itemRedstoneConduitInsulated.name=Isolierte Redstone-Leitung
@@ -40,12 +53,10 @@ enderio.itemRedstoneConduitInsulated.name=Isolierte Redstone-Leitung
 enderio.itemLiquidConduit.name=Flüssigkeitsleitung
 enderio.itemLiquidConduitAdvanced.name=Flüssigkeitsdruckleitung
 enderio.itemLiquidConduitEnder.name=Ender-Flüssigkeitsleitung
-# 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=Kristallin-Flüssigkeitsdruckleitung
+enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Kristalliner Rosa Schleim Flüssigkeitsdruckleitung
+enderio.itemLiquidConduitMelodicEnder.name=Melodische Flüssigkeitsdruckleitung
+enderio.itemLiquidConduitStellarEnder.name=Hervorragende Flüssigkeitsdruckleitung
 enderio.itemLiquidConduit.lockedType=Flüssigkeitstyp gebunden an
 enderio.itemLiquidConduit.unlockedType=Flüssigkeitstyp nicht mehr gebunden
 enderio.itemLiquidConduit.lockedWaila=Festgelegt auf
@@ -119,6 +130,7 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transportiert Mekanism-kompatible
 
 enderio.itemMEConduit.name=ME-Leitung
 enderio.itemMEConduitDense.name=Dichte ME-Leitung
+enderio.itemMEConduitDenseUltra.name=Extrem Dichte ME-Leitungen
 enderio.itemMEConduit.channelsUsed={0,number} von {1,number} Kanälen
 
 enderio.itemOCConduit.name=Netzwerkleitung (OC)
@@ -218,6 +230,42 @@ enderio.phasedIron.name=Pulsierendes Eisen
 enderio.vibrantNugget.name=Dynamischer Nugget
 enderio.darkSteel.name=Dunkelstahl
 enderio.soularium.name=Soularium
+enderio.endSteel.name=End-Stahl
+enderio.endSteelNugget.name=End-Stahl-Nugget
+
+enderio.crudeSteel.name=Lehmzusammensetzung
+enderio.crystallineAlloy.name=Kristallin-Legierung
+enderio.melodicAlloy.name=Melodische Legierung
+enderio.stellarAlloy.name=Hervorragende Legierung
+enderio.crystallinePinkSlime.name=Kristalliner Rosa Schleim
+enderio.energeticSilver.name=Energetisches Silber
+enderio.vividAlloy.name=Lebendige Legierung
+
+enderio.crudeSteelGrindingBall.name=Mahlwerkkugel aus Lehmzusammensetzung
+enderio.crystallineAlloyGrindingBall.name=Mahlwerkkugel aus Kristallin-Legierung
+enderio.melodicAlloyGrindingBall.name=Mahlwerkkugel aus Melodischer Legierung
+enderio.stellarAlloyGrindingBall.name=Mahlwerkkugel aus Hervorragender Legierung
+enderio.crystallinePinkSlimeGrindingBall.name=Mahlwerkkugel aus Kristallinem Rosa Schleim
+enderio.energeticSilverGrindingBall.name=Mahlwerkkugel aus Energetischem Silber
+enderio.vividAlloyGrindingBall.name=Mahlwerkkugel aus Lebendiger Legierung
+
+enderio.precientCrystal.name=Vorausschauender Kristall
+enderio.pulsatingPowder.name=Körner der Piezalität
+enderio.vibrantPowder.name=Körner der Lebendigkeit
+enderio.enderCrystalPowder.name=Körner des Ends
+enderio.precientPowder.name=Körner der Voraussicht
+
+#Balls
+enderio.electricalSteel_ball.name=Ball aus Elektrischem Stahl
+enderio.energeticAlloy_ball.name=Ball aus Energetisierter Ligierung
+enderio.phasedGold_ball.name=Ball aus Dynamischer Legierung
+enderio.redstoneAlloy_ball.name=Ball aus Redstone-Legierung
+enderio.conductiveIron_ball.name=Ball aus Leitendem Eisen
+enderio.phasedIron_ball.name=Ball aus Pulsierendem Eisen
+enderio.vibrantNugget_ball.name=Ball aus Dynamischen Nuggets
+enderio.darkSteel_ball.name=Ball aus Dunkelstahl
+enderio.soularium_ball.name=Ball aus Soularium
+enderio.endSteel_ball.name=Ball aus End-Stahl
 
 tile.blockIngotStorage.name=Barrenspeicher
 tile.enderio.electricalSteel.name=Block aus Elektrischem Stahl
@@ -245,6 +293,13 @@ enderio.itemBasicCapacitor.name=Kondensator
 enderio.basicCapacitor.name=Basiskondensator
 enderio.activatedCapacitor.name=Doppelschichtkondensator
 enderio.enderCapacitor.name=Oktadischer Kondensator
+enderio.crystallineCapacitor.name=Kristallin-Kondensator
+enderio.melodicCapacitor.name=Melodischer Kondensator
+enderio.stellarCapacitor.name=Hervorragende Kondensator
+enderio.silverCapacitor.name=Silber-Kondensator
+enderio.endergeticCapacitor.name=Energetischer Kondensator
+enderio.endergisedCapacitor.name=Energetisierter Kondensator
+enderio.totemicCapacitor.name=Totemischer Kondensator
 
 enderio.machine.tooltip.upgrade=Maschinen-Upgrade
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Erhöht Energiespeicher sowie
@@ -403,6 +458,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=um Energie zu erzeugen
 enderio.zombieGenerator.fuelTank=Nahrhafter Tank
 enderio.gui.fluid.minReq=%s benötigt für die Aktivierung
 
+tile.blockFrankenzombieGenerator.name=Frank'N'Zombie-Generator
+tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Konsumiert Nahrhaftes Destillat,
+tile.blockFrankenzombieGenerator.tooltip.detailed.line2=um Energie zu erzeugen
+enderio.frankenzombieGenerator.fuelTank=Nahrhafter Tank
+
+tile.blockEnderGenerator.name=Ender-Generator
+tile.blockEnderGenerator.tooltip.detailed.line1=Konsumiert Tau des Voids,
+tile.blockEnderGenerator.tooltip.detailed.line2=um Energie zu erzeugen
+enderio.enderGenerator.fuelTank=Leere-Tank
+
 tile.blockKillerJoe.name=Killer Joe
 tile.blockKillerJoe.tooltip.detailed.line1=Attackiert nahe Mobs und Spieler,
 tile.blockKillerJoe.tooltip.detailed.line2=wenn mit einem Schwert und
@@ -613,6 +678,12 @@ item.itemTravelStaff.tooltip.detailed.line4=<shift><r-click> wird den Spieler ei
 item.itemTravelStaff.tooltip.detailed.line5=kurze Distanz teleportieren
 enderio.itemTravelStaff.notEnoughPower=Nicht genügend Energie
 
+item.itemTeleportStaff.name=Stab der Teleportation
+item.itemTeleportStaff.tooltip.detailed.line1=Rechtsklick, um zu teleportieren, wohin auch immer du schaust
+item.itemTeleportStaff.tooltip.detailed.line2=Shift-Rechtsklick, um zu Reiseankern zu telportieren
+item.itemTeleportStaff.tooltip.detailed.line3=Rechtsklick auf einen benachbarten Block, um zu versuchen
+item.itemTeleportStaff.tooltip.detailed.line4=zur anderen Seite zu teleportieren
+
 item.itemCoordSelector.name=Koordinatenselektor
 item.itemCoordSelector.tooltip.detailed.line1=Speichert die Koordinaten eines Blocks.
 item.itemCoordSelector.tooltip.detailed.line2=Rechts-Klick auf Block um den
@@ -689,6 +760,8 @@ skullZombieController.name=Z-Logik-Controller
 skullZombieFrankenstien.name=Frank'N'Zombie
 skullEnderResonator.name=Enderresonator
 skullSentientEnder.name=Empfindsamer Ender
+skullSkeletalContractor.name=Skelettunternehmer 
+skullGuardianDiode.name=Wächterdiode
 
 item.itemSpawnEggEnderIO.name=Spawn
 
@@ -702,19 +775,55 @@ item.darkSteel_pickaxe.name=Dunkelspitzhacke
 item.darkSteel_axe.name=Dunkelaxt
 item.darkSteel_shears.name=Dunkelschere
 
+#End Steel
+item.endSteel_helmet.name=Endstahl-Helm
+item.endSteel_chestplate.name=Endstahl-Brustpanzer
+item.endSteel_leggings.name=Endstahl-Beinschutz
+item.endSteel_boots.name=Endstahl-Stiefel
+item.endSteel_sword.name=Endstahl-Schwert
+item.endSteel_pickaxe.name=Endstahl-Spitzhacke
+item.endSteel_axe.name=Endstahl-Axt
+
+#Stellar
+item.stellar_helmet.name=Hervorragender Helm
+item.stellar_chestplate.name=Hervorragender Brustpanzer
+item.stellar_leggings.name=Hervorragender Beinschutz
+item.stellar_boots.name=Hervorragende Stiefel
+item.stellar_sword.name=Hervorragendes Schwert
+item.stellar_pickaxe.name=Hervorragende Spitzhacke
+item.stellar_axe.name=Hervorragende Axt
+
 enderio.item.darkSteel.tooltip.lvs=Level
 
 enderio.item.darkSteel_pickaxe.tooltip.effPowered=Effizienz, wenn aktiviert
 enderio.item.darkSteel_pickaxe.tooltip.effObs=Effizienz baut Obsidian ab
 enderio.item.darkSteel_pickaxe.tooltip.cost=Kosten
 
+enderio.item.endSteel_pickaxe.tooltip.effPowered=Effizienz, wenn aktiviert
+enderio.item.endSteel_pickaxe.tooltip.effObs=Effizienz baut Obsidian ab
+enderio.item.endSteel_pickaxe.tooltip.cost=Kosten
+
+enderio.item.stellar_pickaxe.tooltip.effPowered=Effizienz, wenn aktiviert
+enderio.item.stellar_pickaxe.tooltip.effObs=Effizienz baut Obsidian ab
+enderio.item.stellar_pickaxe.tooltip.cost=Kosten
+
 enderio.item.darkSteel_axe.tooltip.multiHarvest=Schleiche, um mehr Holz auf einmal abzubauen
+enderio.item.endSteel_axe.tooltip.multiHarvest=Schleiche, um mehr Holz auf einmal abzubauen
+enderio.item.stellar_axe.tooltip.multiHarvest=Schleiche, um mehr Holz auf einmal abzubauen
 
 enderio.item.darkSteel_shears.tooltip.multiHarvest=Schert mehrere Blöcke/Schafe wenn verstärkt
 
 enderio.item.darkSteel_sword.tooltip.line1=Erhöht Schädel- und Enderperlen-Drops.
 enderio.item.darkSteel_sword.tooltip.line2=Endermen können sich nach einem Treffer nicht mehr teleportieren.
-enderio.item.darkSteel_sword.tooltip.line3=+1 Schaden, wenn aktiviert
+enderio.item.darkSteel_sword.tooltip.line3=+2 Schaden, wenn aktiviert
+
+enderio.item.endSteel_sword.tooltip.line1=Erhöht Schädel- und Enderperlen-Drops
+enderio.item.endSteel_sword.tooltip.line2=Endermen können sich nach einem Treffer nicht mehr teleportieren.
+enderio.item.endSteel_sword.tooltip.line3=+2 Schaden, wenn aktiviert
+
+enderio.item.stellar_sword.tooltip.line1=Erhöht Schädel- und Enderperlen-Drops
+enderio.item.stellar_sword.tooltip.line2=Endermen können sich nach einem Treffer nicht mehr teleportieren.
+enderio.item.stellar_sword.tooltip.line3=+2 Schaden, wenn aktiviert
 
 enderio.item.darkSteel_armor.tooltip.line1=Schutz auf Diamant-Level,
 enderio.item.darkSteel_armor.tooltip.line2=wenn mit Energie versorgt
@@ -722,26 +831,43 @@ enderio.item.darkSteel_armor.tooltip.line2=wenn mit Energie versorgt
 enderio.item.darkSteel_boots.tooltip.line1=Negiert Fallschaden,
 enderio.item.darkSteel_boots.tooltip.line2=wenn mit Energie versorgt
 
+enderio.item.stellar_armor.tooltip.line1=Schutz auf Diamant-Level+,
+enderio.item.stellar_armor.tooltip.line2=wenn mit Energie versorgt
+
+enderio.item.darkSteel_boots.tooltip.line1=Fallschaden negiert,
+enderio.item.darkSteel_boots.tooltip.line2=wenn mit Energie versorgt
+
+enderio.item.endSteel_boots.tooltip.line1=Fallschaden negiert,
+enderio.item.endSteel_boots.tooltip.line2=wenn mit Energie versorgt
+
+enderio.item.stellar_boots.tooltip.line1=Fallschaden negiert,
+enderio.item.stellar_boots.tooltip.line2=wenn mit Energie versorgt
+
 enderio.darksteel.upgrade.empowered_one.name=Verstärkt
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Energie: $P
-enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=Hälfte des Haltbarkeitsschadens
+enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=$D% des Haltbarkeitsschaden
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line3=von Energie absorbiert
 
 enderio.darksteel.upgrade.empowered_two.name=Verstärkt II
 enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line1=Energie: $P
-enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line2=Hälfte des Haltbarkeitsschadens
+enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line2=$D% des Haltbarkeitsschaden
 enderio.darksteel.upgrade.empowered_two.tooltip.detailed.line3=von Energie absorbiert
 
 enderio.darksteel.upgrade.empowered_three.name=Verstärkt III
 enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line1=Energie: $P
-enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line2=Hälfte des Haltbarkeitsschadens
+enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line2=$D% des Haltbarkeitsschaden
 enderio.darksteel.upgrade.empowered_three.tooltip.detailed.line3=von Energie absorbiert
 
 enderio.darksteel.upgrade.empowered_four.name=Verstärkt IV
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=Energie: $P
-enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=Hälfte des Haltbarkeitsschadens
+enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=$D% des Haltbarkeitsschaden
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=von Energie absorbiert
 
+enderio.darksteel.upgrade.empowered_five.name=Verstärkt V
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=Energie: $P
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=$D% des Haltbarkeitsschaden
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=von Energie absorbiert
+
 enderio.darksteel.upgrade.travel.name=Reise
 enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Halte Shift und Rechts-Klick zum Teleportieren,
 enderio.darksteel.upgrade.travel.tooltip.detailed.line2=oder aktiviere einen Reiseanker oder Ender-IO
@@ -825,6 +951,9 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Generiert Energie aus
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generiert Energie von der Sonne.
 
+enderio.darksteel.upgrade.solar_three.name=Solar III
+enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Generiert Energie von der Sonne.
+
 #------GUI
 
 enderio.gui.simple.in=Max. Ein:
@@ -985,6 +1114,9 @@ enderio.gui.travelAccessable.ok=Autorisieren
 enderio.gui.travelAccessable.skipLocked=Überspringe abgeschlossene Anker, benutzte gezielten Teleport.
 enderio.gui.travelAccessable.skipObstructed=Überspringe versperrte Anker.
 enderio.gui.travelAccessable.skipPrivate=Überspringe private Anker.
+enderio.gui.travelAccessable.tooltip.visible=Sicherbarkeit
+enderio.gui.travelAccessable.tooltip.visible.desc1=Wenn deaktiviert kannst du diesen Block von anderen Blöcken aus nicht sehen.
+enderio.gui.travelAccessable.tooltip.visible.desc2=Nützlich für Aufzüge.
 
 enderio.gui.telepad.configure.travel=Reiseeinstellungen
 enderio.gui.telepad.configure.telepad=Telepad-Einstellungen

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

@@ -131,6 +131,7 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gase
 
 enderio.itemMEConduit.name=ME Conduit
 enderio.itemMEConduitDense.name=Dense ME Conduit
+enderio.itemMEConduitDenseUltra.name=Ultra Dense ME Conduit
 enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels
 
 enderio.itemOCConduit.name=Network Conduit (OC)