Merge pull request #41 from GTNewHorizons/fix-tooltip

Fix tooltip mB -> L

.gitignore

@@ -38,3 +38,4 @@
 resources/assets/enderio/lang/*.lang.txt
 *.bat
 libs/
+options.txt

CHANGELOG-2.1.1.0.md

@@ -0,0 +1,24 @@
+
+# EnderIO
+
+Changelog of EnderIO.
+
+
+### [#28 Fix Burn Time tooltip](https://github.com/GTNewHorizons/EnderIO/pull/28)
+**Merge pull request #28 from GTNewHorizons/fix_burn_time_tooltip**
+* Fix Burn Time tooltip
+
+[a40e48f5d87b0be](https://github.com/GTNewHorizons/EnderIO/commit/a40e48f5d87b0be)
+by Martin Robertz *2021-01-24 21:37:43*
+### No issue
+**bump version**
+
+[a2da1c4832993a3](https://github.com/GTNewHorizons/EnderIO/commit/a2da1c4832993a3)
+by DreamMasterXXL *2021-01-29 18:56:32*
+
+**Revert "Update TooltipHandlerBurnTime.java"**
+* This reverts commit 3093ea6180beec8329087a1f91bda448683331d8.
+
+[0e7bf1c530797f8](https://github.com/GTNewHorizons/EnderIO/commit/0e7bf1c530797f8)
+by Jason Mitchell *2021-01-24 21:02:17*
+

README.md

@@ -1,8 +1,10 @@
-EnderIO [![Build Status](http://ci.tterrag.com/buildStatus/icon?job=EnderIO)](http://ci.tterrag.com/job/EnderIO/)
+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).
-Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**.
+Do what you want with it, as long as you smile while doing so.
 
 
 

build.gradle

@@ -1,16 +1,30 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url = "http://files.minecraftforge.net/maven" }
-        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url = "https://jitpack.io" }
+        maven { url = "https://gregtech.overminddl1.com/" }
     }
-    dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' }
+    dependencies { classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4' }
 }
+plugins {
+    id 'idea'
+    id 'java'
+}
+
 
 apply plugin: 'forge'
 apply plugin: 'maven-publish'
 apply plugin: 'curseforge'
 
+idea.module.downloadJavadoc = true
+idea.module.downloadSources = true
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+compileJava.options.encoding = 'UTF-8'
+
 ext.buildnumber = 0
 if (System.getenv('BUILD_NUMBER') != null)
     project.buildnumber = System.getenv('BUILD_NUMBER')
@@ -46,6 +60,7 @@ configurations {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven { url = "http://mobiusstrip.eu/maven" }
     maven { url = "http://chickenbones.net/maven/" }
@@ -58,22 +73,31 @@ repositories {
 dependencies {
     exportedCompile 'cglib:cglib-nodep:3.1'
 
-    if (!project.hasProperty('useLocalEnderCore')) {
-        compile "com.enderio.core:EnderCore:${endercore_version}:dev"
-    }
+    compileOnly "com.enderio.core:EnderCore:${endercore_version}:dev"
 
     compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api"
     compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
     compile "net.sengir.forestry:${forestry_version}:api"
-    compile ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
+    compileOnly ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
         transitive = false
     }
     
     // WAILA ships really old CCC/CCL versions, so we force the new versions
     compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev"
     compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev"
-    
-    compile "li.cil.oc:OpenComputers:${opencomputers_version}:api"
+
+    compileOnly "li.cil.oc:OpenComputers:${opencomputers_version}:api"
+
+    // Missing Libs -_-' -bart
+    compileOnly "mekanism:MekanismAll:1.7.10-9.1.1.283:dev"
+    compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
+    compileOnly "powercrystals:MineFactoryReloaded:[1.7.10]2.8.2B1-201:dev"
+    compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
+    compileOnly "dan200.computercraft:ComputerCraft:1.75"
+    compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
+    compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
+    compileOnly "codechicken:ForgeMultipart:1.7.10-1.2.0.347:dev"
+
 }
 
 sourceSets {

gradle.properties

@@ -2,7 +2,7 @@ minecraft_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 forgeDep_version=10.13.4.1614
 
-mod_version=2.3.1.7_beta
+mod_version=2.3.1.19
 
 #Comment out this line to get rid of the appendix
 #mod_appendix=beta
@@ -10,7 +10,7 @@ mod_version=2.3.1.7_beta
 buildcraft_version=6.1.5
 waila_version=1.5.10
 ccc_version=1.0.7.46
-ccl_version=1.1.3.138
+ccl_version=1.1.3.140
 ae2_version=rv3-stable-24
 endercore_version=1.7.10-0.2.0.35_beta
 ee3_version=1.7.10-0.3.507
@@ -19,4 +19,4 @@ opencomputers_version=MC1.7.10-1.5.+
 
 toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,)
 
-curse_projectId=64578
+curse_projectId=379275

options.txt

@@ -0,0 +1,118 @@
+invertYMouse:false
+mouseSensitivity:0.5
+fov:0.0
+gamma:0.0
+saturation:0.0
+renderDistance:12
+guiScale:3
+particles:0
+bobView:true
+anaglyph3d:false
+advancedOpengl:false
+maxFps:120
+fboEnable:true
+difficulty:2
+fancyGraphics:true
+ao:2
+clouds:true
+resourcePacks:[]
+lastServer:
+lang:en_US
+chatVisibility:0
+chatColors:true
+chatLinks:true
+chatLinksPrompt:true
+chatOpacity:1.0
+snooperEnabled:true
+fullscreen:false
+enableVsync:true
+hideServerAddress:false
+advancedItemTooltips:true
+pauseOnLostFocus:true
+showCape:true
+touchscreen:false
+overrideWidth:0
+overrideHeight:0
+heldItemTooltips:true
+chatHeightFocused:1.0
+chatHeightUnfocused:0.44366196
+chatScale:1.0
+chatWidth:1.0
+showInventoryAchievementHint:false
+mipmapLevels:4
+anisotropicFiltering:1
+streamBytesPerPixel:0.5
+streamMicVolume:1.0
+streamSystemVolume:1.0
+streamKbps:0.5412844
+streamFps:0.31690142
+streamCompression:1
+streamSendMetadata:true
+streamPreferredServer:
+streamChatEnabled:0
+streamChatUserFilter:0
+streamMicToggleBehavior:0
+forceUnicodeFont:false
+key_key.attack:-100
+key_key.use:-99
+key_key.forward:17
+key_key.left:30
+key_key.back:31
+key_key.right:32
+key_key.jump:57
+key_key.sneak:42
+key_key.drop:16
+key_key.inventory:18
+key_key.chat:20
+key_key.playerlist:15
+key_key.pickItem:-98
+key_key.command:53
+key_key.screenshot:60
+key_key.togglePerspective:63
+key_key.smoothCamera:0
+key_key.sprint:29
+key_key.streamStartStop:64
+key_key.streamPauseUnpause:65
+key_key.streamCommercial:0
+key_key.streamToggleMic:0
+key_key.fullscreen:87
+key_key.hotbar.1:2
+key_key.hotbar.2:3
+key_key.hotbar.3:4
+key_key.hotbar.4:5
+key_key.hotbar.5:6
+key_key.hotbar.6:7
+key_key.hotbar.7:8
+key_key.hotbar.8:9
+key_key.hotbar.9:10
+key_key.charge:47
+key_key.extra:46
+key_key.release:19
+key_key.toggle:34
+key_waila.keybind.wailaconfig:82
+key_waila.keybind.wailadisplay:79
+key_waila.keybind.liquid:80
+key_waila.keybind.recipe:81
+key_waila.keybind.usage:75
+key_Baubles Inventory:48
+key_Change Wand Focus:33
+key_Activate Hover Harness:35
+key_Misc Wand Toggle:34
+key_Glider Toggle:34
+key_Sound Locator:38
+key_Night Vision:25
+key_Goggles of Revealing:19
+key_Step Assist:0
+key_Speed:0
+key_Jump:0
+key_Yeta Wrench Mode:21
+key_Toggle Electromagnet:0
+soundCategory_master:0.0
+soundCategory_music:0.0
+soundCategory_record:1.0
+soundCategory_weather:0.0
+soundCategory_block:1.0
+soundCategory_hostile:1.0
+soundCategory_neutral:1.0
+soundCategory_player:1.0
+soundCategory_ambient:1.0

resources/assets/enderio/lang/cs_CZ.lang

@@ -1,11 +1,11 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=Maximální výstup
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Zpřístupňuje vzdálený přístup k
 tile.blockEnderIo.tooltip.detailed.line2=blokům poblíž
@@ -14,7 +14,7 @@ tile.blockEnderIo.tooltip.detailed.line4=Tyčí cestování
 
 item.enderio.itemEnderface.name=Enderová tvář
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Svazek vedení
 enderio.blockConduitFacade=Fasáda vedení
 item.enderio.itemConduitFacade.name=Fasáda vedení
@@ -34,6 +34,12 @@ enderio.itemRedstoneConduitInsulated.name=Odizolované ruditové vedení
 enderio.itemLiquidConduit.name=Tekutinové vedení
 enderio.itemLiquidConduitAdvanced.name=Natlakované tekutinové vedení
 enderio.itemLiquidConduitEnder.name=Enderové tekutinové vedení
+# 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.itemLiquidConduit.lockedType=Typ tekutiny uzamknut na
 enderio.itemLiquidConduit.unlockedType=Typ tekutiny uzamknut na
 
@@ -80,7 +86,7 @@ enderio.itemGasConduit.tooltip.maxExtract=Maximální extrakce:
 enderio.itemGasConduit.tooltip.maxIo=Maximální IO:
 enderio.itemGasConduit.tooltip.detailed.line1=Přesouvá plyny kompatibilní s Mekanism módem
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiály
 enderio.silicon.name=Křemík
 enderio.conduitBinder.name=Vazač vedení
@@ -95,7 +101,7 @@ enderio.blastResistant=Výbuchu odolné
 enderio.lightEmitter=Vysílá světlo
 enderio.tooltip.isBeaconBase=Může být použito jako základ majáku
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilované živity
 item.bucketNutrient_distillation.name=Kbelík destilovaných živin
 
@@ -109,15 +115,15 @@ fluid.eio.xpjuice=Tekuté XP
 item.bucketXpjuice.name=Kbelík tekutých XP
 
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detaily paliva
 enderio.fuel.tooltip.burnTime=spalovací čas {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.gas.gasTick=Plyn/t
 
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Kousky stroje
 enderio.machineChassi.name=Podvozek stroje
 enderio.basicGear.name=Běžné kolečko
@@ -134,7 +140,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Snížení energie
 tile.blockReinforcedObsidian.name=Zesílený obsidian
 tile.blockReinforcedObsidian.tooltip.common.line1=Odolný Witherovi
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Tavený křemen
 enderio.blockFusedQuartz.fusedQuartz.name=Tavený křemen
 enderio.blockFusedQuartz.fusedGlass.name=Poměrně čisté sklo
@@ -144,7 +150,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=Osvícené čisté sklo
 item.enderio.itemFusedQuartzFrame.name=Tavený křemenný rám
 enderio.itemPowderIngot=Prášky & Cihličky
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Slitina
 enderio.electricalSteel.name=Elektrická ocel
 enderio.energeticAlloy.name=Energetická slitina
@@ -167,7 +173,7 @@ tile.enderio.vibrantNugget.name=Blok z vibrující hrudky
 tile.enderio.darkSteel.name=Blok z tmavé oceli
 tile.enderio.soularium.name=Blok ze soulária
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Uhelný prášek
 enderio.powderIron.name=Železný prášek
 enderio.powderGold.name=Zlatý prášek
@@ -175,7 +181,7 @@ enderio.powderCopper.name=Měděný prášek
 enderio.powderTin.name=Cínový prášek
 enderio.powderEnder.name=Ender perlový prášek
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Kondenzátor
 enderio.basicCapacitor.name=Běžný kondenzátor
 enderio.activatedCapacitor.name=Dvou-vrstvový kondenzátor
@@ -186,7 +192,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Zvýší úložiště ene
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=rychlost / dosah stroje
 enderio.machine.tooltip.clearConfig=Toto promaže všechny uložené informace!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Stirlingův generátor
 tile.blockStirlingGenerator.tooltip.detailed.line1=Spaluje pevné palivo pro výrobu energie
 tile.blockStirlingGenerator.tooltip.detailed.line2=Může být vylepšený pro zvýšení výkonu
@@ -286,7 +292,7 @@ tile.blockVat.tooltip.detailed.line1=Použita k vaření EnderIO tekutin
 tile.blockEnchanter.name=Očarovávač
 tile.blockEnchanter.tooltip.detailed.line1=Využívá XP pro zkombinování předmětů
 tile.blockEnchanter.tooltip.detailed.line2=a knihy s perem pro
-tile.blockEnchanter.tooltip.detailed.line2=vytvoření očarovaných knih
+tile.blockEnchanter.tooltip.detailed.line3=vytvoření očarovaných knih
 
 tile.blockCombustionGenerator.name=Spalovací generátor
 tile.blockCombustionGenerator.tooltip.detailed.line1=Spaluje tekuté palivo pro generování energie
@@ -375,15 +381,13 @@ tile.blockSpawnGuard.tooltip.detailed.line1=Zabrání rodění monster
 tile.blockSpawnGuard.tooltip.detailed.line2=v oblasti efektu
 
 tile.blockExperienceObelisk.name=Obelisk zkušeností
-tile.blockExperienceObelisk.tooltip.detailed.line1=Při položení na tekutinovou nádrž
-tile.blockExperienceObelisk.tooltip.detailed.line2=Klikni pravým tlačítkem pro použití uložených tekutých XP
-tile.blockExperienceObelisk.tooltip.detailed.line3=Klikni se Shiftem pravým tlačítkem s prázdnou rukou
-tile.blockExperienceObelisk.tooltip.detailed.line4=pro vysátí XP hráče do nádrže
-tile.blockExperienceObelisk.tooltip.detailed.line5=Klikni levým tlačítkem pro vysátí 1 úrovně hráčských XP
+tile.blockExperienceObelisk.tooltip.detailed.line1=Zkušenosti s obchody
+tile.blockExperienceObelisk.tooltip.detailed.line2=Může vydávat kapalné XP na
+tile.blockExperienceObelisk.tooltip.detailed.line3=sousední nádrže
 
 enderio.machine.tooltip.configured=(Nastaveno)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Tmavá nášlapná deska
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Aktivovatelná pouze hráči
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Může být obarvena v barvicím stroji,
@@ -396,7 +400,7 @@ tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line3=neviditelné při
 tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line4=Čisté sklo
 
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Cestovní kotva
 tile.blockTravelAnchor.tooltip.detailed.line1=Umožňuje teleportaci mezi kotvami
 tile.blockTravelAnchor.tooltip.detailed.line2=Stůj na jedné kotvě, dívej se na
@@ -416,7 +420,7 @@ item.itemTravelStaff.tooltip.detailed.line4=Klinutí pravám tlačítkem se Shif
 item.itemTravelStaff.tooltip.detailed.line5=hráče na krátkou vzdálenost
 enderio.itemTravelStaff.notEnoughPower=Nedostatečná energie
 
-//Painter
+#Painter
 tile.blockPainter.name=Barvící stroj
 enderio.blockPainter.paintedWith=Obarveno s:
 tile.blockPaintedFence.name=Obarvený plot
@@ -436,7 +440,7 @@ tile.blockPainter.tooltip.detailed.line4=skleněných rámů, světlitu, koberce
 tile.blockPainter.tooltip.detailed.line5=nášlapných desek z tmavé oceli,
 tile.blockPainter.tooltip.detailed.line6=cestovních kotev
 
-//Items
+#Items
 item.itemYetaWrench.name=Yeta klíč
 item.itemYetaWrench.tooltip.detailed.line1=Při držení skryje fasády vedení
 item.itemYetaWrench.tooltip.detailed.line2=Klikni pravým tlačítkem se Shiftem pro okamžité
@@ -477,7 +481,7 @@ skullZombieFrankenstien.name=Frankenstein
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Tmavá helma
 item.darkSteel_chestplate.name=Tmavá košile
 item.darkSteel_leggings.name=Tmavé kalhoty
@@ -486,9 +490,6 @@ item.darkSteel_sword.name=Tmavý meč
 item.darkSteel_pickaxe.name=Tmavý krumpáč
 item.darkSteel_axe.name=Tmavá sekera
 
-enderio.item.tooltip.showDetails=<Podrž Shift>
-enderio.item.darkSteel.tooltip.durability=Výdrž:
-
 enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efektivita při napájení
 enderio.item.darkSteel_pickaxe.tooltip.effObs=Efektivita ničení obsidianu
 
@@ -582,7 +583,7 @@ enderio.darksteel.upgrade.nightVision.name=Noční vidění
 enderio.darksteel.upgrade.nightVision.enabled=Noční vidění povoleno
 enderio.darksteel.upgrade.nightVision.disabled=Noční vidění zakázáno
 
-//------GUI
+#------GUI
 
 enderio.gui.enabled=Povoleno
 enderio.gui.disabled=Zakázáno
@@ -590,7 +591,7 @@ enderio.gui.send=Posílat
 enderio.gui.receive=Přijímat
 enderio.gui.sendReceive=Posílat & Přijímat
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Ruditový mód
 enderio.gui.tooltip.redstoneControlMode.ignore=Vždy aktivní
 enderio.gui.tooltip.redstoneControlMode.on=Aktivní se signálem
@@ -614,7 +615,7 @@ enderio.gui.machine.side.up=Nahoru
 enderio.gui.machine.side.down=Dolu
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Ovládání motoru
 enderio.gui.powerMonitor.emit=Vysílat
 enderio.gui.powerMonitor.engineSection1=Vyšle signál když je úložiště nižší
@@ -629,7 +630,7 @@ enderio.gui.powerMonitor.monHeading3=Vyrovnávací paměti stroje
 enderio.gui.powerMonitor.monHeading4=Průměrný výstup za 5 sekund
 enderio.gui.powerMonitor.monHeading5=Průměrný vstup za 5 sekund
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Síť energie
 enderio.gui.mjReader.conduitBuffer=Vnitřní vyrovnávací paměť
 enderio.gui.mjReader.requestRange=Požadovaný dosah za tik
@@ -648,7 +649,7 @@ enderio.gui.mjReader.receiveItems=Může přijmout předměty z:
 enderio.gui.mjReader.receiveItem1=Může přijmout
 enderio.gui.mjReader.receiveItem2=z:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Vstupní ruditový mód
 enderio.gui.capBank.outputRs=Výstupní ruditový mód
 enderio.gui.capBank.maxIo=Maximální I/O
@@ -657,7 +658,7 @@ enderio.gui.capBank.maxOutput=Maximální výstuo
 enderio.gui.capBank.inputMode=Vstup
 enderio.gui.capBank.outputMode=Výstup
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Veřejný kanál
 enderio.gui.trans.privateChannel=Soukromý kanál
 enderio.gui.trans.addChannel=Přidat kanál
@@ -669,26 +670,26 @@ enderio.gui.trans.itemMode=Mód předmětů
 enderio.gui.trans.publicHeading=Veřejný
 enderio.gui.trans.privateHeading=Soukromý
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Mód pece
 enderio.gui.alloy.mode.all=Pečení všeho
 enderio.gui.alloy.mode.alloy=Pouze slitiny
 enderio.gui.alloy.mode.furnace=Pouze pec
 
-//Vat
+#Vat
 enderio.vat.outputTank=Výstupní nádrž
 enderio.vat.inputTank=Vstupní nádrž
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Chladič
 enderio.combustionGenerator.fuelTank=Palivo
 enderio.combustionGenerator.output=Generuje:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generuje:
 enderio.stirlingGenerator.burnRate=Hodnota spalování:
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Pouze
 enderio.gui.travelAccessable.privateBlock2=může změnit nastavení tohoto bloku.
 enderio.gui.travelAccessable.public=Veřejné
@@ -698,11 +699,11 @@ enderio.gui.travelAccessable.unauthorised=Nemáš přístup k tomuto bloku.
 enderio.gui.travelAccessable.enterCode=Potřebný přístupový kód
 enderio.gui.travelAccessable.ok=Autorizace
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=Zobrazit vzdálenost
 enderio.gui.spawnGurad.range=Vzdálenost:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Mód
 enderio.gui.conduit.ioMode.inOut=Dovnitř / Ven
 enderio.gui.conduit.ioMode.input=Extrakce
@@ -740,7 +741,7 @@ enderio.gui.conduit.fluid.filter=Filtr
 enderio.gui.conduit.gas.autoExtract=Automatická extrakce
 
 
-//Configuration
+#Configuration
 enderio.config.title=Ender IO nastavení
 
 enderio.config.power=Nastavení energie
@@ -783,9 +784,458 @@ enderio.config.fluid=Nastavení tekutin
 enderio.config.fluid.tooltip=Čistá tekutá energie!
 
 enderio.config.spawner=Nastavení poháněných spawnerů
-enderio.config.spawner.tooltip=Už jsem vyčerpal všechny vtipné nápovědy.
-
-
-//Mobs
-entity.EnderIO.Enderminy.name=Endermánek
-entity.EnderIO.EnderCreeper.name=Teleportační Creeper
+enderio.config.spawner.tooltip=Už jsem vyčerpal všechny vtipné nápovědy.enderio.power.tmb=t/L
+enderio.power.generates=Generates
+enderio.power.generation_rate=at
+item.enderio.itemConduitFacade.hardened.name=Hardened Conduit Facade
+enderio.item.itemConduitFacade.tooltip.notpainted=Not Painted
+item.enderio.itemConduitFacade.hardened.tooltip=Hardened: Resists breaking and explosions
+enderio.itemPowerConduitEndergyCrude.name=Clay Compound Energy Conduit
+enderio.itemPowerConduitEndergyIron.name=Iron Energy Conduit
+enderio.itemPowerConduitEndergyAluminum.name=Aluminum Energy Conduit
+enderio.itemPowerConduitEndergyGold.name=Gold Energy Conduit
+enderio.itemPowerConduitEndergyCopper.name=Copper Energy Conduit
+enderio.itemPowerConduitEndergySilver.name=Silver Energy Conduit
+enderio.itemPowerConduitEndergyElectrum.name=Electrum Energy Conduit
+enderio.itemPowerConduitEndergyEnergeticSilver.name=Energetic Silver Energy Conduit
+enderio.itemPowerConduitEndergyCrystalline.name=Crystalline Energy Conduit
+enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Crystalline Pink Slime Energy Conduit
+enderio.itemPowerConduitEndergyMelodic.name=Melodic Energy Conduit
+enderio.itemPowerConduitEndergyStellar.name=Stellar Energy Conduit
+enderio.itemLiquidConduit.lockedWaila=Locked to
+enderio.filterUpgradeBig.name=Big Item Filter
+enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter
+item.itemExistingItemFilter.tooltip.detailed.line3=Right click while sneaking
+item.itemExistingItemFilter.tooltip.detailed.line4=on an inventory to add the
+item.itemExistingItemFilter.tooltip.detailed.line5=content to the snapshot
+enderio.item.itemExistingItemFilter.filterUpdated=New items have been added to the snapshot
+enderio.item.itemExistingItemFilter.filterNotUpdated=The snapshot already covers all items in the inventory
+item.itemPowerItemFilter.name=Chargeable Item Filter
+item.itemPowerItemFilter.tooltip.basic.line1=Upgrade for item conduits
+item.itemPowerItemFilter.tooltip.detailed.line1=Filters chargeable items based on
+item.itemPowerItemFilter.tooltip.detailed.line2=how much RF they have stored
+item.itemExtractSpeedDowngrade.name=Item Conduit Speed Downgrade
+item.itemExtractSpeedDowngrade.tooltip.basic.line1=Downgrade for item conduits
+item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Reduces speed to 1
+item.itemExtractSpeedDowngrade.tooltip.detailed.line2=item per extraction
+item.itemInventoryPanelUpgrade.name=Remote Awareness Upgrade
+item.itemInventoryPanelUpgrade.tooltip.basic.line1=Inventory Panel Remote Awareness
+item.itemInventoryPanelUpgrade.tooltip.detailed.line1=Function upgrade for item conduits
+item.itemInventoryPanelUpgrade.tooltip.detailed.line2=Allows Inventory Panels attached
+item.itemInventoryPanelUpgrade.tooltip.detailed.line3=to this network to see and extract
+item.itemInventoryPanelUpgrade.tooltip.detailed.line4=items from this inventory independent
+item.itemInventoryPanelUpgrade.tooltip.detailed.line5=of the conduit mode.
+item.itemInventoryPanelUpgrade.tooltip.detailed.line6=(No need to set the conduit to extract)
+enderio.itemMEConduit.name=ME Conduit
+enderio.itemMEConduitDense.name=Dense ME Conduit
+enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels
+enderio.itemOCConduit.name=Network Conduit (OC)
+entity.witherSkeleton.name=Wither Skeleton
+tile.blockSoulariumBars.name=Soularium Bars
+tile.blockEndSteelBars.name=End Steel Bars
+enderio.lightBlocker=Blocks Light
+enderio.dustWheat.name=Flour
+enderio.itemEnderios.name="Enderios"
+enderio.itemEnderios.tooltip.common.line1=Part of a balanced breakfast!
+enderio.itemEnderios.tooltip.detailed.line1=Not actually healthy. Contains 253g of sugar, 53g of fat,
+enderio.itemEnderios.tooltip.detailed.line2=and 394g of ender dust.
+enderio.itemEnderios.tooltip.detailed.line3=Side effects of ender dust include: nausea, dizziness, confusion,
+enderio.itemEnderios.tooltip.detailed.line4=and random teleporting.
+tile.fluid.nutrient_distillation.name=Nutrient Distillation
+tile.fluid.hootch.name=Hootch
+tile.fluid.fire_water.name=Fire Water
+tile.fluid.rocket_fuel.name=Rocket Fuel
+fluid.liquid_sunshine=Liquid Sunshine
+tile.fluid.liquid_sunshine.name=Liquid Sunshine
+item.bucketLiquid_sunshine.name=Liquid Sunshine Bucket
+fluid.cloud_seed=Cloud Seed
+tile.fluid.cloud_seed.name=Cloud Seed
+item.bucketCloud_seed.name=Cloud Seed Bucket
+fluid.cloud_seed_concentrated=Concentrated Cloud Seed
+tile.fluid.cloud_seed_concentrated.name=Concentrated Cloud Seed
+item.bucketCloud_seed_concentrated.name=Concentrated Cloud Seed Bucket
+fluid.ender_distillation=Dew of the Void
+tile.fluid.ender_distillation.name=Dew of the Void
+item.bucketEnder_distillation.name=Dew of the Void Bucket
+fluid.vapor_of_levity=Vapor of Levity
+tile.fluid.vapor_of_levity.name=Vapor of Levity
+item.bucketVapor_of_levity.name=Vapor of Levity Bucket
+tile.fluid.eio.xpjuice.name=Liquid XP
+enderio.coolant.tooltip.heading=Coolant
+enderio.coolant.tooltip.degreesPerBucket=Deg per bucket
+enderio.soulMachineChassi.name=Soul Machine Chassis
+enderio.endSteelMachineChassi.name=End Steel Chassis
+enderio.weatherCrystal.name=Weather Crystal
+enderio.electricalGrindingBall.name=Electrical Steel Ball
+enderio.energeticGrindingBall.name=Energetic Alloy Ball
+enderio.vibrantGrindingBall.name=Vibrant Alloy Ball
+enderio.redstoneGrindingBall.name=Redstone Alloy Ball
+enderio.conductiveGrindingBall.name=Conductive Iron Ball
+enderio.pulsatingGrindingBall.name=Pulsating Iron Ball
+enderio.soulariumGrindingBall.name=Soularium Ball
+enderio.endSteelGrindingBall.name=End Steel Ball
+enderio.darkSteelRod.name=Dark Steel Rod
+enderio.blockFusedQuartz.darkFusedQuartz.name=Dark Fused Quartz
+enderio.blockFusedQuartz.darkFusedGlass.name=Dark Clear Glass
+enderio.endSteel.name=End Steel
+enderio.endSteelNugget.name=End Steel Nugget
+enderio.crudeSteel.name=Clay Compound
+enderio.crystallineAlloy.name=Crystalline Alloy
+enderio.melodicAlloy.name=Melodic Alloy
+enderio.stellarAlloy.name=Stellar Alloy
+enderio.crystallinePinkSlime.name=Crystalline Pink Slime
+enderio.energeticSilver.name=Energetic Silver
+enderio.vividAlloy.name=Vivid Alloy
+enderio.crudeSteelGrindingBall.name=Clay Compound Grinding Ball
+enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball
+enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball
+enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball
+enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball
+enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball
+enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball
+enderio.precientCrystal.name=Precient Crystal
+enderio.pulsatingPowder.name=Grains of Piezallity
+enderio.vibrantPowder.name=Grains of Vibrancy
+enderio.enderCrystalPowder.name=Grains of the End
+enderio.precientPowder.name=Grains of Prescience
+enderio.electricalSteel_ball.name=Electrical Steel Ball
+enderio.energeticAlloy_ball.name=Energetic Alloy Ball
+enderio.phasedGold_ball.name=Vibrant Alloy Ball
+enderio.redstoneAlloy_ball.name=Redstone Alloy Ball
+enderio.conductiveIron_ball.name=Conductive Iron Ball
+enderio.phasedIron_ball.name=Pulsating Iron Ball
+enderio.vibrantNugget_ball.name=Vibrant Alloy Nugget Ball
+enderio.darkSteel_ball.name=Dark Steel Ball
+enderio.soularium_ball.name=Soularium Ball
+enderio.endSteel_ball.name=End Steel Ball
+tile.enderio.endSteel.name=End Steel Block
+tile.enderio.crudeSteel.name=Clay Compound Block
+tile.enderio.crystallineAlloy.name=Crystalline Alloy Block
+tile.enderio.melodicAlloy.name=Melodic Alloy Block
+tile.enderio.stellarAlloy.name=Stellar Alloy Block
+tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block
+tile.enderio.energeticSilver.name=Energetic Silver Block
+tile.enderio.vividAlloy.name=Vivid Alloy Block
+enderio.powderObsidian.name=Obsidian Powder
+enderio.ingotEnderiumBase.name=Enderium Base
+enderio.crystallineCapacitor.name=Crystalline Capacitor
+enderio.melodicCapacitor.name=Melodic Capacitor
+enderio.stellarCapacitor.name=Stellar Capacitor
+enderio.silverCapacitor.name=Silver Capacitor
+enderio.endergeticCapacitor.name=Endergetic Capacitor
+enderio.endergisedCapacitor.name=Endergised Capacitor
+enderio.totemicCapacitor.name=Totemic Capacitor
+tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell
+tile.blockSolarPanel.tooltip.common.line1=Solar Power!
+enderio.tooltip.sunlightBlocked=Sky Blocked!
+item.itemWirelessLight.name=Wireless Powered Light
+item.itemWirelessLight.tooltip.detailed.line1=Lights a large area when supplied with
+item.itemWirelessLight.tooltip.detailed.line2=power and a redstone signal.
+item.itemWirelessLight.tooltip.detailed.line3=Can receive power from wireless chargers.
+item.itemWirelessLightInverted.name=Wireless Powered Light (Inverted)
+item.itemWirelessLightInverted.tooltip.detailed.line1=Lights a large area when supplied with
+item.itemWirelessLightInverted.tooltip.detailed.line2=power.
+item.itemWirelessLightInverted.tooltip.detailed.line3=Turn off with a redstone signal.
+item.itemWirelessLightInverted.tooltip.detailed.line4=Can receive power from wireless chargers.
+tile.blockCapBank.creative.name=Creative Capacitor Bank
+tile.blockCapBank.simple.name=Basic Capacitor Bank
+tile.blockCapBank.activated.name=Capacitor Bank
+tile.blockCapBank.vibrant.name=Vibrant Capacitor Bank
+tile.blockCapBank.tooltip.detailed.line1=Multi-block energy storage.
+tile.blockCapBank.tooltip.detailed.line2=Can charge RF powered items.
+tile.blockCapBank.tooltip.detailed.line3=Shift-R-Click on a face with an empty hand
+tile.blockCapBank.tooltip.detailed.line4=to change information display
+tile.blockCapBank.tooltip.hasItems={0,number,integer} {0,choice,1#item|1<items} in inventory
+tile.blockCapBank.tooltipPrefix=Contains
+enderio.capbank.change=I/O
+enderio.capbank.iodisplay.stable=I/O
+enderio.capbank.iodisplay.gain=In
+enderio.capbank.iodisplay.loss=Out
+enderio.capbank.iodisplay.input=Input
+enderio.capbank.iodisplay.output=Output
+tile.blockEnderRail.name=Ender Rail
+tile.blockEnderRail.tooltip.detailed.line1=Teleports minecarts when placed
+tile.blockEnderRail.tooltip.detailed.line2=on a Dimensional Transceiver
+tile.blockEnderRail.tooltip.detailed.line3=Set destinations using the
+tile.blockEnderRail.tooltip.detailed.line4=Transceiver's rail tab
+tile.blockEnderRail.tooltip.detailed.line5=Set direction with a Shift-R-Click
+tile.blockEnderRail.tooltip.detailed.line6=of a wrench
+enderio.trans.rail=Rail
+enderio.gui.fluid.minReq=%s Required for activation
+tile.blockFrankenzombieGenerator.name=Frank'N'Zombie Generator
+tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Consumes Nutrient Distillation
+tile.blockFrankenzombieGenerator.tooltip.detailed.line2=to generate even more power
+enderio.frankenzombieGenerator.fuelTank=Nutrient Tank
+tile.blockEnderGenerator.name=Ender Generator
+tile.blockEnderGenerator.tooltip.detailed.line1=Consumes Dew of the Void
+tile.blockEnderGenerator.tooltip.detailed.line2=to generate power
+enderio.enderGenerator.fuelTank=Void Tank
+enderio.farm.gui.baseUse=Base Use:
+enderio.gui.tooltip.voidslot=Void Slot
+enderio.gui.void.mode=Void Mode
+enderio.gui.void.mode.always=Always
+enderio.gui.void.mode.always.desc=Void slot accepts all items
+enderio.gui.void.mode.if_not_container=If Not Container
+enderio.gui.void.mode.if_not_container.desc=Void slot accepts all items that are not fluid containers
+enderio.gui.void.mode.never=Never
+enderio.gui.void.mode.never.desc=Void slot does not accept items
+enderio.tile.blockPoweredSpawner.tooltip.none=None
+tile.blockWeatherObelisk.name=Weather Obelisk
+tile.blockWeatherObelisk.tooltip.detailed.line1=Changes the current weather
+tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and
+tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item
+tile.blockBuffer.item.name=Item Buffer
+tile.blockBuffer.power.name=Power Buffer
+tile.blockBuffer.omni.name=Omni Buffer
+tile.blockBuffer.creative.name=Creative Buffer
+tile.blockInventoryPanel.name=Inventory Panel
+tile.blockInventoryPanel.tooltip.basic.line1=Remote access and crafting
+tile.blockInventoryPanel.tooltip.detailed.line1=Allows remote access to inventories via
+tile.blockInventoryPanel.tooltip.detailed.line2=Remote Awareness Upgrades in item conduits.
+tile.blockInventoryPanel.tooltip.detailed.line3=Uses Nutrient Distillation for power.
+tile.blockInventoryPanel.tooltip.detailed.line4=Offers a persistent crafting grid.
+enderio.gui.inventorypanel.header.crafting=Crafting grid
+enderio.gui.inventorypanel.header.return=Return area
+enderio.gui.inventorypanel.header.storage=Storage area
+enderio.gui.inventorypanel.info.filter=<filter by name>
+enderio.gui.inventorypanel.info.offline=<OFFLINE>
+enderio.gui.inventorypanel.tooltip.return.line1=Item return area
+enderio.gui.inventorypanel.tooltip.return.line2=Items placed here can be extracted
+enderio.gui.inventorypanel.tooltip.return.line3=by an item conduit, but will not be
+enderio.gui.inventorypanel.tooltip.return.line4=used for crafting.
+enderio.gui.inventorypanel.tooltip.return.line5=Click to change into storage area.
+enderio.gui.inventorypanel.tooltip.storage.line1=Item storage area
+enderio.gui.inventorypanel.tooltip.storage.line2=Small temporary item storage area.
+enderio.gui.inventorypanel.tooltip.storage.line3=Click to change into return area
+enderio.gui.inventorypanel.tooltip.filterslot.line1=Filter card slot
+enderio.gui.inventorypanel.tooltip.filterslot.line2=Place configured item filters in
+enderio.gui.inventorypanel.tooltip.filterslot.line3=here to select which items to show.
+enderio.gui.inventorypanel.tooltip.sort.name_down.line1=Sort items by name
+enderio.gui.inventorypanel.tooltip.sort.name_up.line1=Sort items by name
+enderio.gui.inventorypanel.tooltip.sort.name_up.line2=Starting at the end of the alphabet
+enderio.gui.inventorypanel.tooltip.sort.mod_down.line1=Sort items by mod ID
+enderio.gui.inventorypanel.tooltip.sort.mod_down.line2=Items from the same mod are sorted by name
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line1=Sort items by mod ID
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line2=Items from the same mod are sorted by name
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line3=Starting at the end of the alphabet
+enderio.gui.inventorypanel.tooltip.sort.count_down.line1=Sort items by their quantity
+enderio.gui.inventorypanel.tooltip.sort.count_down.line2=Starting with the highest quantity
+enderio.gui.inventorypanel.tooltip.sort.count_up.line1=Sort items by their quantity
+enderio.gui.inventorypanel.tooltip.sort.count_up.line2=Starting with the lonely ones
+enderio.gui.inventorypanel.tooltip.refill.line1=Refills the crafting grid
+enderio.gui.inventorypanel.tooltip.refill.line2=A normal click puts items
+enderio.gui.inventorypanel.tooltip.refill.line3=for one crafting opperations,
+enderio.gui.inventorypanel.tooltip.refill.line4=while a shift click tries to
+enderio.gui.inventorypanel.tooltip.refill.line5=fill the crafting grid.
+enderio.gui.inventorypanel.tooltip.setrecipe.line1=Learn the current crafting recipe
+enderio.gui.inventorypanel.tooltip.setrecipe.line2=Allows the refilling for the
+enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the network.
+enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid
+enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area
+enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank
+enderio.gui.inventorypanel.tooltip.itemsstored=Items Stored: %s
+enderio.gui.inventorypanel.tooltip.addrecipe.line1=Store the current crafting recipe
+enderio.gui.inventorypanel.tooltip.addrecipe.line2=A maximum of 6 recipes can be stored.
+enderio.gui.inventorypanel.tooltip.addrecipe.line3=Left clicking a stored recipe will try to put
+enderio.gui.inventorypanel.tooltip.addrecipe.line4=items for one crafting operation into the grid.
+enderio.gui.inventorypanel.tooltip.addrecipe.line5=Shift left clicking tries to fill the crafting
+enderio.gui.inventorypanel.tooltip.addrecipe.line6=grid to the maximum.
+enderio.gui.inventorypanel.tooltip.addrecipe.line7=Right click a stored recipe to delete it.
+enderio.gui.inventorypanel.tooltip.sync=NEI Sync
+tile.blockDarkSteelAnvil.intact.name=Dark Steel Anvil
+tile.blockDarkSteelAnvil.slightlyDamaged.name=Slightly Damaged Dark Steel Anvil
+tile.blockDarkSteelAnvil.veryDamaged.name=Very Damaged Dark Steel Anvil
+tile.blockDarkSteelAnvil.tooltip.common.line1=Damage Resistant
+tile.blockDarkSteelAnvil.tooltip.detailed.line1=Lasts much longer than
+tile.blockDarkSteelAnvil.tooltip.detailed.line2=the vanilla anvil
+tile.blockDarkSteelLadder.name=Dark Steel Ladder
+tile.blockDarkSteelLadder.tooltip.common.line1=Faster than regular ladders
+tile.blockTelePad.name=Telepad Block
+tile.blockTelePad.tooltip.detailed.line1=Uses power to teleport entities
+tile.blockTelePad.tooltip.detailed.line2=to a specific position and dimension.
+tile.blockTelePad.tooltip.detailed.line3=Must be placed in a 3x1x3 multiblock.
+enderio.gui.telepad.teleport=Teleport!
+item.itemCoordSelector.name=Coordinate Selector
+item.itemCoordSelector.tooltip.detailed.line1=Stores coordinates of a block.
+item.itemCoordSelector.tooltip.detailed.line2=Right click at block to select
+item.itemCoordSelector.tooltip.detailed.line3=the block adjacent on that side.
+item.itemCoordSelector.tooltip.detailed.line4=Shift right click at a block to
+item.itemCoordSelector.tooltip.detailed.line5=select that specific block.
+item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance.
+enderio.itemCoordSelector.chat.newCoords=New Coords: %s
+enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
+enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
+enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
+enderio.item.itemSoulVessel.tooltip.health=Health:
+enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name:
+enderio.item.itemSoulVessel.tooltip.color=Color:
+enderio.item.itemSoulVessel.tooltip.empty=Empty
+skullEnderResonator.name=Ender Resonator
+skullSentientEnder.name=Sentient Ender
+skullSkeletalContractor.name=Skeletal Contractor
+skullGuardianDiode.name=Guardian Diode
+item.darkSteel_shears.name=Dark Shears
+item.endSteel_helmet.name=End Steel Helm
+item.endSteel_chestplate.name=End Steel Plate
+item.endSteel_leggings.name=End Steel Leggings
+item.endSteel_boots.name=End Steel Boots
+item.endSteel_sword.name=The Ender MKII
+item.endSteel_pickaxe.name=End Steel Pick
+item.endSteel_axe.name=End Steel Axe
+item.stellar_helmet.name=Stellar Helm
+item.stellar_chestplate.name=Stellar Plate
+item.stellar_leggings.name=Stellar Leggings
+item.stellar_boots.name=Stellar Boots
+item.stellar_sword.name=The Ender MKIV
+item.stellar_pickaxe.name=Stellar Pick
+item.stellar_axe.name=Stellar Axe
+enderio.item.darkSteel.tooltip.lvs=lvs
+enderio.item.darkSteel_pickaxe.tooltip.cost=cost
+enderio.item.endSteel_pickaxe.tooltip.effPowered=Efficiency when powered
+enderio.item.endSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian
+enderio.item.endSteel_pickaxe.tooltip.cost=cost
+enderio.item.stellar_pickaxe.tooltip.effPowered=Efficiency when powered
+enderio.item.stellar_pickaxe.tooltip.effObs=Efficiency breaking obsidian
+enderio.item.stellar_pickaxe.tooltip.cost=cost
+enderio.item.endSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
+enderio.item.stellar_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
+enderio.item.darkSteel_shears.tooltip.multiHarvest=Shears multiple blocks/sheep when empowered
+enderio.item.endSteel_sword.tooltip.line1=Increased skull and ender pearl drops
+enderio.item.endSteel_sword.tooltip.line2=Endermen can't teleport once hit
+enderio.item.endSteel_sword.tooltip.line3=+2 Damage when Powered
+enderio.item.stellar_sword.tooltip.line1=Increased skull and ender pearl drops
+enderio.item.stellar_sword.tooltip.line2=Endermen can't teleport once hit
+enderio.item.stellar_sword.tooltip.line3=+2 Damage when Powered
+enderio.item.endSteel_armor.tooltip.line1=Diamond+ level protection
+enderio.item.endSteel_armor.tooltip.line2=when powered
+enderio.item.stellar_armor.tooltip.line1=Diamond+ level protection
+enderio.item.stellar_armor.tooltip.line2=when powered
+enderio.item.endSteel_boots.tooltip.line1=Fall damage negated
+enderio.item.endSteel_boots.tooltip.line2=when powered
+enderio.item.stellar_boots.tooltip.line1=Fall damage negated
+enderio.item.stellar_boots.tooltip.line2=when powered
+enderio.darksteel.upgrade.empowered_five.name=Empowered V
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=Power: $P
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=$D% damage absorbed
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=by power
+enderio.darksteel.upgrade.gogglesOfRevealing.enabled=Magic is being revealed
+enderio.darksteel.upgrade.gogglesOfRevealing.disabled=Magic is hidden from plain sight
+enderio.darksteel.upgrade.naturalistEye.name=Naturalist's Eye
+enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=Shows pollinated tree leaves
+enderio.darksteel.upgrade.apiaristArmor.helmet.name=Apiarist's Hat
+enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.chestplate.name=Apiarist's Shirt
+enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.leggings.name=Apiarist's Pants
+enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.boots.name=Apiarist's Shoes
+enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.jump.enabled=Jump Enabled
+enderio.darksteel.upgrade.jump.disabled=Jump Disabled
+enderio.darksteel.upgrade.solar_one.name=Solar I
+enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Generates power from the sun.
+enderio.darksteel.upgrade.solar_two.name=Solar II
+enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from the sun.
+enderio.darksteel.upgrade.solar_three.name=Solar III
+enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Generates power from the sun.
+enderio.gui.simple.in=Max In:
+enderio.gui.simple.out=Max Out:
+enderio.gui.available=Available
+enderio.gui.max=Max:
+enderio.gui.progress=Progress {0,number}%
+enderio.gui.machine.button.storelevel=Store 1
+enderio.gui.machine.tooltip.storelevel=level of player XP
+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.visible.line1=Shift click to reset all sides
+enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting
+enderio.gui.machine.poweredspawner.capture=Capture
+enderio.gui.machine.poweredspawner.spawn=Spawn
+enderio.gui.machine.receivefilter=Receive Filter
+enderio.gui.machine.sendfilter=Send Filter
+enderio.gui.machine.sendReceivebuffer=Send/Receive Buffer
+enderio.gui.machine.localbuffer=Local Buffer
+enderio.gui.machine.upkeep=Upkeep:
+enderio.gui.machine.bufferingstacks=Buffering item stacks
+enderio.gui.machine.bufferingsingle=Buffering single items
+enderio.gui.machine.percraft=Per Craft
+enderio.gui.powerMonitor.noNetworkError=No conduit network attached. The Power Monitor needs to be attached to a conduit network to read data from.
+enderio.gui.vacuum.range=Suction Strength
+enderio.gui.vacuum.header.chest=Vacuum Chest
+enderio.gui.vacuum.header.filter=Item Filter
+enderio.gui.vacuum.header.range=Range
+enderio.gui.machine.vat.dump.1=Dump Input Tank
+enderio.gui.machine.vat.dump.2=Dump Output Tank
+enderio.stirlingGenerator.upgradeslot=Upgrade slot
+enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficiency
+enderio.stirlingGenerator.remaining=Remaining {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
+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.telepad.configure.travel=Travel Settings
+enderio.gui.telepad.configure.telepad=Telepad Settings
+enderio.gui.telepad.blocked=Teleport Blocked!
+enderio.gui.spawnGurad.hideRange=Hide Range
+enderio.gui.conduit.button.clear=Clear
+enderio.gui.conduit.button.merge=Merge
+enderio.gui.conduit.button.show=Show
+enderio.gui.conduit.button.snap=Snapshot
+enderio.gui.conduit.item.whitelist.tooltip.0=If item list is empty, no item
+enderio.gui.conduit.item.whitelist.tooltip.1=will be allowed to pass
+enderio.gui.conduit.item.blacklist.tooltip.0=If item list is empty, all items
+enderio.gui.conduit.item.blacklist.tooltip.1=will be allowed to pass
+enderio.gui.conduit.item.fuzzy.disabled=Damage Mode: Disabled
+enderio.gui.conduit.item.fuzzy.fuzzy_25=Damage Mode: Damaged by 25% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_50=Damage Mode: Damaged by 50% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_75=Damage Mode: Damaged by 75% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_99=Damage Mode: Damaged at least once
+enderio.gui.conduit.item.fuzzy.tooltip.0=Can work without items in the filter
+enderio.gui.conduit.item.fuzzy.tooltip.1=In this case its logic can be
+enderio.gui.conduit.item.fuzzy.tooltip.2=controlled by %s button
+enderio.gui.conduit.item.filterupgrade=Insert Item Filter
+enderio.gui.conduit.item.speedupgrade=Insert Item Conduit Speed Upgrades/Downgrade
+enderio.gui.conduit.item.speedupgrade2=Max upgrades is 15; Max downgrades is 1
+enderio.gui.conduit.item.functionupgrade.line1=Possible function upgrades:
+enderio.gui.conduit.redstone.signalStrengh=Strong Signal
+enderio.gui.conduit.redstone.signalStrengh.tooltip=Output a strong redstone signal
+enderio.gui.conduit.fluid.whitelist=Whitelist
+enderio.gui.conduit.fluid.blacklist=Blacklist
+enderio.gui.weather.task.clear=Clear Weather
+enderio.gui.weather.task.rain=Rainy Weather
+enderio.gui.weather.task.storm=Thunderstorm
+enderio.gui.weather.requiredfluid=Required Fluid: %s L
+enderio.weatherObelisk.fuelTank=Barometric Flux Tank
+enchantment.enderio.soulBound=Soulbound
+description.enchantment.enderio.soulBound=Prevents item from being lost on death
+enderio.category.darksteelarmor=Dark Steel Armor
+enderio.category.tools=Tools
+enderio.keybind.glidertoggle=Glider Toggle
+enderio.keybind.gogglesofrevealing=Goggles of Revealing
+enderio.keybind.nightvision=Night Vision
+enderio.keybind.soundlocator=Sound Locator
+enderio.keybind.speed=Speed
+enderio.keybind.jump=Jump
+enderio.keybind.stepassist=Step Assist
+enderio.keybind.yetawrenchmode=Yeta Wrench Mode
+enderio.keybind.magnet=Toggle Electromagnet
+enderio.nei.alloysmelter=Alloy Smelter
+enderio.nei.enchanter=Enchanter
+enderio.nei.sagmill=SAG Mill
+enderio.nei.sagmill.outputchance=Chance: {0,choice,0#'<1'|0<{0,number}}%
+enderio.nei.slicensplice=Slice'N'Splice
+enderio.nei.soulbinder=Soul Binder
+enderio.nei.vat=Vat
+enderio.tooltip.burntime=Burn Time:
+enderio.tooltip.oredict=Ore Dictionary:
+enderio.tooltip.meta=Meta:
+enderio.tooltip.uid=UID:
+enderio.tooltip.anvilupgrades=Anvil Upgrades:
+enderio.waila.config.hiddenfacades=Sneaky Facades

resources/assets/enderio/lang/de_DE.lang

@@ -1,14 +1,14 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Max. Output
 enderio.power.generates=Generiert
 enderio.power.generation_rate=bei
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender-IO
 tile.blockEnderIo.tooltip.detailed.line1=Erlaubt Fernzugriff auf
 tile.blockEnderIo.tooltip.detailed.line2=nahe Blöcke
@@ -17,7 +17,7 @@ tile.blockEnderIo.tooltip.detailed.line4=dem Stab des Reisens
 
 item.enderio.itemEnderface.name=Endergesicht
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Leitungsbündel
 enderio.blockConduitFacade=Leitungsverkleidung
 item.enderio.itemConduitFacade.name=Leitungsverkleidung
@@ -40,15 +40,21 @@ enderio.itemRedstoneConduitInsulated.name=Isolierte Redstone-Leitung
 enderio.itemLiquidConduit.name=Flüssigkeitsleitung
 enderio.itemLiquidConduitAdvanced.name=Flüssigkeitsdruckleitung
 enderio.itemLiquidConduitEnder.name=Ender-Flüssigkeitsleitung
-enderio.itemLiquidConduit.lockedType.name=Flüssigkeitstyp gebunden an
-enderio.itemLiquidConduit.unlockedType.name=Flüssigkeitstyp nicht mehr gebunden
+# 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.itemLiquidConduit.lockedType=Flüssigkeitstyp gebunden an
+enderio.itemLiquidConduit.unlockedType=Flüssigkeitstyp nicht mehr gebunden
 enderio.itemLiquidConduit.lockedWaila=Festgelegt auf
 
 enderio.itemLiquidConduit.tooltip.maxExtract=Max. Extraktion:
 enderio.itemLiquidConduit.tooltip.maxIo=Max-IO:
-enderio.itemLiquidConduit.tooltip.tooltip.detailed.line1=Flüssigkeiten werden nicht aufwärts fließen
-enderio.itemLiquidConduit.tooltip.tooltip.detailed.line2=Fließrate abhängig von Viskosität
-enderio.itemLiquidConduit.tooltip.tooltip.detailed.line3=der Flüssigkeit
+enderio.itemLiquidConduit.tooltip.detailed.line1=Flüssigkeiten werden nicht aufwärts fließen
+enderio.itemLiquidConduit.tooltip.detailed.line2=Fließrate abhängig von Viskosität
+enderio.itemLiquidConduit.tooltip.detailed.line3=der Flüssigkeit
 
 enderio.itemLiquidConduitEnder.tooltip.detailed.line1=Sofortiger Flüssigkeitsteleport
 enderio.itemLiquidConduitEnder.tooltip.detailed.line2=Ermöglicht es, verschiedene Flüssigkeiten
@@ -111,16 +117,16 @@ enderio.itemGasConduit.tooltip.maxExtract=Max Extract:
 enderio.itemGasConduit.tooltip.maxIo=Max IO:
 enderio.itemGasConduit.tooltip.detailed.line1=Transportiert Mekanism-kompatible Gase
 
-enderio.itemMeConduit.name=ME-Leitung
+enderio.itemMEConduit.name=ME-Leitung
 enderio.itemMEConduitDense.name=Dichte ME-Leitung
 enderio.itemMEConduit.channelsUsed={0,number} von {1,number} Kanälen
 
 enderio.itemOCConduit.name=Netzwerkleitung (OC)
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Witherskelett
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materialien
 enderio.silicon.name=Silizium
 enderio.conduitBinder.name=Leitungsbinder
@@ -144,7 +150,7 @@ enderio.itemEnderios.tooltip.detailed.line2=und 394g Enderstaub.
 enderio.itemEnderios.tooltip.detailed.line3=Nebenwirkungen von Enderstaub: Übelkeit, Schwindelgefühl
 enderio.itemEnderios.tooltip.detailed.line4=und unwillkürliches Teleportieren.
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Nahrhaftes Destillat
 tile.fluid.nutrient_distillation.name=Nahrhaftes Destillat
 item.bucketNutrient_distillation.name=Eimer mit nahrhaften Destillat
@@ -162,16 +168,16 @@ fluid.eio.xpjuice=Flüssige XP
 tile.fluid.eio.xpjuice.name=Flüssige XP
 item.bucketXpjuice.name=XP-Eimer
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Treibstoffdetails
 enderio.fuel.tooltip.burnTime=Brenndauer {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Kühlmittel
 enderio.coolant.tooltip.degreesPerBucket=° pro Eimer
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Maschinenteile
 enderio.machineChassi.name=Maschinenhülle
 enderio.basicGear.name=Basiszahnrad
@@ -189,7 +195,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Energiereduktion
 tile.blockReinforcedObsidian.name=Verstärktes Obsidian
 tile.blockReinforcedObsidian.tooltip.common.line1=Wither-fest
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Quarzglas
 enderio.blockFusedQuartz.fusedQuartz.name=Quarzglas
 enderio.blockFusedQuartz.fusedGlass.name=Ziemlich Klares Glas
@@ -201,7 +207,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Dunkles Klares Quarzglas
 item.enderio.itemFusedQuartzFrame.name=Quarzglasrahmen
 enderio.itemPowderIngot=Pulver & Barren
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Legierung
 enderio.electricalSteel.name=Elektrischer Stahl
 enderio.energeticAlloy.name=Energetisierte Legierung
@@ -224,7 +230,7 @@ tile.enderio.vibrantNugget.name=Block aus Dynamischen Nuggets
 tile.enderio.darkSteel.name=Dunkelstahlblock
 tile.enderio.soularium.name=Soularium-Block
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Kohlepulver
 enderio.powderIron.name=Eisenpulver
 enderio.powderGold.name=Goldpulver
@@ -234,7 +240,7 @@ enderio.powderEnder.name=Enderperlenpulver
 enderio.powderObsidian.name=Obsidianpulver
 enderio.ingotEnderiumBase.name=Enderium-Basis
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Kondensator
 enderio.basicCapacitor.name=Basiskondensator
 enderio.activatedCapacitor.name=Doppelschichtkondensator
@@ -245,7 +251,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Erhöht Energiespeicher s
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=Geschw./Reichweite von Maschinen
 enderio.machine.tooltip.clearConfig=Dies löscht alle gespeicherten Informationen!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Stirling-Generator
 tile.blockStirlingGenerator.tooltip.detailed.line1=Verbrennt feste Brennstoffe zur Energieerzeugung
 tile.blockStirlingGenerator.tooltip.detailed.line2=Kann mit Upgrades versehen werden, um Output
@@ -384,7 +390,7 @@ tile.blockVat.tooltip.detailed.line1=Damit braut man EnderIO-Flüssigkeiten
 tile.blockEnchanter.name=Verzauberer
 tile.blockEnchanter.tooltip.detailed.line1=Verwendet XP, um Items zu kombinieren
 tile.blockEnchanter.tooltip.detailed.line2=sowie Buch und Feder, um
-tile.blockEnchanter.tooltip.detailed.line2=Verzauberte Bücher zu kreieren
+tile.blockEnchanter.tooltip.detailed.line3=Verzauberte Bücher zu kreieren
 
 tile.blockCombustionGenerator.name=Verbrennungsgenerator
 tile.blockCombustionGenerator.tooltip.detailed.line1=Verbrennt flüssige Brennstoffe zur Energieerzeugung
@@ -559,7 +565,7 @@ enderio.gui.inventorypanel.tooltip.sync=NEI-Synchonisation
 
 enderio.machine.tooltip.configured=(Konfiguriert)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Dunkeldruckplatte
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Wird nur von Spielern aktiviert
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Kann in der Färbemaschine gefärbt werden,
@@ -581,7 +587,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=als ein Vanilla-Amboss.
 tile.blockDarkSteelLadder.name=Dunkelstahlleiter
 tile.blockDarkSteelLadder.tooltip.common.line1=Schneller als normale Leitern.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Reiseanker
 tile.blockTravelAnchor.tooltip.detailed.line1=Erlaubt Teleport zu anderen Ankern
 tile.blockTravelAnchor.tooltip.detailed.line2=Stehe auf einem Anker, schaue in Richtung
@@ -619,7 +625,7 @@ enderio.itemCoordSelector.chat.setCoords=Festgelegte Koordinaten: %s
 enderio.itemCoordSelector.chat.newDimension=Neue Dimension: %s%s
 enderio.itemCoordSelector.chat.setDimension=Festgelegte Dimension: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Färbemaschine
 enderio.blockPainter.paintedWith=Bemalt mit:
 tile.blockPaintedFence.name=Bemalter Zaun
@@ -639,7 +645,7 @@ tile.blockPainter.tooltip.detailed.line4=Glasrahmen, Glowstone, Teppich,
 tile.blockPainter.tooltip.detailed.line5=Dunkelstahldruckplatten,
 tile.blockPainter.tooltip.detailed.line6=Reiseanker
 
-//Items
+#Items
 item.itemYetaWrench.name=Yeta-Schraubenschlüssel
 item.itemYetaWrench.tooltip.detailed.line1=Versteckt Leitungsverkleidungen, wenn gehalten
 item.itemYetaWrench.tooltip.detailed.line2=Shift-klicke, um Maschinen und Leitungen
@@ -686,7 +692,7 @@ skullSentientEnder.name=Empfindsamer Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Dunkelhelm
 item.darkSteel_chestplate.name=Dunkelbrustpanzer
 item.darkSteel_leggings.name=Dunkelbeinschutz
@@ -819,7 +825,7 @@ 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.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Max. Ein:
 enderio.gui.simple.out=Max. Aus:
@@ -833,7 +839,7 @@ enderio.gui.receive=Empfangen
 enderio.gui.send=Senden
 enderio.gui.sendReceive=Senden & Empfangen
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Redstone-Modus
 enderio.gui.tooltip.redstoneControlMode.ignore=Immer aktiv.
 enderio.gui.tooltip.redstoneControlMode.on=Aktiv mit Signal.
@@ -881,7 +887,7 @@ enderio.gui.machine.side.up=Oben
 enderio.gui.machine.side.down=Unten
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Motorkontrolle
 enderio.gui.powerMonitor.emit=Entsenden
 enderio.gui.powerMonitor.engineSection1=Entsende Signal, wenn Speicher weniger
@@ -897,7 +903,7 @@ enderio.gui.powerMonitor.monHeading4=Durchschnitts-Output über 5 Sekunden
 enderio.gui.powerMonitor.monHeading5=Durchschnitts-Input über 5 Sekunden
 enderio.gui.powerMonitor.noNetworkError=Kein Leitungsnetzwerk verbunden. Der Energiemonitor muss mit einem Leitungsnetzwerk verbunden sein um Daten lesen zu können.
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Energienetzwerk
 enderio.gui.mjReader.conduitBuffer=Interner Puffer
 enderio.gui.mjReader.requestRange=Pro-Tick-Forderungsreichweite
@@ -916,7 +922,7 @@ enderio.gui.mjReader.receiveItems=Kann Items empfangen von:
 enderio.gui.mjReader.receiveItem1=Kann
 enderio.gui.mjReader.receiveItem2=empfangen von:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Input-Redstone-Modus
 enderio.gui.capBank.outputRs=Output-Redstone-Modus
 enderio.gui.capBank.maxIo=Max. I/O
@@ -925,7 +931,7 @@ enderio.gui.capBank.maxOutput=Max. Ouput
 enderio.gui.capBank.inputMode=Input
 enderio.gui.capBank.outputMode=Ouput
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Öffentl. Kanal
 enderio.gui.trans.privateChannel=Privater Kanal
 enderio.gui.trans.addChannel=Kanal hinzufügen
@@ -937,37 +943,37 @@ enderio.gui.trans.itemMode=Item-Modus
 enderio.gui.trans.publicHeading=Öffentl.
 enderio.gui.trans.privateHeading=Privat
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Schmelz-Modus
 enderio.gui.alloy.mode.all=Schmelze alles
 enderio.gui.alloy.mode.alloy=Nur Legierungen
 enderio.gui.alloy.mode.furnace=Nur Ofen
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Saugstärke
 enderio.gui.vacuum.header.chest=Vakuumtruhe
 enderio.gui.vacuum.header.filter=Item-Filter
 enderio.gui.vacuum.header.range=Reichweite
 
-//Vat
+#Vat
 enderio.vat.outputTank=Output-Tank
 enderio.vat.inputTank=Input-Tank
 enderio.gui.machine.vat.dump.1=Input Tank verwerfen
 enderio.gui.machine.vat.dump.2=Output Tank verwerfen
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Kühlmittel
 enderio.combustionGenerator.fuelTank=Brennstoff
 enderio.combustionGenerator.output=Output:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Output:
 enderio.stirlingGenerator.burnRate=Brennrate:
 enderio.stirlingGenerator.upgradeslot=Upgrade-Slot
 enderio.stirlingGenerator.upgrades={0} gibt eine Effizienz von {2}{1,number,#.#}x{3}
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF verbleibend
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Nur
 enderio.gui.travelAccessable.privateBlock2=darf die Einstellungen dieses Blocks ändern.
 enderio.gui.travelAccessable.public=Öffentlich
@@ -984,12 +990,12 @@ enderio.gui.telepad.configure.travel=Reiseeinstellungen
 enderio.gui.telepad.configure.telepad=Telepad-Einstellungen
 enderio.gui.telepad.blocked=Teleport blockiert!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Zeige Reichweite
 enderio.gui.spawnGurad.hideRange=Verberge Reichweite
 enderio.gui.spawnGurad.range=Reichweite:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modus
 enderio.gui.conduit.ioMode.inOut=Ein / Aus
 enderio.gui.conduit.ioMode.input=Extrahieren
@@ -1045,17 +1051,16 @@ enderio.gui.conduit.fluid.blacklist=Blacklist
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extraktion
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Klares Wetter
 enderio.gui.weather.task.rain=Regnerisches Wetter
 enderio.gui.weather.task.storm=Gewitter
-enderio.gui.weather.requireditem=Benötigtes Item: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Seelengebunden
 description.enchantment.enderio.soulBound=Verhindert das Verlieren des Item beim Sterben
 
-//Configuration
+#Configuration
 enderio.config.title=Ender IO Konfiguration
 
 enderio.config.power=Energieeinstellungen
@@ -1100,7 +1105,7 @@ enderio.config.fluid.tooltip=Reine flüssige Energie
 enderio.config.spawner=PoweredSpawner-Einstellungen
 enderio.config.spawner.tooltip=Mir sind die geistreichen Tooltips ausgegangen
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Dunkelstahlrüstung
 enderio.category.tools=Werkzeuge
 enderio.keybind.glidertoggle=Gleiterschaltung

resources/assets/enderio/lang/en_US.lang

@@ -1,14 +1,14 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Max Output
 enderio.power.generates=Generates
 enderio.power.generation_rate=at
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Allow remote access to nearby
 tile.blockEnderIo.tooltip.detailed.line2=blocks
@@ -17,7 +17,7 @@ tile.blockEnderIo.tooltip.detailed.line4=the Staff of Travel
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Conduit Bundle
 enderio.blockConduitFacade=Conduit Facade
 item.enderio.itemConduitFacade.name=Conduit Facade
@@ -53,6 +53,10 @@ enderio.itemRedstoneConduitInsulated.name=Insulated Redstone Conduit
 enderio.itemLiquidConduit.name=Fluid Conduit
 enderio.itemLiquidConduitAdvanced.name=Pressurized Fluid Conduit
 enderio.itemLiquidConduitEnder.name=Ender Fluid Conduit
+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
 enderio.itemLiquidConduit.lockedType=Fluid type locked to
 enderio.itemLiquidConduit.unlockedType=Fluid type unlocked
 enderio.itemLiquidConduit.lockedWaila=Locked to 
@@ -131,10 +135,10 @@ enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels
 
 enderio.itemOCConduit.name=Network Conduit (OC)
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Wither Skeleton
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materials
 enderio.silicon.name=Silicon
 enderio.conduitBinder.name=Conduit Binder
@@ -160,7 +164,7 @@ enderio.itemEnderios.tooltip.detailed.line2=and 394g of ender dust.
 enderio.itemEnderios.tooltip.detailed.line3=Side effects of ender dust include: nausea, dizziness, confusion, 
 enderio.itemEnderios.tooltip.detailed.line4=and random teleporting.
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Nutrient Distillation
 tile.fluid.nutrient_distillation.name=Nutrient Distillation
 item.bucketNutrient_distillation.name=Nutrient Distillation Bucket
@@ -201,16 +205,16 @@ fluid.eio.xpjuice=Liquid XP
 tile.fluid.eio.xpjuice.name=Liquid XP
 item.bucketXpjuice.name=XP Bucket
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Fuel Details
 enderio.fuel.tooltip.burnTime=burn time {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Coolant
 enderio.coolant.tooltip.degreesPerBucket=Deg per bucket
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Machine Parts
 enderio.machineChassi.name=Machine Chassis
 enderio.basicGear.name=Basic Gear
@@ -241,7 +245,7 @@ enderio.darkSteelRod.name=Dark Steel Rod
 tile.blockReinforcedObsidian.name=Reinforced Obsidian
 tile.blockReinforcedObsidian.tooltip.common.line1=Wither Proof
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Fused Quartz
 enderio.blockFusedQuartz.fusedQuartz.name=Fused Quartz
 enderio.blockFusedQuartz.fusedGlass.name=Quite Clear Glass
@@ -253,7 +257,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Dark Clear Glass
 item.enderio.itemFusedQuartzFrame.name=Fused Quartz Frame
 enderio.itemPowderIngot=Powders & Ingots
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Alloy
 enderio.electricalSteel.name=Electrical Steel
 enderio.energeticAlloy.name=Energetic Alloy
@@ -289,7 +293,7 @@ enderio.vibrantPowder.name=Grains of Vibrancy
 enderio.enderCrystalPowder.name=Grains of the End
 enderio.precientPowder.name=Grains of Prescience
 
-//Balls
+#Balls
 enderio.electricalSteel_ball.name=Electrical Steel Ball
 enderio.energeticAlloy_ball.name=Energetic Alloy Ball
 enderio.phasedGold_ball.name=Vibrant Alloy Ball
@@ -321,7 +325,7 @@ tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block
 tile.enderio.energeticSilver.name=Energetic Silver Block
 tile.enderio.vividAlloy.name=Vivid Alloy Block
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Coal Powder
 enderio.powderIron.name=Iron Powder
 enderio.powderGold.name=Gold Powder
@@ -331,7 +335,7 @@ enderio.powderEnder.name=Ender Pearl Powder
 enderio.powderObsidian.name=Obsidian Powder
 enderio.ingotEnderiumBase.name=Enderium Base
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Capacitor
 enderio.basicCapacitor.name=Basic Capacitor
 enderio.activatedCapacitor.name=Double-Layer Capacitor
@@ -349,7 +353,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Increases energy storage
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=speed / range of machines
 enderio.machine.tooltip.clearConfig=This will clear all stored info!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Stirling Generator
 tile.blockStirlingGenerator.tooltip.detailed.line1=Burns solid fuel to generate power
 tile.blockStirlingGenerator.tooltip.detailed.line2=Can be upgraded to increase output
@@ -674,7 +678,7 @@ enderio.gui.inventorypanel.tooltip.sync=NEI Sync
 
 enderio.machine.tooltip.configured=(Configured)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Dark Pressure Plate
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Only activated by players
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Can be painted in painting machine,
@@ -696,7 +700,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=the vanilla anvil
 tile.blockDarkSteelLadder.name=Dark Steel Ladder
 tile.blockDarkSteelLadder.tooltip.common.line1=Faster than regular ladders
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Travel Anchor
 tile.blockTravelAnchor.tooltip.detailed.line1=Allows teleportation between anchors
 tile.blockTravelAnchor.tooltip.detailed.line2=Stand on one Anchor, look at
@@ -734,7 +738,7 @@ enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
 enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
 enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Painting Machine
 enderio.blockPainter.paintedWith=Painted with:
 tile.blockPaintedFence.name=Painted Fence
@@ -754,7 +758,7 @@ tile.blockPainter.tooltip.detailed.line4=Glass Frames, Glowstone, Carpet,
 tile.blockPainter.tooltip.detailed.line5=Dark Steel Pressure Plates,
 tile.blockPainter.tooltip.detailed.line6=Travel Anchors
 
-//Items
+#Items
 item.itemYetaWrench.name=Yeta Wrench
 item.itemYetaWrench.tooltip.detailed.line1=Hides conduit facades when held
 item.itemYetaWrench.tooltip.detailed.line2=Shift-R-Click to break machines
@@ -803,7 +807,7 @@ skullGuardianDiode.name=Guardian Diode
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Dark Helm
 item.darkSteel_chestplate.name=Dark Plate
 item.darkSteel_leggings.name=Dark Leggings
@@ -813,7 +817,7 @@ item.darkSteel_pickaxe.name=Dark Pick
 item.darkSteel_axe.name=Dark Axe
 item.darkSteel_shears.name=Dark Shears
 
-//End Steel
+#End Steel
 item.endSteel_helmet.name=End Steel Helm
 item.endSteel_chestplate.name=End Steel Plate
 item.endSteel_leggings.name=End Steel Leggings
@@ -822,7 +826,7 @@ item.endSteel_sword.name=The Ender MKII
 item.endSteel_pickaxe.name=End Steel Pick
 item.endSteel_axe.name=End Steel Axe
 
-//Stellar
+#Stellar
 item.stellar_helmet.name=Stellar Helm
 item.stellar_chestplate.name=Stellar Plate
 item.stellar_leggings.name=Stellar Leggings
@@ -992,7 +996,7 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from
 enderio.darksteel.upgrade.solar_three.name=Solar III
 enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Generates power from the sun.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Max In:
 enderio.gui.simple.out=Max Out:
@@ -1006,7 +1010,7 @@ enderio.gui.receive=Receive
 enderio.gui.send=Send
 enderio.gui.sendReceive=Send & Receive 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Redstone Mode
 enderio.gui.tooltip.redstoneControlMode.ignore=Always active
 enderio.gui.tooltip.redstoneControlMode.on=Active with signal
@@ -1054,7 +1058,7 @@ enderio.gui.machine.side.up=Up
 enderio.gui.machine.side.down=Down
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Engine Control
 enderio.gui.powerMonitor.emit=Emit
 enderio.gui.powerMonitor.engineSection1=Emit signal when storage less
@@ -1070,7 +1074,7 @@ enderio.gui.powerMonitor.monHeading4=Average output over 5 seconds
 enderio.gui.powerMonitor.monHeading5=Average input over 5 seconds
 enderio.gui.powerMonitor.noNetworkError=No conduit network attached. The Power Monitor needs to be attached to a conduit network to read data from.
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Power Network
 enderio.gui.mjReader.conduitBuffer=Internal Buffer
 enderio.gui.mjReader.requestRange=Per tick request range
@@ -1089,7 +1093,7 @@ enderio.gui.mjReader.receiveItems=Can receive items from:
 enderio.gui.mjReader.receiveItem1=Can receive
 enderio.gui.mjReader.receiveItem2=from:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Input Redstone Mode
 enderio.gui.capBank.outputRs=Output Redstone Mode
 enderio.gui.capBank.maxIo=Max I/O
@@ -1098,7 +1102,7 @@ enderio.gui.capBank.maxOutput=Max Output
 enderio.gui.capBank.inputMode=Input
 enderio.gui.capBank.outputMode=Output
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Public Channel
 enderio.gui.trans.privateChannel=Private Channel
 enderio.gui.trans.addChannel=Add Channel
@@ -1110,37 +1114,37 @@ enderio.gui.trans.itemMode=Item Mode
 enderio.gui.trans.publicHeading=Public
 enderio.gui.trans.privateHeading=Private
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Furnace Mode
 enderio.gui.alloy.mode.all=All Smelting
 enderio.gui.alloy.mode.alloy=Alloys Only
 enderio.gui.alloy.mode.furnace=Furnace Only
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Suction Strength
 enderio.gui.vacuum.header.chest=Vacuum Chest
 enderio.gui.vacuum.header.filter=Item Filter
 enderio.gui.vacuum.header.range=Range
 
-//Vat
+#Vat
 enderio.vat.outputTank=Output Tank
 enderio.vat.inputTank=Input Tank
 enderio.gui.machine.vat.dump.1=Dump Input Tank
 enderio.gui.machine.vat.dump.2=Dump Output Tank
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Coolant
 enderio.combustionGenerator.fuelTank=Fuel
 enderio.combustionGenerator.output=Generating:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generating:
 enderio.stirlingGenerator.burnRate=Burn Rate:
 enderio.stirlingGenerator.upgradeslot=Upgrade slot
 enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficiency
 enderio.stirlingGenerator.remaining=Remaining {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Only
 enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.
 enderio.gui.travelAccessable.public=Public
@@ -1157,12 +1161,12 @@ enderio.gui.telepad.configure.travel=Travel Settings
 enderio.gui.telepad.configure.telepad=Telepad Settings
 enderio.gui.telepad.blocked=Teleport Blocked!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Show Range
 enderio.gui.spawnGurad.hideRange=Hide Range
 enderio.gui.spawnGurad.range=Range:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Mode
 enderio.gui.conduit.ioMode.inOut=In / Out
 enderio.gui.conduit.ioMode.input=Extract
@@ -1182,7 +1186,11 @@ enderio.gui.conduit.item.channel=Channel
 enderio.gui.conduit.item.ignoreMetaData=Ignore Meta Data
 enderio.gui.conduit.item.matchMetaData=Match Meta Data
 enderio.gui.conduit.item.whitelist=Whitelist
+enderio.gui.conduit.item.whitelist.tooltip.0=If item list is empty, no item
+enderio.gui.conduit.item.whitelist.tooltip.1=will be allowed to pass
 enderio.gui.conduit.item.blacklist=Blacklist
+enderio.gui.conduit.item.blacklist.tooltip.0=If item list is empty, all items
+enderio.gui.conduit.item.blacklist.tooltip.1=will be allowed to pass
 enderio.gui.conduit.item.stickyEnabled=Sticky Mode Enabled|Selected items will only|be sent to this or other|Sticky outputs.
 enderio.gui.conduit.item.stickyDisbaled=Sticky Mode Disabled
 enderio.gui.conduit.item.ignoreNBT=Ignore NBT Data
@@ -1195,11 +1203,14 @@ enderio.gui.conduit.item.roundRobinEnabled=Round Robin Enabled
 enderio.gui.conduit.item.roundRobinDisabled=Round Robin Disabled
 enderio.gui.conduit.item.priority=Priority
 
-enderio.gui.conduit.item.fuzzy.disabled=Fuzzy Mode disabled
-enderio.gui.conduit.item.fuzzy.fuzzy_25=Fuzzy match for 25% damage
-enderio.gui.conduit.item.fuzzy.fuzzy_50=Fuzzy match for 50% damage
-enderio.gui.conduit.item.fuzzy.fuzzy_75=Fuzzy match for 75% damage
-enderio.gui.conduit.item.fuzzy.fuzzy_99=Fuzzy match for any damage
+enderio.gui.conduit.item.fuzzy.disabled=Damage Mode: Disabled
+enderio.gui.conduit.item.fuzzy.fuzzy_25=Damage Mode: Damaged by 25% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_50=Damage Mode: Damaged by 50% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_75=Damage Mode: Damaged by 75% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_99=Damage Mode: Damaged at least once
+enderio.gui.conduit.item.fuzzy.tooltip.0=Can work without items in the filter
+enderio.gui.conduit.item.fuzzy.tooltip.1=In this case its logic can be
+enderio.gui.conduit.item.fuzzy.tooltip.2=controlled by %s button
 
 enderio.gui.conduit.item.filterupgrade=Insert Item Filter
 enderio.gui.conduit.item.speedupgrade=Insert Item Conduit Speed Upgrades/Downgrade
@@ -1218,18 +1229,18 @@ enderio.gui.conduit.fluid.blacklist=Blacklist
 
 enderio.gui.conduit.gas.autoExtract=Auto Extract
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clear Weather
 enderio.gui.weather.task.rain=Rainy Weather
 enderio.gui.weather.task.storm=Thunderstorm
-enderio.gui.weather.requiredfluid=Required Fluid: %s mB
+enderio.gui.weather.requiredfluid=Required Fluid: %s L
 enderio.weatherObelisk.fuelTank=Barometric Flux Tank
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Soulbound
 description.enchantment.enderio.soulBound=Prevents item from being lost on death
 
-//Configuration
+#Configuration
 enderio.config.title=Ender IO Configuration
 
 enderio.config.power=Power Settings
@@ -1274,7 +1285,7 @@ enderio.config.fluid.tooltip=Pure liquid energy!
 enderio.config.spawner=PoweredSpawner Settings
 enderio.config.spawner.tooltip=I ran out of witty tooltips.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Dark Steel Armor
 enderio.category.tools=Tools
 enderio.keybind.glidertoggle=Glider Toggle

resources/assets/enderio/lang/es_AR.lang

@@ -1,20 +1,20 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Salida máx.
 enderio.power.generates=Genera
 enderio.power.generation_rate=a
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permite el acceso remoto a bloques cercanos. Se usa junto con el Ancla de Viaje o la Vara de Viaje.
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Manojo de Tuberías
 enderio.blockConduitFacade=Fachada para Tuberías
 item.enderio.itemConduitFacade.name=Fachada para Tuberías
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Tubería de Redstone Aislada
 enderio.itemLiquidConduit.name=Tubería de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Tubería de Fluidos Presurizada
 enderio.itemLiquidConduitEnder.name=Tubería de Fluidos de Ender
+# 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.itemLiquidConduit.lockedType=Tipo de fluido restringido a
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido indefinido
 enderio.itemLiquidConduit.lockedWaila=Restringido a
@@ -98,10 +104,10 @@ enderio.itemMEConduit.name=Tubería ME
 enderio.itemMEConduitDense.name=Tubería ME Densa
 enderio.itemMEConduit.channelsUsed={0,number} de {1,number} canales
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiales
 enderio.silicon.name=Silicona
 enderio.conduitBinder.name=Pegamento de Tubería
@@ -118,7 +124,7 @@ enderio.lightBlocker=Bloquea la luz
 enderio.tooltip.isBeaconBase=Se puede usar como base para el Faro
 enderio.dustWheat.name=Harina
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Cubo de Destilado de Nutrientes
@@ -136,16 +142,16 @@ fluid.eio.xpjuice=XP Líquida
 tile.fluid.eio.xpjuice.name=XP Líquida
 item.bucketXpjuice.name=Cubo de XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalles del Combustible
 enderio.fuel.tooltip.burnTime=tiempo de combustión {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Grados por Cubo
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chasis de Máquina
 enderio.basicGear.name=Engranaje Básico
@@ -163,7 +169,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Reducción de Energía
 tile.blockReinforcedObsidian.name=Obsidiana Reforzada
 tile.blockReinforcedObsidian.tooltip.common.line1=A prueba de Withers
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Cristal Totalmente Transparente
@@ -175,7 +181,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Cristal Oscuro Transparente
 item.enderio.itemFusedQuartzFrame.name=Marco de Cuarzo Fundido
 enderio.itemPowderIngot=Polvos y Lingotes
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Aleación
 enderio.electricalSteel.name=Acero Eléctrico
 enderio.energeticAlloy.name=Aleación Energética
@@ -198,7 +204,7 @@ tile.enderio.vibrantNugget.name=Bloque de Pepita de Aleación Vibrante
 tile.enderio.darkSteel.name=Bloque de Acero Oscuro
 tile.enderio.soularium.name=Bloque de Animarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Polvo de Carbón
 enderio.powderIron.name=Polvo de Hierro
 enderio.powderGold.name=Polvo de Oro
@@ -208,7 +214,7 @@ enderio.powderEnder.name=Polvo de Perla de Ender
 enderio.powderObsidian.name=Polvo de Obsidiana
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Condensador
 enderio.basicCapacitor.name=Condensador Básico
 enderio.activatedCapacitor.name=Condensador de Doble Capa
@@ -218,7 +224,7 @@ enderio.machine.tooltip.upgrade=Mejora de Máquinas
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta el almacenamiento de energía y la velocidad o rango de las máquinas.
 enderio.machine.tooltip.clearConfig=Atención: Hacer esto borrará toda la información guardada.
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Generador Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Quema combustible sólido para generar energía.
 tile.blockStirlingGenerator.tooltip.detailed.line2=Puede mejorarse para aumentar la energía de salida y la eficiencia con condensadores.
@@ -473,7 +479,7 @@ enderio.gui.inventorypanel.tooltip.sync=Sinc. NEI
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Presión Oscura
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Solo se activa con jugadores.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Se puede pintar en la Maquina de Pintar. Invisible cuando se pinta con Cristal Totalmente Transparente.
@@ -490,7 +496,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line1=Dura mucho más que el yunque co
 tile.blockDarkSteelLadder.name=Escalera de Mano de Acero Oscuro
 tile.blockDarkSteelLadder.tooltip.common.line1=Más rápida que la Escalera de Mano común.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancla de Viaje
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite la teletransportación entre anclas.
 tile.blockTravelAnchor.tooltip.detailed.line2=Colócate en una ancla, mira hacia otra ancla y salta para teletransportarte.
@@ -520,7 +526,7 @@ enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
 enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
 enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintar
 enderio.blockPainter.paintedWith=Pintado con:
 tile.blockPaintedFence.name=Valla Pintada
@@ -536,7 +542,7 @@ enderio.painter.tooltip.wasPainted=§o¿Qué pensabas que haría eso?
 tile.blockPainter.tooltip.detailed.line1=Se usa para pintar: 
 tile.blockPainter.tooltip.detailed.line2=Fachadas para tuberías, escaleras, vallas, puertas de valla, losas, muros de roca, marcos de cristal, piedras luminosas, alfombras, placas de presión de acero oscuro y anclas de viaje.
 
-//Items
+#Items
 item.itemYetaWrench.name=Llave Inglesa Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Oculta fachadas para tuberías cuando se selecciona.
 item.itemYetaWrench.tooltip.detailed.line2=Shift+Clic-derecho para romper máquinas y tuberías instantáneamente.
@@ -574,7 +580,7 @@ skullSentientEnder.name=Sensor Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Yelmo Oscuro
 item.darkSteel_chestplate.name=Pechera Oscura
 item.darkSteel_leggings.name=Mallas Oscuras
@@ -697,7 +703,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Genera energía a tra
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Genera energía a través del Sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada máx.:
 enderio.gui.simple.out=Salida máx.:
@@ -711,7 +717,7 @@ enderio.gui.receive=Recibe
 enderio.gui.send=Envía
 enderio.gui.sendReceive=Envia y Recibe 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Siempre Activo
 enderio.gui.tooltip.redstoneControlMode.on=Activo con señal
@@ -757,7 +763,7 @@ enderio.gui.machine.side.up=Arriba
 enderio.gui.machine.side.down=Abajo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Control de Máquinas
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir señal cuando el almacenamiento es inferior 
@@ -772,7 +778,7 @@ enderio.gui.powerMonitor.monHeading3=Búfers de Máquinas
 enderio.gui.powerMonitor.monHeading4=Salida media cada 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada media cada 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sistema de Energía
 enderio.gui.mjReader.conduitBuffer=Búfer Interno
 enderio.gui.mjReader.requestRange=Rango de solicitud por tic
@@ -791,7 +797,7 @@ enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
 enderio.gui.mjReader.receiveItem1=Puede recibir
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
 enderio.gui.capBank.outputRs=Modo de Salida de Redstone
 enderio.gui.capBank.maxIo=Máx. I/O
@@ -800,7 +806,7 @@ enderio.gui.capBank.maxOutput=Salida máx.
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Salida
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Añadir Canal
@@ -812,37 +818,37 @@ enderio.gui.trans.itemMode=Modo de Objetos
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Horno
 enderio.gui.alloy.mode.all=Fundir Todo
 enderio.gui.alloy.mode.alloy=Solo Aleaciones
 enderio.gui.alloy.mode.furnace=Solo Horno
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Fuerza de succión
 enderio.gui.vacuum.header.chest=Cofre Aspirador
 enderio.gui.vacuum.header.filter=Filtro de Objetos
 enderio.gui.vacuum.header.range=Rango
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Salida
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Verter Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Verter Tanque de Salida
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustible
 enderio.combustionGenerator.output=Generando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generando:
 enderio.stirlingGenerator.burnRate=Índice de consumo:
 enderio.stirlingGenerator.upgradeslot=Ranura de Mejora
 enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de eficiencia
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Solo
 enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
 enderio.gui.travelAccessable.public=Público
@@ -859,12 +865,12 @@ enderio.gui.telepad.configure.travel=Ajustes de Viaje
 enderio.gui.telepad.configure.telepad=Ajustes del Telepad
 enderio.gui.telepad.blocked=¡Teletransporte Bloqueado!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Muestra el alcance
 enderio.gui.spawnGurad.hideRange=Oculta el alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada/Salida
 enderio.gui.conduit.ioMode.input=Extraer
@@ -914,17 +920,16 @@ enderio.gui.conduit.fluid.blacklist=Lista Negra
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extracción
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clima Despejado
 enderio.gui.weather.task.rain=Clima Lluvioso
 enderio.gui.weather.task.storm=Tormenta
-enderio.gui.weather.requireditem=Objetos necesarios: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Ligado al Alma
 description.enchantment.enderio.soulBound=Evita que se pierdan los objetos al morir.
 
-//Configuration
+#Configuration
 enderio.config.title=Configuración Ender IO
 
 enderio.config.power=Ajustes de Energía
@@ -969,7 +974,7 @@ enderio.config.fluid.tooltip=¡Energía líquida en estado puro!
 enderio.config.spawner=Ajustes del Spawner Eléctrico
 enderio.config.spawner.tooltip=Me he quedado sin descripciones ingeniosas.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armadura de Acero Oscuro
 enderio.category.tools=Herramientas
 enderio.keybind.glidertoggle=Activar/Desactivar Planeador

resources/assets/enderio/lang/es_ES.lang

@@ -1,22 +1,22 @@
-//***  Ender IO *****// 
+#***  Ender IO ***#
 
-//Traducción española por @SamerNieve
+#Traducción española por @SamerNieve
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Salida máx.
 enderio.power.generates=Genera
 enderio.power.generation_rate=a
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permite el acceso remoto a bloques cercanos. Se usa junto con el Ancla de Viaje o la Vara de Viaje.
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Manojo de Tuberías
 enderio.blockConduitFacade=Fachada para Tuberías
 item.enderio.itemConduitFacade.name=Fachada para Tuberías
@@ -38,6 +38,12 @@ enderio.itemRedstoneConduitInsulated.name=Tubería de Redstone Aislada
 enderio.itemLiquidConduit.name=Tubería de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Tubería de Fluidos Presurizada
 enderio.itemLiquidConduitEnder.name=Tubería de Fluidos de Ender
+# 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.itemLiquidConduit.lockedType=Tipo de fluido restringido a
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido indefinido
 enderio.itemLiquidConduit.lockedWaila=Restringido a
@@ -100,10 +106,10 @@ enderio.itemMEConduit.name=Tubería ME
 enderio.itemMEConduitDense.name=Tubería ME Densa
 enderio.itemMEConduit.channelsUsed={0,number} de {1,number} canales
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiales
 enderio.silicon.name=Silicona
 enderio.conduitBinder.name=Pegamento de Tubería
@@ -120,7 +126,7 @@ enderio.lightBlocker=Bloquea la luz
 enderio.tooltip.isBeaconBase=Se puede usar como base para el Faro
 enderio.dustWheat.name=Harina
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Cubo de Destilado de Nutrientes
@@ -138,16 +144,16 @@ fluid.eio.xpjuice=XP Líquida
 tile.fluid.eio.xpjuice.name=XP Líquida
 item.bucketXpjuice.name=Cubo de XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalles del Combustible
 enderio.fuel.tooltip.burnTime=tiempo de combustión {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Grados por Cubo
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chasis de Máquina
 enderio.basicGear.name=Engranaje Básico
@@ -165,7 +171,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Reducción de Energía
 tile.blockReinforcedObsidian.name=Obsidiana Reforzada
 tile.blockReinforcedObsidian.tooltip.common.line1=A prueba de Withers
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Cristal Totalmente Transparente
@@ -177,7 +183,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Cristal Oscuro Transparente
 item.enderio.itemFusedQuartzFrame.name=Marco de Cuarzo Fundido
 enderio.itemPowderIngot=Polvos y Lingotes
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Aleación
 enderio.electricalSteel.name=Acero Eléctrico
 enderio.energeticAlloy.name=Aleación Energética
@@ -200,7 +206,7 @@ tile.enderio.vibrantNugget.name=Bloque de Pepita de Aleación Vibrante
 tile.enderio.darkSteel.name=Bloque de Acero Oscuro
 tile.enderio.soularium.name=Bloque de Animarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Polvo de Carbón
 enderio.powderIron.name=Polvo de Hierro
 enderio.powderGold.name=Polvo de Oro
@@ -210,7 +216,7 @@ enderio.powderEnder.name=Polvo de Perla de Ender
 enderio.powderObsidian.name=Polvo de Obsidiana
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Condensador
 enderio.basicCapacitor.name=Condensador Básico
 enderio.activatedCapacitor.name=Condensador de Doble Capa
@@ -220,7 +226,7 @@ enderio.machine.tooltip.upgrade=Mejora de Máquinas
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta el almacenamiento de energía y la velocidad o rango de las máquinas.
 enderio.machine.tooltip.clearConfig=Atención: Hacer esto borrará toda la información guardada.
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Generador Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Quema combustible sólido para generar energía.
 tile.blockStirlingGenerator.tooltip.detailed.line2=Puede mejorarse para aumentar la energía de salida y la eficiencia con condensadores.
@@ -475,7 +481,7 @@ enderio.gui.inventorypanel.tooltip.sync=Sinc. NEI
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Presión Oscura
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Solo se activa con jugadores.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Se puede pintar en la Maquina de Pintar. Invisible cuando se pinta con Cristal Totalmente Transparente.
@@ -492,7 +498,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line1=Dura mucho más que el yunque co
 tile.blockDarkSteelLadder.name=Escalera de Mano de Acero Oscuro
 tile.blockDarkSteelLadder.tooltip.common.line1=Más rápida que la Escalera de Mano común.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancla de Viaje
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite la teletransportación entre anclas.
 tile.blockTravelAnchor.tooltip.detailed.line2=Colócate en una ancla, mira hacia otra ancla y salta para teletransportarte.
@@ -522,7 +528,7 @@ enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
 enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
 enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintar
 enderio.blockPainter.paintedWith=Pintado con:
 tile.blockPaintedFence.name=Valla Pintada
@@ -538,7 +544,7 @@ enderio.painter.tooltip.wasPainted=§o¿Qué pensabas que haría eso?
 tile.blockPainter.tooltip.detailed.line1=Se usa para pintar: 
 tile.blockPainter.tooltip.detailed.line2=Fachadas para tuberías, escaleras, vallas, puertas de valla, losas, muros de roca, marcos de cristal, piedras luminosas, alfombras, placas de presión de acero oscuro y anclas de viaje.
 
-//Items
+#Items
 item.itemYetaWrench.name=Llave Inglesa Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Oculta fachadas para tuberías cuando se selecciona.
 item.itemYetaWrench.tooltip.detailed.line2=Shift+Clic-derecho para romper máquinas y tuberías instantáneamente.
@@ -576,7 +582,7 @@ skullSentientEnder.name=Sensor Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Yelmo Oscuro
 item.darkSteel_chestplate.name=Pechera Oscura
 item.darkSteel_leggings.name=Mallas Oscuras
@@ -699,7 +705,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Genera energía a tra
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Genera energía a través del Sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada máx.:
 enderio.gui.simple.out=Salida máx.:
@@ -713,7 +719,7 @@ enderio.gui.receive=Recibe
 enderio.gui.send=Envía
 enderio.gui.sendReceive=Envia y Recibe 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Siempre Activo
 enderio.gui.tooltip.redstoneControlMode.on=Activo con señal
@@ -759,7 +765,7 @@ enderio.gui.machine.side.up=Arriba
 enderio.gui.machine.side.down=Abajo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Control de Máquinas
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir señal cuando el almacenamiento es inferior 
@@ -774,7 +780,7 @@ enderio.gui.powerMonitor.monHeading3=Búfers de Máquinas
 enderio.gui.powerMonitor.monHeading4=Salida media cada 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada media cada 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sistema de Energía
 enderio.gui.mjReader.conduitBuffer=Búfer Interno
 enderio.gui.mjReader.requestRange=Rango de solicitud por tic
@@ -793,7 +799,7 @@ enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
 enderio.gui.mjReader.receiveItem1=Puede recibir
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
 enderio.gui.capBank.outputRs=Modo de Salida de Redstone
 enderio.gui.capBank.maxIo=Máx. I/O
@@ -802,7 +808,7 @@ enderio.gui.capBank.maxOutput=Salida máx.
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Salida
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Añadir Canal
@@ -814,37 +820,37 @@ enderio.gui.trans.itemMode=Modo de Objetos
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Horno
 enderio.gui.alloy.mode.all=Fundir Todo
 enderio.gui.alloy.mode.alloy=Solo Aleaciones
 enderio.gui.alloy.mode.furnace=Solo Horno
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Fuerza de succión
 enderio.gui.vacuum.header.chest=Cofre Aspirador
 enderio.gui.vacuum.header.filter=Filtro de Objetos
 enderio.gui.vacuum.header.range=Rango
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Salida
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Verter Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Verter Tanque de Salida
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustible
 enderio.combustionGenerator.output=Generando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generando:
 enderio.stirlingGenerator.burnRate=Índice de consumo:
 enderio.stirlingGenerator.upgradeslot=Ranura de Mejora
 enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de eficiencia
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Solo
 enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
 enderio.gui.travelAccessable.public=Público
@@ -861,12 +867,12 @@ enderio.gui.telepad.configure.travel=Ajustes de Viaje
 enderio.gui.telepad.configure.telepad=Ajustes del Telepad
 enderio.gui.telepad.blocked=¡Teletransporte Bloqueado!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Muestra el alcance
 enderio.gui.spawnGurad.hideRange=Oculta el alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada/Salida
 enderio.gui.conduit.ioMode.input=Extraer
@@ -916,17 +922,16 @@ enderio.gui.conduit.fluid.blacklist=Lista Negra
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extracción
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clima Despejado
 enderio.gui.weather.task.rain=Clima Lluvioso
 enderio.gui.weather.task.storm=Tormenta
-enderio.gui.weather.requireditem=Objetos necesarios: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Ligado al Alma
 description.enchantment.enderio.soulBound=Evita que se pierdan los objetos al morir.
 
-//Configuration
+#Configuration
 enderio.config.title=Configuración Ender IO
 
 enderio.config.power=Ajustes de Energía
@@ -971,7 +976,7 @@ enderio.config.fluid.tooltip=¡Energía líquida en estado puro!
 enderio.config.spawner=Ajustes del Spawner Eléctrico
 enderio.config.spawner.tooltip=Me he quedado sin descripciones ingeniosas.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armadura de Acero Oscuro
 enderio.category.tools=Herramientas
 enderio.keybind.glidertoggle=Activar/Desactivar Planeador

resources/assets/enderio/lang/es_MX.lang

@@ -1,20 +1,20 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Salida máx.
 enderio.power.generates=Genera
 enderio.power.generation_rate=a
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permite el acceso remoto a bloques cercanos. Se usa junto con el Ancla de Viaje o la Vara de Viaje.
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Manojo de Tuberías
 enderio.blockConduitFacade=Fachada para Tuberías
 item.enderio.itemConduitFacade.name=Fachada para Tuberías
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Tubería de Redstone Aislada
 enderio.itemLiquidConduit.name=Tubería de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Tubería de Fluidos Presurizada
 enderio.itemLiquidConduitEnder.name=Tubería de Fluidos de Ender
+# 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.itemLiquidConduit.lockedType=Tipo de fluido restringido a
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido indefinido
 enderio.itemLiquidConduit.lockedWaila=Restringido a
@@ -98,10 +104,10 @@ enderio.itemMEConduit.name=Tubería ME
 enderio.itemMEConduitDense.name=Tubería ME Densa
 enderio.itemMEConduit.channelsUsed={0,number} de {1,number} canales
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiales
 enderio.silicon.name=Silicona
 enderio.conduitBinder.name=Pegamento de Tubería
@@ -118,7 +124,7 @@ enderio.lightBlocker=Bloquea la luz
 enderio.tooltip.isBeaconBase=Se puede usar como base para el Faro
 enderio.dustWheat.name=Harina
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Cubo de Destilado de Nutrientes
@@ -136,16 +142,16 @@ fluid.eio.xpjuice=XP Líquida
 tile.fluid.eio.xpjuice.name=XP Líquida
 item.bucketXpjuice.name=Cubo de XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalles del Combustible
 enderio.fuel.tooltip.burnTime=tiempo de combustión {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Grados por Cubo
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chasis de Máquina
 enderio.basicGear.name=Engranaje Básico
@@ -163,7 +169,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Reducción de Energía
 tile.blockReinforcedObsidian.name=Obsidiana Reforzada
 tile.blockReinforcedObsidian.tooltip.common.line1=A prueba de Withers
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Cristal Totalmente Transparente
@@ -175,7 +181,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Cristal Oscuro Transparente
 item.enderio.itemFusedQuartzFrame.name=Marco de Cuarzo Fundido
 enderio.itemPowderIngot=Polvos y Lingotes
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Aleación
 enderio.electricalSteel.name=Acero Eléctrico
 enderio.energeticAlloy.name=Aleación Energética
@@ -198,7 +204,7 @@ tile.enderio.vibrantNugget.name=Bloque de Pepita de Aleación Vibrante
 tile.enderio.darkSteel.name=Bloque de Acero Oscuro
 tile.enderio.soularium.name=Bloque de Animarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Polvo de Carbón
 enderio.powderIron.name=Polvo de Hierro
 enderio.powderGold.name=Polvo de Oro
@@ -208,7 +214,7 @@ enderio.powderEnder.name=Polvo de Perla de Ender
 enderio.powderObsidian.name=Polvo de Obsidiana
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Condensador
 enderio.basicCapacitor.name=Condensador Básico
 enderio.activatedCapacitor.name=Condensador de Doble Capa
@@ -218,7 +224,7 @@ enderio.machine.tooltip.upgrade=Mejora de Máquinas
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta el almacenamiento de energía y la velocidad o rango de las máquinas.
 enderio.machine.tooltip.clearConfig=Atención: Hacer esto borrará toda la información guardada.
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Generador Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Quema combustible sólido para generar energía.
 tile.blockStirlingGenerator.tooltip.detailed.line2=Puede mejorarse para aumentar la energía de salida y la eficiencia con condensadores.
@@ -473,7 +479,7 @@ enderio.gui.inventorypanel.tooltip.sync=Sinc. NEI
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Presión Oscura
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Solo se activa con jugadores.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Se puede pintar en la Maquina de Pintar. Invisible cuando se pinta con Cristal Totalmente Transparente.
@@ -490,7 +496,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line1=Dura mucho más que el yunque co
 tile.blockDarkSteelLadder.name=Escalera de Mano de Acero Oscuro
 tile.blockDarkSteelLadder.tooltip.common.line1=Más rápida que la Escalera de Mano común.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancla de Viaje
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite la teletransportación entre anclas.
 tile.blockTravelAnchor.tooltip.detailed.line2=Colócate en una ancla, mira hacia otra ancla y salta para teletransportarte.
@@ -520,7 +526,7 @@ enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
 enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
 enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintar
 enderio.blockPainter.paintedWith=Pintado con:
 tile.blockPaintedFence.name=Valla Pintada
@@ -536,7 +542,7 @@ enderio.painter.tooltip.wasPainted=§o¿Qué pensabas que haría eso?
 tile.blockPainter.tooltip.detailed.line1=Se usa para pintar: 
 tile.blockPainter.tooltip.detailed.line2=Fachadas para tuberías, escaleras, vallas, puertas de valla, losas, muros de roca, marcos de cristal, piedras luminosas, alfombras, placas de presión de acero oscuro y anclas de viaje.
 
-//Items
+#Items
 item.itemYetaWrench.name=Llave Inglesa Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Oculta fachadas para tuberías cuando se selecciona.
 item.itemYetaWrench.tooltip.detailed.line2=Shift+Clic-derecho para romper máquinas y tuberías instantáneamente.
@@ -574,7 +580,7 @@ skullSentientEnder.name=Sensor Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Yelmo Oscuro
 item.darkSteel_chestplate.name=Pechera Oscura
 item.darkSteel_leggings.name=Mallas Oscuras
@@ -697,7 +703,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Genera energía a tra
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Genera energía a través del Sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada máx.:
 enderio.gui.simple.out=Salida máx.:
@@ -711,7 +717,7 @@ enderio.gui.receive=Recibe
 enderio.gui.send=Envía
 enderio.gui.sendReceive=Envia y Recibe 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Siempre Activo
 enderio.gui.tooltip.redstoneControlMode.on=Activo con señal
@@ -757,7 +763,7 @@ enderio.gui.machine.side.up=Arriba
 enderio.gui.machine.side.down=Abajo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Control de Máquinas
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir señal cuando el almacenamiento es inferior 
@@ -772,7 +778,7 @@ enderio.gui.powerMonitor.monHeading3=Búfers de Máquinas
 enderio.gui.powerMonitor.monHeading4=Salida media cada 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada media cada 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sistema de Energía
 enderio.gui.mjReader.conduitBuffer=Búfer Interno
 enderio.gui.mjReader.requestRange=Rango de solicitud por tic
@@ -791,7 +797,7 @@ enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
 enderio.gui.mjReader.receiveItem1=Puede recibir
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
 enderio.gui.capBank.outputRs=Modo de Salida de Redstone
 enderio.gui.capBank.maxIo=Máx. I/O
@@ -800,7 +806,7 @@ enderio.gui.capBank.maxOutput=Salida máx.
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Salida
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Añadir Canal
@@ -812,37 +818,37 @@ enderio.gui.trans.itemMode=Modo de Objetos
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Horno
 enderio.gui.alloy.mode.all=Fundir Todo
 enderio.gui.alloy.mode.alloy=Solo Aleaciones
 enderio.gui.alloy.mode.furnace=Solo Horno
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Fuerza de succión
 enderio.gui.vacuum.header.chest=Cofre Aspirador
 enderio.gui.vacuum.header.filter=Filtro de Objetos
 enderio.gui.vacuum.header.range=Rango
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Salida
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Verter Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Verter Tanque de Salida
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustible
 enderio.combustionGenerator.output=Generando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generando:
 enderio.stirlingGenerator.burnRate=Índice de consumo:
 enderio.stirlingGenerator.upgradeslot=Ranura de Mejora
 enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de eficiencia
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Solo
 enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
 enderio.gui.travelAccessable.public=Público
@@ -859,12 +865,12 @@ enderio.gui.telepad.configure.travel=Ajustes de Viaje
 enderio.gui.telepad.configure.telepad=Ajustes del Telepad
 enderio.gui.telepad.blocked=¡Teletransporte Bloqueado!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Muestra el alcance
 enderio.gui.spawnGurad.hideRange=Oculta el alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada/Salida
 enderio.gui.conduit.ioMode.input=Extraer
@@ -914,17 +920,16 @@ enderio.gui.conduit.fluid.blacklist=Lista Negra
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extracción
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clima Despejado
 enderio.gui.weather.task.rain=Clima Lluvioso
 enderio.gui.weather.task.storm=Tormenta
-enderio.gui.weather.requireditem=Objetos necesarios: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Ligado al Alma
 description.enchantment.enderio.soulBound=Evita que se pierdan los objetos al morir.
 
-//Configuration
+#Configuration
 enderio.config.title=Configuración Ender IO
 
 enderio.config.power=Ajustes de Energía
@@ -969,7 +974,7 @@ enderio.config.fluid.tooltip=¡Energía líquida en estado puro!
 enderio.config.spawner=Ajustes del Spawner Eléctrico
 enderio.config.spawner.tooltip=Me he quedado sin descripciones ingeniosas.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armadura de Acero Oscuro
 enderio.category.tools=Herramientas
 enderio.keybind.glidertoggle=Activar/Desactivar Planeador

resources/assets/enderio/lang/es_UY.lang

@@ -1,20 +1,20 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Salida máx.
 enderio.power.generates=Genera
 enderio.power.generation_rate=a
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permite el acceso remoto a bloques cercanos. Se usa junto con el Ancla de Viaje o la Vara de Viaje.
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Manojo de Tuberías
 enderio.blockConduitFacade=Fachada para Tuberías
 item.enderio.itemConduitFacade.name=Fachada para Tuberías
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Tubería de Redstone Aislada
 enderio.itemLiquidConduit.name=Tubería de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Tubería de Fluidos Presurizada
 enderio.itemLiquidConduitEnder.name=Tubería de Fluidos de Ender
+# 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.itemLiquidConduit.lockedType=Tipo de fluido restringido a
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido indefinido
 enderio.itemLiquidConduit.lockedWaila=Restringido a
@@ -98,10 +104,10 @@ enderio.itemMEConduit.name=Tubería ME
 enderio.itemMEConduitDense.name=Tubería ME Densa
 enderio.itemMEConduit.channelsUsed={0,number} de {1,number} canales
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiales
 enderio.silicon.name=Silicona
 enderio.conduitBinder.name=Pegamento de Tubería
@@ -118,7 +124,7 @@ enderio.lightBlocker=Bloquea la luz
 enderio.tooltip.isBeaconBase=Se puede usar como base para el Faro
 enderio.dustWheat.name=Harina
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Cubo de Destilado de Nutrientes
@@ -136,16 +142,16 @@ fluid.eio.xpjuice=XP Líquida
 tile.fluid.eio.xpjuice.name=XP Líquida
 item.bucketXpjuice.name=Cubo de XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalles del Combustible
 enderio.fuel.tooltip.burnTime=tiempo de combustión {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Grados por Cubo
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chasis de Máquina
 enderio.basicGear.name=Engranaje Básico
@@ -163,7 +169,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Reducción de Energía
 tile.blockReinforcedObsidian.name=Obsidiana Reforzada
 tile.blockReinforcedObsidian.tooltip.common.line1=A prueba de Withers
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Cristal Totalmente Transparente
@@ -175,7 +181,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Cristal Oscuro Transparente
 item.enderio.itemFusedQuartzFrame.name=Marco de Cuarzo Fundido
 enderio.itemPowderIngot=Polvos y Lingotes
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Aleación
 enderio.electricalSteel.name=Acero Eléctrico
 enderio.energeticAlloy.name=Aleación Energética
@@ -198,7 +204,7 @@ tile.enderio.vibrantNugget.name=Bloque de Pepita de Aleación Vibrante
 tile.enderio.darkSteel.name=Bloque de Acero Oscuro
 tile.enderio.soularium.name=Bloque de Animarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Polvo de Carbón
 enderio.powderIron.name=Polvo de Hierro
 enderio.powderGold.name=Polvo de Oro
@@ -208,7 +214,7 @@ enderio.powderEnder.name=Polvo de Perla de Ender
 enderio.powderObsidian.name=Polvo de Obsidiana
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Condensador
 enderio.basicCapacitor.name=Condensador Básico
 enderio.activatedCapacitor.name=Condensador de Doble Capa
@@ -218,7 +224,7 @@ enderio.machine.tooltip.upgrade=Mejora de Máquinas
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta el almacenamiento de energía y la velocidad o rango de las máquinas.
 enderio.machine.tooltip.clearConfig=Atención: Hacer esto borrará toda la información guardada.
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Generador Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Quema combustible sólido para generar energía.
 tile.blockStirlingGenerator.tooltip.detailed.line2=Puede mejorarse para aumentar la energía de salida y la eficiencia con condensadores.
@@ -473,7 +479,7 @@ enderio.gui.inventorypanel.tooltip.sync=Sinc. NEI
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Presión Oscura
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Solo se activa con jugadores.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Se puede pintar en la Maquina de Pintar. Invisible cuando se pinta con Cristal Totalmente Transparente.
@@ -490,7 +496,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line1=Dura mucho más que el yunque co
 tile.blockDarkSteelLadder.name=Escalera de Mano de Acero Oscuro
 tile.blockDarkSteelLadder.tooltip.common.line1=Más rápida que la Escalera de Mano común.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancla de Viaje
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite la teletransportación entre anclas.
 tile.blockTravelAnchor.tooltip.detailed.line2=Colócate en una ancla, mira hacia otra ancla y salta para teletransportarte.
@@ -520,7 +526,7 @@ enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
 enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
 enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintar
 enderio.blockPainter.paintedWith=Pintado con:
 tile.blockPaintedFence.name=Valla Pintada
@@ -536,7 +542,7 @@ enderio.painter.tooltip.wasPainted=§o¿Qué pensabas que haría eso?
 tile.blockPainter.tooltip.detailed.line1=Se usa para pintar: 
 tile.blockPainter.tooltip.detailed.line2=Fachadas para tuberías, escaleras, vallas, puertas de valla, losas, muros de roca, marcos de cristal, piedras luminosas, alfombras, placas de presión de acero oscuro y anclas de viaje.
 
-//Items
+#Items
 item.itemYetaWrench.name=Llave Inglesa Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Oculta fachadas para tuberías cuando se selecciona.
 item.itemYetaWrench.tooltip.detailed.line2=Shift+Clic-derecho para romper máquinas y tuberías instantáneamente.
@@ -574,7 +580,7 @@ skullSentientEnder.name=Sensor Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Yelmo Oscuro
 item.darkSteel_chestplate.name=Pechera Oscura
 item.darkSteel_leggings.name=Mallas Oscuras
@@ -697,7 +703,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Genera energía a tra
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Genera energía a través del Sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada máx.:
 enderio.gui.simple.out=Salida máx.:
@@ -711,7 +717,7 @@ enderio.gui.receive=Recibe
 enderio.gui.send=Envía
 enderio.gui.sendReceive=Envia y Recibe 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Siempre Activo
 enderio.gui.tooltip.redstoneControlMode.on=Activo con señal
@@ -757,7 +763,7 @@ enderio.gui.machine.side.up=Arriba
 enderio.gui.machine.side.down=Abajo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Control de Máquinas
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir señal cuando el almacenamiento es inferior 
@@ -772,7 +778,7 @@ enderio.gui.powerMonitor.monHeading3=Búfers de Máquinas
 enderio.gui.powerMonitor.monHeading4=Salida media cada 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada media cada 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sistema de Energía
 enderio.gui.mjReader.conduitBuffer=Búfer Interno
 enderio.gui.mjReader.requestRange=Rango de solicitud por tic
@@ -791,7 +797,7 @@ enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
 enderio.gui.mjReader.receiveItem1=Puede recibir
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
 enderio.gui.capBank.outputRs=Modo de Salida de Redstone
 enderio.gui.capBank.maxIo=Máx. I/O
@@ -800,7 +806,7 @@ enderio.gui.capBank.maxOutput=Salida máx.
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Salida
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Añadir Canal
@@ -812,37 +818,37 @@ enderio.gui.trans.itemMode=Modo de Objetos
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Horno
 enderio.gui.alloy.mode.all=Fundir Todo
 enderio.gui.alloy.mode.alloy=Solo Aleaciones
 enderio.gui.alloy.mode.furnace=Solo Horno
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Fuerza de succión
 enderio.gui.vacuum.header.chest=Cofre Aspirador
 enderio.gui.vacuum.header.filter=Filtro de Objetos
 enderio.gui.vacuum.header.range=Rango
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Salida
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Verter Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Verter Tanque de Salida
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustible
 enderio.combustionGenerator.output=Generando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generando:
 enderio.stirlingGenerator.burnRate=Índice de consumo:
 enderio.stirlingGenerator.upgradeslot=Ranura de Mejora
 enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de eficiencia
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Solo
 enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
 enderio.gui.travelAccessable.public=Público
@@ -859,12 +865,12 @@ enderio.gui.telepad.configure.travel=Ajustes de Viaje
 enderio.gui.telepad.configure.telepad=Ajustes del Telepad
 enderio.gui.telepad.blocked=¡Teletransporte Bloqueado!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Muestra el alcance
 enderio.gui.spawnGurad.hideRange=Oculta el alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada/Salida
 enderio.gui.conduit.ioMode.input=Extraer
@@ -914,17 +920,16 @@ enderio.gui.conduit.fluid.blacklist=Lista Negra
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extracción
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clima Despejado
 enderio.gui.weather.task.rain=Clima Lluvioso
 enderio.gui.weather.task.storm=Tormenta
-enderio.gui.weather.requireditem=Objetos necesarios: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Ligado al Alma
 description.enchantment.enderio.soulBound=Evita que se pierdan los objetos al morir.
 
-//Configuration
+#Configuration
 enderio.config.title=Configuración Ender IO
 
 enderio.config.power=Ajustes de Energía
@@ -969,7 +974,7 @@ enderio.config.fluid.tooltip=¡Energía líquida en estado puro!
 enderio.config.spawner=Ajustes del Spawner Eléctrico
 enderio.config.spawner.tooltip=Me he quedado sin descripciones ingeniosas.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armadura de Acero Oscuro
 enderio.category.tools=Herramientas
 enderio.keybind.glidertoggle=Activar/Desactivar Planeador

resources/assets/enderio/lang/es_VE.lang

@@ -1,20 +1,20 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=Salida máx.
 enderio.power.generates=Genera
 enderio.power.generation_rate=a
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permite el acceso remoto a bloques cercanos. Se usa junto con el Ancla de Viaje o la Vara de Viaje.
 
 item.enderio.itemEnderface.name=Enderface
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Manojo de Tuberías
 enderio.blockConduitFacade=Fachada para Tuberías
 item.enderio.itemConduitFacade.name=Fachada para Tuberías
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Tubería de Redstone Aislada
 enderio.itemLiquidConduit.name=Tubería de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Tubería de Fluidos Presurizada
 enderio.itemLiquidConduitEnder.name=Tubería de Fluidos de Ender
+# 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.itemLiquidConduit.lockedType=Tipo de fluido restringido a
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido indefinido
 enderio.itemLiquidConduit.lockedWaila=Restringido a
@@ -98,10 +104,10 @@ enderio.itemMEConduit.name=Tubería ME
 enderio.itemMEConduitDense.name=Tubería ME Densa
 enderio.itemMEConduit.channelsUsed={0,number} de {1,number} canales
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiales
 enderio.silicon.name=Silicona
 enderio.conduitBinder.name=Pegamento de Tubería
@@ -118,7 +124,7 @@ enderio.lightBlocker=Bloquea la luz
 enderio.tooltip.isBeaconBase=Se puede usar como base para el Faro
 enderio.dustWheat.name=Harina
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Cubo de Destilado de Nutrientes
@@ -136,16 +142,16 @@ fluid.eio.xpjuice=XP Líquida
 tile.fluid.eio.xpjuice.name=XP Líquida
 item.bucketXpjuice.name=Cubo de XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalles del Combustible
 enderio.fuel.tooltip.burnTime=tiempo de combustión {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Grados por Cubo
 enderio.gas.gasTick=Gas/t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chasis de Máquina
 enderio.basicGear.name=Engranaje Básico
@@ -163,7 +169,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Reducción de Energía
 tile.blockReinforcedObsidian.name=Obsidiana Reforzada
 tile.blockReinforcedObsidian.tooltip.common.line1=A prueba de Withers
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Cuarzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Cristal Totalmente Transparente
@@ -175,7 +181,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Cristal Oscuro Transparente
 item.enderio.itemFusedQuartzFrame.name=Marco de Cuarzo Fundido
 enderio.itemPowderIngot=Polvos y Lingotes
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Aleación
 enderio.electricalSteel.name=Acero Eléctrico
 enderio.energeticAlloy.name=Aleación Energética
@@ -198,7 +204,7 @@ tile.enderio.vibrantNugget.name=Bloque de Pepita de Aleación Vibrante
 tile.enderio.darkSteel.name=Bloque de Acero Oscuro
 tile.enderio.soularium.name=Bloque de Animarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Polvo de Carbón
 enderio.powderIron.name=Polvo de Hierro
 enderio.powderGold.name=Polvo de Oro
@@ -208,7 +214,7 @@ enderio.powderEnder.name=Polvo de Perla de Ender
 enderio.powderObsidian.name=Polvo de Obsidiana
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Condensador
 enderio.basicCapacitor.name=Condensador Básico
 enderio.activatedCapacitor.name=Condensador de Doble Capa
@@ -218,7 +224,7 @@ enderio.machine.tooltip.upgrade=Mejora de Máquinas
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta el almacenamiento de energía y la velocidad o rango de las máquinas.
 enderio.machine.tooltip.clearConfig=Atención: Hacer esto borrará toda la información guardada.
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Generador Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Quema combustible sólido para generar energía.
 tile.blockStirlingGenerator.tooltip.detailed.line2=Puede mejorarse para aumentar la energía de salida y la eficiencia con condensadores.
@@ -473,7 +479,7 @@ enderio.gui.inventorypanel.tooltip.sync=Sinc. NEI
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Presión Oscura
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Solo se activa con jugadores.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Se puede pintar en la Maquina de Pintar. Invisible cuando se pinta con Cristal Totalmente Transparente.
@@ -490,7 +496,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line1=Dura mucho más que el yunque co
 tile.blockDarkSteelLadder.name=Escalera de Mano de Acero Oscuro
 tile.blockDarkSteelLadder.tooltip.common.line1=Más rápida que la Escalera de Mano común.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancla de Viaje
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite la teletransportación entre anclas.
 tile.blockTravelAnchor.tooltip.detailed.line2=Colócate en una ancla, mira hacia otra ancla y salta para teletransportarte.
@@ -520,7 +526,7 @@ enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
 enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
 enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintar
 enderio.blockPainter.paintedWith=Pintado con:
 tile.blockPaintedFence.name=Valla Pintada
@@ -536,7 +542,7 @@ enderio.painter.tooltip.wasPainted=§o¿Qué pensabas que haría eso?
 tile.blockPainter.tooltip.detailed.line1=Se usa para pintar: 
 tile.blockPainter.tooltip.detailed.line2=Fachadas para tuberías, escaleras, vallas, puertas de valla, losas, muros de roca, marcos de cristal, piedras luminosas, alfombras, placas de presión de acero oscuro y anclas de viaje.
 
-//Items
+#Items
 item.itemYetaWrench.name=Llave Inglesa Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Oculta fachadas para tuberías cuando se selecciona.
 item.itemYetaWrench.tooltip.detailed.line2=Shift+Clic-derecho para romper máquinas y tuberías instantáneamente.
@@ -574,7 +580,7 @@ skullSentientEnder.name=Sensor Ender
 
 item.itemSpawnEggEnderIO.name=Spawn
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Yelmo Oscuro
 item.darkSteel_chestplate.name=Pechera Oscura
 item.darkSteel_leggings.name=Mallas Oscuras
@@ -697,7 +703,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Genera energía a tra
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Genera energía a través del Sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada máx.:
 enderio.gui.simple.out=Salida máx.:
@@ -711,7 +717,7 @@ enderio.gui.receive=Recibe
 enderio.gui.send=Envía
 enderio.gui.sendReceive=Envia y Recibe 
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Siempre Activo
 enderio.gui.tooltip.redstoneControlMode.on=Activo con señal
@@ -757,7 +763,7 @@ enderio.gui.machine.side.up=Arriba
 enderio.gui.machine.side.down=Abajo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Control de Máquinas
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir señal cuando el almacenamiento es inferior 
@@ -772,7 +778,7 @@ enderio.gui.powerMonitor.monHeading3=Búfers de Máquinas
 enderio.gui.powerMonitor.monHeading4=Salida media cada 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada media cada 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sistema de Energía
 enderio.gui.mjReader.conduitBuffer=Búfer Interno
 enderio.gui.mjReader.requestRange=Rango de solicitud por tic
@@ -791,7 +797,7 @@ enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
 enderio.gui.mjReader.receiveItem1=Puede recibir
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
 enderio.gui.capBank.outputRs=Modo de Salida de Redstone
 enderio.gui.capBank.maxIo=Máx. I/O
@@ -800,7 +806,7 @@ enderio.gui.capBank.maxOutput=Salida máx.
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Salida
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Añadir Canal
@@ -812,37 +818,37 @@ enderio.gui.trans.itemMode=Modo de Objetos
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Horno
 enderio.gui.alloy.mode.all=Fundir Todo
 enderio.gui.alloy.mode.alloy=Solo Aleaciones
 enderio.gui.alloy.mode.furnace=Solo Horno
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Fuerza de succión
 enderio.gui.vacuum.header.chest=Cofre Aspirador
 enderio.gui.vacuum.header.filter=Filtro de Objetos
 enderio.gui.vacuum.header.range=Rango
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Salida
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Verter Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Verter Tanque de Salida
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustible
 enderio.combustionGenerator.output=Generando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generando:
 enderio.stirlingGenerator.burnRate=Índice de consumo:
 enderio.stirlingGenerator.upgradeslot=Ranura de Mejora
 enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de eficiencia
 enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Solo
 enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
 enderio.gui.travelAccessable.public=Público
@@ -859,12 +865,12 @@ enderio.gui.telepad.configure.travel=Ajustes de Viaje
 enderio.gui.telepad.configure.telepad=Ajustes del Telepad
 enderio.gui.telepad.blocked=¡Teletransporte Bloqueado!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Muestra el alcance
 enderio.gui.spawnGurad.hideRange=Oculta el alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada/Salida
 enderio.gui.conduit.ioMode.input=Extraer
@@ -914,17 +920,16 @@ enderio.gui.conduit.fluid.blacklist=Lista Negra
 
 enderio.gui.conduit.gas.autoExtract=Auto-Extracción
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Clima Despejado
 enderio.gui.weather.task.rain=Clima Lluvioso
 enderio.gui.weather.task.storm=Tormenta
-enderio.gui.weather.requireditem=Objetos necesarios: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Ligado al Alma
 description.enchantment.enderio.soulBound=Evita que se pierdan los objetos al morir.
 
-//Configuration
+#Configuration
 enderio.config.title=Configuración Ender IO
 
 enderio.config.power=Ajustes de Energía
@@ -969,7 +974,7 @@ enderio.config.fluid.tooltip=¡Energía líquida en estado puro!
 enderio.config.spawner=Ajustes del Spawner Eléctrico
 enderio.config.spawner.tooltip=Me he quedado sin descripciones ingeniosas.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armadura de Acero Oscuro
 enderio.category.tools=Herramientas
 enderio.keybind.glidertoggle=Activar/Desactivar Planeador

resources/assets/enderio/lang/fr_FR.lang

@@ -1,6 +1,6 @@
-//*** Ender IO *****//
+#*** Ender IO ***#
 
-//Power
+#Power
 enderio.power.mj=MJ
 enderio.power.rf=RF
 enderio.power.tick=/t
@@ -8,19 +8,19 @@ enderio.power.maxOutput=Sortie Max
 enderio.power.generates=Génère
 enderio.power.generation_rate=à
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 enderio.blockEnderIo=Ender IO
 tile.blockEnderIo.tooltip.detailed.line1=Permet l'accès distant
 tile.blockEnderIo.tooltip.detailed.line2=aux blocs proches
 tile.blockEnderIo.tooltip.detailed.line3=Utilisé avec les Ancres de Voyage
 tile.blockEnderIo.tooltip.detailed.line4=ou le Bâton de Voyage
 
-enderio.itemEnderface=Masque d'Ender
+enderio.itemEnderface.name=Masque d'Ender
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Faisceau de Conduits
 enderio.blockConduitFacade=Façade
-enderio.itemConduitFacade=Façade
+item.enderio.itemConduitFacade.name=Façade
 item.enderio.itemConduitFacade.hardened.name=Façade Renforcée
 enderio.item.itemConduitFacade.tooltip.notpainted=Non Peinte
 item.enderio.itemConduitFacade.tooltip.detailed.line1=Peinte dans la Machine à enduction
@@ -29,17 +29,23 @@ item.enderio.itemConduitFacade.tooltip.detailed.line3=Invisible si Clé ou condu
 item.enderio.itemConduitFacade.tooltip.detailed.line4=en main
 item.enderio.itemConduitFacade.hardened.tooltip=Renforcée : Résiste à la casse et aux explosions
 
-enderio.itemPowerConduit=Conduit d'énergie
-enderio.itemPowerConduitEnhanced=Conduit d'énergie Amélioré
-enderio.itemPowerConduitEnder=Conduit d'énergie de l'Ender
+enderio.itemPowerConduit.name=Conduit d'énergie
+enderio.itemPowerConduitEnhanced.name=Conduit d'énergie Amélioré
+enderio.itemPowerConduitEnder.name=Conduit d'énergie de l'Ender
 
-enderio.itemRedstoneConduit=Conduit de Redstone
-enderio.itemRedstoneConduitSwitch=Interrupteur Redstone
-enderio.itemRedstoneConduitInsulated=Conduit de Redstone isolé
+enderio.itemRedstoneConduit.name=Conduit de Redstone
+enderio.itemRedstoneConduitSwitch.name=Interrupteur Redstone
+enderio.itemRedstoneConduitInsulated.name=Conduit de Redstone isolé
 
-enderio.itemLiquidConduit=Conduit pour fluides
+enderio.itemLiquidConduit.name=Conduit pour fluides
 enderio.itemLiquidConduitAdvanced.name=Conduit pour fluides préssurisé
 enderio.itemLiquidConduitEnder.name=Conduit pour fluides de l'Ender
+# 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.itemLiquidConduit.lockedType=Type de fluide verrouillé sur
 enderio.itemLiquidConduit.unlockedType=Type de fluide déverrouillé
 enderio.itemLiquidConduit.lockedWaila=Verrouillé sur
@@ -54,7 +60,7 @@ enderio.itemLiquidConduitEnder.tooltip.detailed.line1=Téléportation du fluide
 enderio.itemLiquidConduitEnder.tooltip.detailed.line2=permet de transporter plusieurs
 enderio.itemLiquidConduitEnder.tooltip.detailed.line3=fluides en même temps
 
-enderio.itemItemConduit=Conduit pour objets
+enderio.itemItemConduit.name=Conduit pour objets
 
 enderio.filterUpgradeBasic.name=Filtre d'objets basique
 enderio.filterUpgradeAdvanced.name=Filtre d'objets avancé
@@ -106,10 +112,10 @@ enderio.itemMEConduit.name=Conduit ME
 enderio.itemMEConduitDense.name=Conduit ME Dense
 enderio.itemMEConduit.channelsUsed={0,number} sur {1,number} Canaux
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Wither squelette
 
-//Materials
+#Materials
 enderio.itemMaterial=Matériaux
 enderio.silicon=Silicium
 enderio.conduitBinder=Amalgame de Conduit
@@ -124,7 +130,7 @@ enderio.blastResistant=Résistant(e) aux explosion
 enderio.lightEmitter=Emet de la lumière
 enderio.tooltip.isBeaconBase=Peut être utilisé comme base de balise
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Distillat de nutriments
 tile.fluid.nutrient_distillation.name=Distillat de nutriments
 item.bucketNutrient_distillation.name=Sceau de Distillat de nutriments
@@ -142,16 +148,16 @@ fluid.eio.xpjuice=Exp. Liquide
 tile.fluid.eio.xpjuice.name=Exp. Liquide
 item.bucketXpjuice.name=Sceau d'Exp. Liquide
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Détails du carburant
 enderio.fuel.tooltip.burnTime=temps de combustion {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Liquide de refroidissement
 enderio.coolant.tooltip.degreesPerBucket=Degrés par sceau
 enderio.gas.gasTick=Gaz/t
 
-//Materials
+#Materials
 enderio.itemMachinePart=Pièces Détachées
 enderio.machineChassi.name=Chassis pour machine
 enderio.basicGear.name=Roue basique
@@ -169,7 +175,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Réduction d'énergie
 tile.blockReinforcedObsidian.name=Obsidienne renforcée
 tile.blockReinforcedObsidian.tooltip.common.line1=Résistant au Wither
 
-//Quartz / Glass
+#Quartz / Glass
 enderio.blockFusedQuartz=Quartz Fusionné
 enderio.blockFusedQuartz.fusedQuartz.name=Quartz Fusionné
 enderio.blockFusedQuartz.fusedGlass.name=Verre semi-transparent
@@ -179,7 +185,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=Verre semi-transparent illum
 enderio.itemFusedQuartzFrame=Cadre de Quartz uni
 enderio.itemPowderIngot=Poudres & Lingots
 
-//Alloys
+#Alloys
 enderio.itemAlloy=Alliage
 enderio.electricalSteel=Acier Électrique
 enderio.energeticAlloy=Alliage Énergetique
@@ -202,7 +208,7 @@ tile.enderio.vibrantNugget.name=Bloc de Pépites étincelantes
 tile.enderio.darkSteel.name=Bloc d'Acier Sombre
 tile.enderio.soularium.name=Bloc d'Âmarium
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal=Poudre de charbon
 enderio.powderIron=Poudre de Fer
 enderio.powderGold=Poudre d'Or
@@ -212,7 +218,7 @@ enderio.powderEnder=Poudre de Perle du Néant
 enderio.powderObsidian.name=Poudre d'Obsidienne
 enderio.ingotEnderiumBase.name=Base d'Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor=Condensateur
 enderio.basicCapacitor=Condensateur de base
 enderio.activatedCapacitor=Condensateur Double-Couche
@@ -223,7 +229,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Augmente le stockage d'En
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=la vitesse / portée des machines
 enderio.machine.tooltip.clearConfig=Cela va effacer la configuration !
 
-//Machines
+#Machines
 enderio.blockStirlingGenerator=Générateur Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Brûle les combustibles solides pour générer de l'énergie
 tile.blockStirlingGenerator.tooltip.detailed.line2=Peut être améliorer pour augmenter la production
@@ -468,7 +474,7 @@ tile.blockBuffer.creative.name=Stock Tampon Créatif
 
 enderio.machine.tooltip.configured=(Configuré)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Plaque de pression Sombre
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Activée seuleemnt par les joueurs
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Peut être painte dans la machine à enduction,
@@ -490,7 +496,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=que l'enclume Vanilla
 tile.blockDarkSteelLadder.name=Echelle en Acier Sombre
 tile.blockDarkSteelLadder.tooltip.common.line1=Plus rapides que les échelles habituelles
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ancre de Voyage
 tile.blockTravelAnchor.tooltip.detailed.line1=Permet la téléportation entre les Ancres
 tile.blockTravelAnchor.tooltip.detailed.line2=Placez-vous sur une Ancre, regardez-en une
@@ -525,7 +531,7 @@ enderio.itemCoordSelector.chat.setCoords=Définir Coords: %s
 enderio.itemCoordSelector.chat.newDimension=Nouvelle Dimension: %s%s
 enderio.itemCoordSelector.chat.setDimension=Définir Dimension: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Machine à Enduction
 enderio.blockPainter.paintedWith=Peint(e) avec :
 tile.blockPaintedFence.name=Barrière peinte
@@ -545,7 +551,7 @@ tile.blockPainter.tooltip.detailed.line4=Cadre en Verre, Pierre lumineuse, Tapis
 tile.blockPainter.tooltip.detailed.line5=Plaque de pression en Acier Sombre,
 tile.blockPainter.tooltip.detailed.line6=Ancre de Voyage
 
-//Items
+#Items
 enderio.itemYetaWrench=Clé Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Cache les Façades lorsque tenue
 item.itemYetaWrench.tooltip.detailed.line2=Shift-Clic-D pour démonter les machines
@@ -591,7 +597,7 @@ skullEnderResonator.name=Résonateur de l'Ender
 
 item.itemSpawnEggEnderIO.name=Faire apparaître
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Casque Sombre
 item.darkSteel_chestplate.name=Plastron Sombre
 item.darkSteel_leggings.name=Jambières Sombres
@@ -718,7 +724,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Génère de l'énergi
 enderio.darksteel.upgrade.solar_two.name=Solaire II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Génère de l'énergie avec le soleil.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrée Max :
 enderio.gui.simple.out=Sortie Max :
@@ -732,7 +738,7 @@ enderio.gui.receive=Recevoir
 enderio.gui.send=Envoyer
 enderio.gui.sendReceive=Envoyer & Recevoir
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Mode Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Toujours Actif
 enderio.gui.tooltip.redstoneControlMode.on=Actif avec signal
@@ -779,7 +785,7 @@ enderio.gui.machine.side.up=Haut
 enderio.gui.machine.side.down=Bas
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Contrôle du Moteur
 enderio.gui.powerMonitor.emit=Émettre
 enderio.gui.powerMonitor.engineSection1=Émettre un signal si tampon moins
@@ -794,7 +800,7 @@ enderio.gui.powerMonitor.monHeading3=Tampon des Machines
 enderio.gui.powerMonitor.monHeading4=Sortie moyenne sur 5 secondes
 enderio.gui.powerMonitor.monHeading5=Entrée moyenne sur 5 secondes
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Réseau Électrique
 enderio.gui.mjReader.conduitBuffer=Tampon Interne
 enderio.gui.mjReader.requestRange=Demande par tick
@@ -813,7 +819,7 @@ enderio.gui.mjReader.receiveItems=Peut recevoir des objet de :
 enderio.gui.mjReader.receiveItem1=Peut recevoir
 enderio.gui.mjReader.receiveItem2=de :
 
-//CapacitorBank
+#CapacitorBank
 enderio.gui.capBank.inputRs=Mode Redstone Entrée
 enderio.gui.capBank.outputRs=Mode Redstone Sortie
 enderio.gui.capBank.maxIo=Max E/S
@@ -822,7 +828,7 @@ enderio.gui.capBank.maxOutput=Sortie Max
 enderio.gui.capBank.inputMode=Entrée
 enderio.gui.capBank.outputMode=Sortie
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Public
 enderio.gui.trans.privateChannel=Canal Privé
 enderio.gui.trans.addChannel=Ajouter Canal
@@ -834,37 +840,37 @@ enderio.gui.trans.itemMode=Mode Objets
 enderio.gui.trans.publicHeading=Public
 enderio.gui.trans.privateHeading=Privé
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Mode de Fonderie
 enderio.gui.alloy.mode.all=Tous
 enderio.gui.alloy.mode.alloy=Alliages Seulement
 enderio.gui.alloy.mode.furnace=Fourneau Seulement
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Force d'aspiration
 enderio.gui.vacuum.header.chest=Coffre Aspirant
 enderio.gui.vacuum.header.filter=Filtre d'objet
 enderio.gui.vacuum.header.range=Portée
 
-//Vat
+#Vat
 enderio.vat.outputTank=Réservoir de Sortie
 enderio.vat.inputTank=réservoir d'Entrée
 enderio.gui.machine.vat.dump.1=Jeter l'Entrée
 enderio.gui.machine.vat.dump.2=Jeter la Sortie
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Liquide de Refroidissement
 enderio.combustionGenerator.fuelTank=Carburant
 enderio.combustionGenerator.output=Génère :
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Génère :
 enderio.stirlingGenerator.burnRate=Ratio de Combustion:
 enderio.stirlingGenerator.upgradeslot=Empl. d'amélioration
 enderio.stirlingGenerator.upgrades={0} donne efficacité {2}{1,number,#.#}x{3}
 enderio.stirlingGenerator.remaining=Reste {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Seulement
 enderio.gui.travelAccessable.privateBlock2=peut modifier les paramètres de ce bloc.
 enderio.gui.travelAccessable.public=Publique
@@ -877,11 +883,11 @@ enderio.gui.travelAccessable.ok=Autoriser
 enderio.gui.telepad.configure.travel=Params Voyage
 enderio.gui.telepad.configure.telepad=Params Téléporteur
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=Montrer la Portée
 enderio.gui.spawnGurad.range=Portée :
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Mode
 enderio.gui.conduit.ioMode.inOut=Entrée / Sortie
 enderio.gui.conduit.ioMode.input=Extraire
@@ -930,17 +936,17 @@ enderio.gui.conduit.fluid.blacklist=liste Noire
 
 enderio.gui.conduit.gas.autoExtract=Extract. Auto
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Temps clair
 enderio.gui.weather.task.rain=Temps pluvieux
 enderio.gui.weather.task.storm=Orage
 enderio.gui.weather.requireditem=Objet requis : %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Lié à l'âme
 description.enchantment.enderio.soulBound=Évite de perdre l'objet en cas de mort
 
-//Configuration
+#Configuration
 enderio.config.title=Configuration Ender IO
 
 enderio.config.power=Paramètres d'Énergie
@@ -985,7 +991,7 @@ enderio.config.fluid.tooltip=De la Pure énergie liquide !
 enderio.config.spawner=Paramètres du Générateur de Monstres alimenté
 enderio.config.spawner.tooltip=Je suis a cours d'infobulles marrantes.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Armure d'Acier Sombre
 enderio.category.tools=Outils
 enderio.keybind.glidertoggle=Mode Planeur

resources/assets/enderio/lang/ko_KR.lang

@@ -1,13 +1,13 @@
-//***  Ender IO *****//
-//Korean Localization text 한국어 현지화 텍스트
-//NOTE: detailed.line이 붙은 경우, 이어진 글을 뜻합니다. 말뜻이 이어지도록 해석해 주시기 바랍니다.
+#***  Ender IO ***#
+#Korean Localization text 한국어 현지화 텍스트
+#NOTE: detailed.line이 붙은 경우, 이어진 글을 뜻합니다. 말뜻이 이어지도록 해석해 주시기 바랍니다.
 
-//Power
+#Power
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=최대 출력
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=엔더 IO
 tile.blockEnderIo.tooltip.detailed.line1=근처의 블럭들에 대한
 tile.blockEnderIo.tooltip.detailed.line2=원격 접근을 허용합니다.
@@ -16,7 +16,7 @@ tile.blockEnderIo.tooltip.detailed.line4=함께 사용할 수 있습니다.
 
 item.enderio.itemEnderface.name=엔더 얼굴
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=컨두잇 묶음
 enderio.blockConduitFacade=컨두잇 덮개
 item.enderio.itemConduitFacade.name=컨두잇 덮개
@@ -36,6 +36,12 @@ 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.itemLiquidConduit.lockedType=액체 종류 제한
 enderio.itemLiquidConduit.unlockedType=액체 종류 제한 해제
 
@@ -85,7 +91,7 @@ enderio.itemGasConduit.tooltip.detailed.line1=메탈러지 호환 기체 전송
 enderio.itemMEConduit.name=ME 컨두잇
 enderio.itemMEConduitDense.name=밀집된 ME 컨두잇
 
-//Materials
+#Materials
 enderio.itemMaterial.name=자원
 enderio.silicon.name=실리콘
 enderio.conduitBinder.name=컨두잇 접합제
@@ -100,7 +106,7 @@ enderio.blastResistant=폭발 저항
 enderio.lightEmitter=빛을 발합니다.
 enderio.tooltip.isBeaconBase=신호기에 사용 가능
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=영양 증류액
 tile.fluid.nutrient_distillation.name=영양 증류액
 item.bucketNutrient_distillation.name=영양 증류액 양동이
@@ -119,17 +125,17 @@ tile.fluid.eio.xpjuice.name=액체 XP
 item.bucketXpjuice.name=XP 양동이
 
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=연료 세부사항
 enderio.fuel.tooltip.burnTime=연료 소모시간 {0,number}
-enderio.fluid.millibucketsTick=mB/t
-coolant.tooltip.heading=냉각제
-enderio.fuel.tooltip.degreesPerBucket=양동이당 온도
+enderio.fluid.millibucketsTick=L/t
+enderio.coolant.tooltip.heading=냉각제
+enderio.coolant.tooltip.degreesPerBucket=양동이당 온도
 enderio.gas.gasTick=Gas/t
 
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=기계 부품
 enderio.machineChassi.name=기계 틀
 enderio.basicGear.name=기본 톱니바퀴
@@ -146,7 +152,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=전력 절감
 tile.blockReinforcedObsidian.name=강화 흑요석
 tile.blockReinforcedObsidian.tooltip.common.line1=위더에 내성을 가지고 있습니다.
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=재결정 석영
 enderio.blockFusedQuartz.fusedQuartz.name=재결정 석영
 enderio.blockFusedQuartz.fusedGlass.name=투명한 유리
@@ -156,7 +162,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=고급 투명한 유리
 item.enderio.itemFusedQuartzFrame.name=재결정 석영 틀
 enderio.itemPowderIngot=분말 & 주괴
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=합금
 enderio.electricalSteel.name=전기강
 enderio.energeticAlloy.name=활동성 합금
@@ -179,7 +185,7 @@ tile.enderio.vibrantNugget.name=진동성 조각 블럭
 tile.enderio.darkSteel.name=흑강 블럭
 tile.enderio.soularium.name=소울라륨 블럭
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=석탄 분말
 enderio.powderIron.name=철 분말
 enderio.powderGold.name=금 분말
@@ -187,7 +193,7 @@ enderio.powderCopper.name=구리 분말
 enderio.powderTin.name=주석 분말
 enderio.powderEnder.name=엔더 분말
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=축전지
 enderio.basicCapacitor.name=기본 축전지
 enderio.activatedCapacitor.name=이중 축전지
@@ -198,7 +204,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=기계의 에너지 저
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=작업 속도, 작동 범위를 높여줍니다.
 enderio.machine.tooltip.clearConfig=모든 정보가 초기화됨니다!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=스털링식 화력 발전기
 tile.blockStirlingGenerator.tooltip.detailed.line1=고체 연료를 태와 전력을 만들어냅니다.
 tile.blockStirlingGenerator.tooltip.detailed.line2=축전기를 넣어 효율을 높이고
@@ -317,7 +323,7 @@ tile.blockVat.tooltip.detailed.line1=엔더 IO 유체들을 양조하기 위한
 tile.blockEnchanter.name=마법 부여기
 tile.blockEnchanter.tooltip.detailed.line1=액체 경헙치로 아이템을 합치고
 tile.blockEnchanter.tooltip.detailed.line2=책과 깃펜을 사용해
-tile.blockEnchanter.tooltip.detailed.line2=마법이 부여된 책을 만들어냅니다.
+tile.blockEnchanter.tooltip.detailed.line3=마법이 부여된 책을 만들어냅니다.
 
 tile.blockCombustionGenerator.name=연소 발전기
 tile.blockCombustionGenerator.tooltip.detailed.line1=액체 연료를 연소시켜 전력을 만들어냅니다.
@@ -406,15 +412,13 @@ tile.blockSpawnGuard.tooltip.detailed.line1=작동 범위 안에서
 tile.blockSpawnGuard.tooltip.detailed.line2=설정된 몹의 스폰을 막습니다.
 
 tile.blockExperienceObelisk.name=경험의 오벨리스크
-tile.blockExperienceObelisk.tooltip.detailed.line1=유체 탱크 위에 설치할 시
-tile.blockExperienceObelisk.tooltip.detailed.line2=우클릭으로 저장된 경험치를 꺼낼 수 있습니다.
-tile.blockExperienceObelisk.tooltip.detailed.line3=빈 손으로 앉아서 우클릭해
-tile.blockExperienceObelisk.tooltip.detailed.line4=플레이어의 경험치를 탱크로 빼낼 수 있습니다.
-tile.blockExperienceObelisk.tooltip.detailed.line5=좌클릭해 1레벨만큼의 경험치를 꺼낼 수 있습니다.
+tile.blockExperienceObelisk.tooltip.detailed.line1=매장 체험
+tile.blockExperienceObelisk.tooltip.detailed.line2=액체 XP를 출력할 수 있습니다
+tile.blockExperienceObelisk.tooltip.detailed.line3=인접한 탱크
 
 enderio.machine.tooltip.configured=(설정됨)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=흑강 감압판
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=플레이어에게만 반응합니다.
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=채색기에서 채색할 수 있습니다.
@@ -433,7 +437,7 @@ tile.blockDarkSteelAnvil.tooltip.common.line1=내구도가 높습니다.
 tile.blockDarkSteelAnvil.tooltip.detailed.line1=바닐라의 모루보다
 tile.blockDarkSteelAnvil.tooltip.detailed.line2=오래 사용 가능합니다.
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=여행자의 닻
 tile.blockTravelAnchor.tooltip.detailed.line1=근처에 있는 다른 여행자의 닻으로 텔레포트 가능합니다.
 tile.blockTravelAnchor.tooltip.detailed.line2=한 개의 닻에 서서 다른 닻을 보고
@@ -453,7 +457,7 @@ item.itemTravelStaff.tooltip.detailed.line4=앉은 체로 우클릭하면
 item.itemTravelStaff.tooltip.detailed.line5=플레이어를 단거리 텔레포트시킵니다.
 enderio.itemTravelStaff.notEnoughPower=전력이 모자랍니다!
 
-//Painter
+#Painter
 tile.blockPainter.name=채색기
 enderio.blockPainter.paintedWith=채색된 블럭:
 tile.blockPaintedFence.name=채색된 울타리
@@ -473,7 +477,7 @@ tile.blockPainter.tooltip.detailed.line4=유리 틀, 발광석, 카펫,
 tile.blockPainter.tooltip.detailed.line5=흑강 감압판,
 tile.blockPainter.tooltip.detailed.line6=여행자의 닻
 
-//Items
+#Items
 item.itemYetaWrench.name=예타 렌치
 item.itemYetaWrench.tooltip.detailed.line1=손에 쥘 시 컨두잇 덮개가 투명해집니다.
 item.itemYetaWrench.tooltip.detailed.line2=앉은 채로 우클릭해
@@ -515,7 +519,7 @@ skullEnderResonator.name=엔더 공명기
 
 item.itemSpawnEggEnderIO.name=스폰
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=암흑의 투구
 item.darkSteel_chestplate.name=암흑의 흉패
 item.darkSteel_leggings.name=암흑의 바지
@@ -617,7 +621,7 @@ enderio.darksteel.upgrade.nightVision.name=Night Vision
 enderio.darksteel.upgrade.nightVision.enabled=Night Vision Enabled
 enderio.darksteel.upgrade.nightVision.disabled=Night Vision Disabled
 
-//------GUI
+#------GUI
 
 enderio.gui.enabled=활성화
 enderio.gui.disabled=비활성화
@@ -625,7 +629,7 @@ enderio.gui.send=발신
 enderio.gui.receive=수신
 enderio.gui.sendReceive=수신 & 발신
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=레드스톤 모드
 enderio.gui.tooltip.redstoneControlMode.ignore=언제나 활성화
 enderio.gui.tooltip.redstoneControlMode.on=신호가 있으면 활성화
@@ -649,7 +653,7 @@ enderio.gui.machine.side.up=위
 enderio.gui.machine.side.down=아래
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=엔진 설정
 enderio.gui.powerMonitor.emit=Emit
 enderio.gui.powerMonitor.engineSection1=Emit signal when storage less
@@ -664,7 +668,7 @@ enderio.gui.powerMonitor.monHeading3=Machine Buffers
 enderio.gui.powerMonitor.monHeading4=Average output over 5 seconds
 enderio.gui.powerMonitor.monHeading5=Average input over 5 seconds
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Power Network
 enderio.gui.mjReader.conduitBuffer=Internal Buffer
 enderio.gui.mjReader.requestRange=Per tick request range
@@ -683,7 +687,7 @@ enderio.gui.mjReader.receiveItems=Can receive items from:
 enderio.gui.mjReader.receiveItem1=Can receive
 enderio.gui.mjReader.receiveItem2=from:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Input Redstone Mode
 enderio.gui.capBank.outputRs=Output Redstone Mode
 enderio.gui.capBank.maxIo=Max I/O
@@ -692,7 +696,7 @@ enderio.gui.capBank.maxOutput=Max Output
 enderio.gui.capBank.inputMode=Input
 enderio.gui.capBank.outputMode=Output
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Public Channel
 enderio.gui.trans.privateChannel=Private Channel
 enderio.gui.trans.addChannel=Add Channel
@@ -704,28 +708,28 @@ enderio.gui.trans.itemMode=Item Mode
 enderio.gui.trans.publicHeading=Public
 enderio.gui.trans.privateHeading=Private
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Furnace Mode
 enderio.gui.alloy.mode.all=All Smelting
 enderio.gui.alloy.mode.alloy=Alloys Only
 enderio.gui.alloy.mode.furnace=Furnace Only
 
-//Vat
+#Vat
 enderio.vat.outputTank=Output Tank
 enderio.vat.inputTank=Input Tank
 enderio.gui.machine.vat.dump.1=Dump Input Tank
 enderio.gui.machine.vat.dump.2=Dump Output Tank
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Coolant
 enderio.combustionGenerator.fuelTank=Fuel
 enderio.combustionGenerator.output=Generating:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Generating:
 enderio.stirlingGenerator.burnRate=Burn Rate:
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Only
 enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.
 enderio.gui.travelAccessable.public=Public
@@ -735,11 +739,11 @@ enderio.gui.travelAccessable.unauthorised=You are not allowed to access this blo
 enderio.gui.travelAccessable.enterCode=Access Code Required
 enderio.gui.travelAccessable.ok=Authorise
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=Show Range
 enderio.gui.spawnGurad.range=Range:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Mode
 enderio.gui.conduit.ioMode.inOut=In / Out
 enderio.gui.conduit.ioMode.input=Extract
@@ -779,7 +783,7 @@ enderio.gui.conduit.fluid.filter=Filter
 enderio.gui.conduit.gas.autoExtract=Auto Extract
 
 
-//Configuration
+#Configuration
 enderio.config.title=Ender IO Configuration
 
 enderio.config.power=Power Settings

resources/assets/enderio/lang/pl_PL.lang

@@ -1,16 +1,16 @@
-//*** Ender IO *****//
+#*** Ender IO ***#
 
-//Power
+#Power
 enderio.power.mj=MJ
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=Maksymalny przepływ
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 enderio.blockEnderIo=Ender IO
 item.enderio.itemEnderface.name=Twarz Endera
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Wiązka przewodów
 enderio.blockConduitFacade=Fasada przewodu
 item.enderio.itemConduitFacade.name=Fasada przewodu
@@ -33,14 +33,14 @@ enderio.itemItemConduitEmpowered.name=Ulepszony przewód przedmiotów
 
 enderio.itemMeConduit.name=Przewód ME
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiały
 enderio.silicon.name=Silikon
 enderio.conduitBinder.name=Izolator przewodów
 enderio.binderComposite.name=Kompozyt izolatora
 enderio.phasedIronNugget.name=Bryłka pulsacyjnego żelaza
 
-//Crafting components
+#Crafting components
 enderio.itemMachinePart.name=Części maszyny
 enderio.machineChassi.name=Szkielet maszyny
 enderio.basicGear.name=Zębatka
@@ -48,7 +48,7 @@ enderio.pulsatingCrystal.name=Kryształ pulsacyjny
 enderio.vibrantCrystal.name=Kryształ wibracyjny
 
 
-//Quartz / Glass
+#Quartz / Glass
 enderio.blockFusedQuartz=Skondensowany kwarc
 enderio.blockFusedQuartz.fusedQuartz.name=Skondensowany kwarc
 enderio.blockFusedQuartz.fusedGlass.name=Skondensowane szkło
@@ -56,7 +56,7 @@ enderio.blockFusedQuartz.fusedGlass.name=Skondensowane szkło
 item.enderio.itemFusedQuartzFrame.name=Skondensowana rama kwarcowa
 enderio.itemPowderIngot=Proszki i sztabki
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Stop
 enderio.electricalSteel.name=Stal elektryczna
 enderio.energeticAlloy.name=Stop energetyczny
@@ -66,7 +66,7 @@ enderio.conductiveIron.name=Przewodzące żelazo
 enderio.phasedIron.name=Żelazo pulsacyjne 
 enderio.vibrantNugget.name=Bryłka wibracyjnego stopu
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Sproszkowany węgiel
 enderio.powderIron.name=Sproszkowane żelazo
 enderio.powderGold.name=Sproszkowane złoto
@@ -74,13 +74,13 @@ enderio.powderCopper.name=Sproszkowana miedź
 enderio.powderTin.name=Sproszkowana cyna
 enderio.powderEnder.name=Sproszkowana perła kresu
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Kondensator
 enderio.basicCapacitor.name=Kondensator
 enderio.activatedCapacitor.name=Dwuwarstwowy kondensator
 enderio.enderCapacitor.name=Ośmiowarstwowy kondensator
 
-//Machines
+#Machines
 tile.enderio.blockStirlingGenerator.name=Generator Stirlinga
 tile.enderio.blockReservoir.name=Zbiornik
 tile.enderio.blockAlloySmelter.name=Piec stopów
@@ -92,14 +92,14 @@ tile.enderio.blockCrusher.name=Rozdrabniarka
 tile.enderio.blockHyperCube.name=Międzywymiarowy odbiornik
 tile.enderio.blockPowerMonitor.name=Ekran energetyczny
 
-//Travel
+#Travel
 tile.enderio.blockTravelPlatform.name=Blok podróży
 enderio.blockTravelPlatform.invalidTarget=Cel zablokowany
 enderio.blockTravelPlatform.outOfRange=Cel poza zasięgiem
 item.enderio.itemTravelStaff.name=Berło podróży
 enderio.itemTravelStaff.notEnoughPower=Za mało energii
 
-//Painter
+#Painter
 tile.enderio.blockPainter.name=Maszyna do malowania
 enderio.blockPainter.paintedWith=Pomalowana:
 enderio.blockCustomFence=Pomalowany płot
@@ -109,7 +109,7 @@ enderio.blockCustomStair=Pomalowane schody
 enderio.blockCustomSlab=Pomalowany półblok
 enderio.blockCustomDoubleSlab=Pomalowany półblok
 
-//Items
+#Items
 item.enderio.itemYetaWrench.name=Klucz Yeta
 item.enderio.itemMJReader.name=Miernik energetyczny
 
@@ -119,7 +119,7 @@ enderio.itemEnderface.destroyed=Blok EnderIO został zniszczony.
 enderio.itemEnderface.noSync=Twarz Endera nie została zsynchronizowana z EnderIO.
 
 
-//------GUI
+#------GUI
 enderio.color.black=Czarny
 enderio.color.red=Czerwony
 enderio.color.green=Zielony
@@ -143,14 +143,14 @@ enderio.gui.send=Wysyłaj
 enderio.gui.receive=Odbieraj
 enderio.gui.sendReceive=Wysyłaj i odbieraj
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Tryb włącznika
 enderio.gui.tooltip.redstoneControlMode.ignore=Włączony
 enderio.gui.tooltip.redstoneControlMode.on=Włączony z sygnałem
 enderio.gui.tooltip.redstoneControlMode.off=Włączony bez sygnału
 enderio.gui.tooltip.redstoneControlMode.never=Wyłączony
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Kontroluj energię
 enderio.gui.powerMonitor.emit=Emituj
 enderio.gui.powerMonitor.engineSection1=Emituj sygnał, gdy jest mniej energii
@@ -165,7 +165,7 @@ enderio.gui.powerMonitor.monHeading3=Energia w maszynach:
 enderio.gui.powerMonitor.monHeading4=Średni ubytek w ciągu 5 sekund:
 enderio.gui.powerMonitor.monHeading5=Średni przyrost w ciągu 5 sekund:
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Sieć energetyczna
 enderio.gui.mjReader.conduitBuffer=Bufor wewnętrzny
 enderio.gui.mjReader.requestRange=Szacowany pobór na tick
@@ -184,14 +184,14 @@ enderio.gui.mjReader.receiveItems=Może otrzymać rzeczy z:
 enderio.gui.mjReader.receiveItem1=Przyjmie
 enderio.gui.mjReader.receiveItem2=z:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Włącznik przyrostu energii
 enderio.gui.capBank.outputRs=Włącznik ubytku energii
 enderio.gui.capBank.maxIo=Maksymalne wej./wyj.
 enderio.gui.capBank.maxInput=Wejście
 enderio.gui.capBank.maxOutput=Wyjście
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Publiczny kanał
 enderio.gui.trans.privateChannel=Prywatny kanał
 enderio.gui.trans.addChannel=Dodaj kanał
@@ -203,13 +203,13 @@ enderio.gui.trans.itemMode=Tryb przedmiotów
 enderio.gui.trans.publicHeading=Publiczne kanały:
 enderio.gui.trans.privateHeading=Prywatne kanały:
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Tryb pieca
 enderio.gui.alloy.mode.all=Przetapiaj wszystko
 enderio.gui.alloy.mode.alloy=Tylko stopy
 enderio.gui.alloy.mode.furnace=Tylko jak zwykły piec
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Można
 enderio.gui.travelAccessable.privateBlock2=zmienić tylko te ustawienia.
 enderio.gui.travelAccessable.public=Publiczny
@@ -219,7 +219,7 @@ enderio.gui.travelAccessable.unauthorised=Nie masz dostępu do tego bloku.
 enderio.gui.travelAccessable.enterCode=Podaj hasło
 enderio.gui.travelAccessable.ok=Autoryzuj
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Tryb
 enderio.gui.conduit.ioMode.inOut=Wej./Wyj.
 enderio.gui.conduit.ioMode.input=Wejście

resources/assets/enderio/lang/pt_BR.lang

@@ -1,13 +1,13 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=Saída Máxima
 enderio.power.generates=Gera
 enderio.power.generation_rate=a 
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=IO do Fim
 tile.blockEnderIo.tooltip.detailed.line1=Permite acesso remoto a blocos
 tile.blockEnderIo.tooltip.detailed.line2=próximos
@@ -16,7 +16,7 @@ tile.blockEnderIo.tooltip.detailed.line4=o Cajado da Viagem
 
 item.enderio.itemEnderface.name=Interfim
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Conjunto de Condutos
 enderio.blockConduitFacade=Fachada de Condutos
 item.enderio.itemConduitFacade.name=Fachada de Condutos
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Conduto de Redstone Isolado
 enderio.itemLiquidConduit.name=Conduto de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Conduto de Fluidos Pressurizado
 enderio.itemLiquidConduitEnder.name=Conduto de Fluidos do Fim 
+# 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.itemLiquidConduit.lockedType=Tipo de fluido trancado para
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido destrancado
 enderio.itemLiquidConduit.lockedWaila=Trancado para 
@@ -68,7 +74,7 @@ item.itemExistingItemFilter.tooltip.detailed.line2=já estão no inventário
 item.itemExistingItemFilter.tooltip.detailed.line3=Clique direito enquanto agachado
 item.itemExistingItemFilter.tooltip.detailed.line4=em um inventário para adicionar o
 item.itemExistingItemFilter.tooltip.detailed.line5=o conteúdo ao snapshot
- 
+
 enderio.item.itemExistingItemFilter.filterUpdated=Novos itens foram adicionados ao snapshot
 enderio.item.itemExistingItemFilter.filterNotUpdated=O snapshot já cobre todos os itens no inventário
 
@@ -95,10 +101,10 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfere gases compatíveis com o
 enderio.itemMEConduit.name=Conduto ME
 enderio.itemMEConduitDense.name=Conduto ME Denso
 
-//Entity 
+#Entity 
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiais
 enderio.silicon.name=Silício
 enderio.conduitBinder.name=Capa de Conduto
@@ -113,7 +119,7 @@ enderio.blastResistant=Resistente a Explosões
 enderio.lightEmitter=Emite Luz
 enderio.tooltip.isBeaconBase=Pode ser usado como base de um sinalizador
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Balde de Destilado de Nutrientes
@@ -131,18 +137,16 @@ fluid.eio.xpjuice=XP em Líquido
 tile.fluid.eio.xpjuice.name=XP em Líquido
 item.bucketXpjuice.name=Balde de XP
 
-
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalhes do Combustível
 enderio.fuel.tooltip.burnTime=tempo de queima {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Graus por balde
 enderio.gas.gasTick=Gas/t
 
-
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chassi de Máquina
 enderio.basicGear.name=Engrenagem Básica
@@ -159,7 +163,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Redução de Poder
 tile.blockReinforcedObsidian.name=Obsidiana Reforçada
 tile.blockReinforcedObsidian.tooltip.common.line1=Á Prova De Wither
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Quartzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Quartzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Vidro Bem Transparente
@@ -169,7 +173,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=Vidro Transparente Iluminado
 item.enderio.itemFusedQuartzFrame.name=Armação de Quartzo Fundido
 enderio.itemPowderIngot=Pós e Barras
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Liga
 enderio.electricalSteel.name=Aço Elétrico
 enderio.energeticAlloy.name=Liga Energética
@@ -192,7 +196,7 @@ tile.enderio.vibrantNugget.name=Bloco de Pepitas Vibrantes
 tile.enderio.darkSteel.name=Bloco de Aço Negro
 tile.enderio.soularium.name=Bloco de Almário
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Pó de Carvão
 enderio.powderIron.name=Pó de Ferro
 enderio.powderGold.name=Pó de Ouro
@@ -202,7 +206,7 @@ enderio.powderEnder.name=Pó de Pérola do Fim
 
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Capacitor
 enderio.basicCapacitor.name=Capacitor Básico
 enderio.activatedCapacitor.name=Capacitor de Dupla Camada
@@ -213,7 +217,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta o armazenamento d
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=velocidade / alcance das máquinas
 enderio.machine.tooltip.clearConfig=Isso vai limpar qualquer configuração feita!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Gerador de Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Queima combustível sólido para gerar energia
 tile.blockStirlingGenerator.tooltip.detailed.line2=Pode ser melhorado para aumentar a saída
@@ -348,7 +352,7 @@ tile.blockVat.tooltip.detailed.line1=Usado para fermentar fluidos do EnderIO
 tile.blockEnchanter.name=Encantador
 tile.blockEnchanter.tooltip.detailed.line1=Usa XP para combinar itens
 tile.blockEnchanter.tooltip.detailed.line2=e uma pena e livro para
-tile.blockEnchanter.tooltip.detailed.line2=criar livros encantados
+tile.blockEnchanter.tooltip.detailed.line3=criar livros encantados
 
 tile.blockCombustionGenerator.name=Gerador a Combustão
 tile.blockCombustionGenerator.tooltip.detailed.line1=Queima combustível líquido para gerar energia
@@ -448,7 +452,7 @@ tile.blockBuffer.creative.name=Buffer Criativo
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Pressão Negra
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Apenas ativada por jogadores
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Pode ser pintada na máquina de pintura,
@@ -470,7 +474,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=a bigorna vanilla
 tile.blockDarkSteelLadder.name=Escadas de Aço Negro
 tile.blockDarkSteelLadder.tooltip.common.line1=Mais rápida que escadas comuns
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ãncora de Viagem
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite teletransporte entre âncoras
 tile.blockTravelAnchor.tooltip.detailed.line2=Fique de pé em uma Âncora, olhe
@@ -490,7 +494,7 @@ item.itemTravelStaff.tooltip.detailed.line4=Shift-Clique direito vai teletranspo
 item.itemTravelStaff.tooltip.detailed.line5=o jogador uma curta distância
 enderio.itemTravelStaff.notEnoughPower=Sem energia suficiente
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintura
 enderio.blockPainter.paintedWith=Pintado com:
 tile.blockPaintedFence.name=Cerca Pintada
@@ -510,7 +514,7 @@ tile.blockPainter.tooltip.detailed.line4=Armações de Vidro, Pedra Luminosa, Ta
 tile.blockPainter.tooltip.detailed.line5=Placas de Pressão de Aço Negro,
 tile.blockPainter.tooltip.detailed.line6=Âncoras de Viagem
 
-//Items
+#Items
 item.itemYetaWrench.name=Chave Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Esconde fachadas de conduto quando segurada,
 item.itemYetaWrench.tooltip.detailed.line2=Shift-Clique direito para quebrar máquinas
@@ -554,7 +558,7 @@ skullEnderResonator.name=Ressoador do Fim
 
 item.itemSpawnEggEnderIO.name=Invoca
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Elmo Negro
 item.darkSteel_chestplate.name=Peitoral Negro
 item.darkSteel_leggings.name=Perneiras Negras
@@ -665,7 +669,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Gera energia do sol.
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Gera energia do sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada Máxima: 
 enderio.gui.simple.out=Saída Máxima: 
@@ -675,7 +679,7 @@ enderio.gui.send=Enviar
 enderio.gui.receive=Receber
 enderio.gui.sendReceive=Enviar & Receber
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo de Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Sempre ativo
 enderio.gui.tooltip.redstoneControlMode.on=Ativo com sinal
@@ -699,7 +703,7 @@ enderio.gui.machine.side.up=Cima
 enderio.gui.machine.side.down=Baixo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Controle de Motores
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir sinal quando o armazenamento
@@ -714,7 +718,7 @@ enderio.gui.powerMonitor.monHeading3=Buffer das Máquinas
 enderio.gui.powerMonitor.monHeading4=Saída média em 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada média em 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Rede de Energia
 enderio.gui.mjReader.conduitBuffer=Buffer Interno
 enderio.gui.mjReader.requestRange=Alcance de pedido por tick
@@ -733,7 +737,7 @@ enderio.gui.mjReader.receiveItems=Pode receber itens de:
 enderio.gui.mjReader.receiveItem1=Pode receber
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Entrada Redstone Mode
 enderio.gui.capBank.outputRs=Saída Redstone Mode
 enderio.gui.capBank.maxIo=I/O Máximo
@@ -742,7 +746,7 @@ enderio.gui.capBank.maxOutput=Saída Máxima
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Saída
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Adicionar Canal
@@ -754,28 +758,28 @@ enderio.gui.trans.itemMode=Modo Item
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Fornalha
 enderio.gui.alloy.mode.all=Qualquer Modo
 enderio.gui.alloy.mode.alloy=Apenas Ligas
 enderio.gui.alloy.mode.furnace=Apenas Fornalha
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Saída
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Despejar no Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Despejar no Tanque de Saída
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustível
 enderio.combustionGenerator.output=Gerando:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Gerando:
 enderio.stirlingGenerator.burnRate=Taxa de Queima:
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Apenas
 enderio.gui.travelAccessable.privateBlock2=pode mudar as configurações desse bloco
 enderio.gui.travelAccessable.public=Público
@@ -785,11 +789,11 @@ enderio.gui.travelAccessable.unauthorised=Você não tem permissão para acessar
 enderio.gui.travelAccessable.enterCode=Código de Acesso Requerido
 enderio.gui.travelAccessable.ok=Autorizar
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=Mostrar Alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada / Saída
 enderio.gui.conduit.ioMode.input=Extrair
@@ -828,11 +832,11 @@ enderio.gui.conduit.fluid.filter=Filtro
 
 enderio.gui.conduit.gas.autoExtract=Auto Extrair
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Vínculo da Alma
 description.enchantment.enderio.soulBound=Esse encantamento previne o item de ser perdido na morte
 
-//Configuration
+#Configuration
 enderio.config.title=Configurações do Ender IO
 
 enderio.config.power=Configurações de Energia

resources/assets/enderio/lang/pt_PT.lang

@@ -1,13 +1,13 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=Saída Máxima
 enderio.power.generates=Gera
 enderio.power.generation_rate=a 
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=IO do Fim
 tile.blockEnderIo.tooltip.detailed.line1=Permite acesso remoto a blocos
 tile.blockEnderIo.tooltip.detailed.line2=próximos
@@ -16,7 +16,7 @@ tile.blockEnderIo.tooltip.detailed.line4=o Cajado da Viagem
 
 item.enderio.itemEnderface.name=Interfim
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Conjunto de Condutos
 enderio.blockConduitFacade=Fachada de Condutos
 item.enderio.itemConduitFacade.name=Fachada de Condutos
@@ -36,6 +36,12 @@ enderio.itemRedstoneConduitInsulated.name=Conduto de Redstone Isolado
 enderio.itemLiquidConduit.name=Conduto de Fluidos
 enderio.itemLiquidConduitAdvanced.name=Conduto de Fluidos Pressurizado
 enderio.itemLiquidConduitEnder.name=Conduto de Fluidos do Fim 
+# 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.itemLiquidConduit.lockedType=Tipo de fluido trancado para
 enderio.itemLiquidConduit.unlockedType=Tipo de fluido destrancado
 enderio.itemLiquidConduit.lockedWaila=Trancado para 
@@ -68,7 +74,7 @@ item.itemExistingItemFilter.tooltip.detailed.line2=já estão no inventário
 item.itemExistingItemFilter.tooltip.detailed.line3=Clique direito enquanto agachado
 item.itemExistingItemFilter.tooltip.detailed.line4=em um inventário para adicionar o
 item.itemExistingItemFilter.tooltip.detailed.line5=o conteúdo ao snapshot
- 
+
 enderio.item.itemExistingItemFilter.filterUpdated=Novos itens foram adicionados ao snapshot
 enderio.item.itemExistingItemFilter.filterNotUpdated=O snapshot já cobre todos os itens no inventário
 
@@ -95,10 +101,10 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfere gases compatíveis com o
 enderio.itemMEConduit.name=Conduto ME
 enderio.itemMEConduitDense.name=Conduto ME Denso
 
-//Entity 
+#Entity 
 entity.witherSkeleton.name=Esqueleto Wither
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Materiais
 enderio.silicon.name=Silicone
 enderio.conduitBinder.name=Capa de Conduto
@@ -113,7 +119,7 @@ enderio.blastResistant=Resistente a Explosões
 enderio.lightEmitter=Emite Luz
 enderio.tooltip.isBeaconBase=Pode ser usado como base de um sinalizador
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Destilado de Nutrientes
 tile.fluid.nutrient_distillation.name=Destilado de Nutrientes
 item.bucketNutrient_distillation.name=Balde de Destilado de Nutrientes
@@ -132,17 +138,17 @@ tile.fluid.eio.xpjuice.name=XP em Líquido
 item.bucketXpjuice.name=Balde de XP
 
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=Detalhes do Combustível
 enderio.fuel.tooltip.burnTime=tempo de queima {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=Refrigerante
 enderio.coolant.tooltip.degreesPerBucket=Graus por balde
 enderio.gas.gasTick=Gas/t
 
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Partes de Máquina
 enderio.machineChassi.name=Chassi de Máquina
 enderio.basicGear.name=Engrenagem Básica
@@ -159,7 +165,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Redução de Poder
 tile.blockReinforcedObsidian.name=Obsidiana Reforçada
 tile.blockReinforcedObsidian.tooltip.common.line1=À Prova De Wither
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Quartzo Fundido
 enderio.blockFusedQuartz.fusedQuartz.name=Quartzo Fundido
 enderio.blockFusedQuartz.fusedGlass.name=Vidro Bem Transparente
@@ -169,7 +175,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=Vidro Transparente Iluminado
 item.enderio.itemFusedQuartzFrame.name=Armação de Quartzo Fundido
 enderio.itemPowderIngot=Pós e Barras
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Liga
 enderio.electricalSteel.name=Aço Elétrico
 enderio.energeticAlloy.name=Liga Energética
@@ -192,7 +198,7 @@ tile.enderio.vibrantNugget.name=Bloco de Pepitas Vibrantes
 tile.enderio.darkSteel.name=Bloco de Aço Negro
 tile.enderio.soularium.name=Bloco de Almário
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Pó de Carvão
 enderio.powderIron.name=Pó de Ferro
 enderio.powderGold.name=Pó de Ouro
@@ -202,7 +208,7 @@ enderio.powderEnder.name=Pó de Pérola do Fim
 
 enderio.ingotEnderiumBase.name=Base de Enderium
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Capacitor
 enderio.basicCapacitor.name=Capacitor Básico
 enderio.activatedCapacitor.name=Capacitor de Dupla Camada
@@ -213,7 +219,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Aumenta o armazenamento d
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=velocidade / alcance das máquinas
 enderio.machine.tooltip.clearConfig=Isso vai limpar qualquer configuração feita!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Gerador de Stirling
 tile.blockStirlingGenerator.tooltip.detailed.line1=Queima combustível sólido para gerar energia
 tile.blockStirlingGenerator.tooltip.detailed.line2=Pode ser melhorado para aumentar a saída
@@ -348,7 +354,7 @@ tile.blockVat.tooltip.detailed.line1=Usado para fermentar fluidos do EnderIO
 tile.blockEnchanter.name=Encantador
 tile.blockEnchanter.tooltip.detailed.line1=Usa XP para combinar itens
 tile.blockEnchanter.tooltip.detailed.line2=e uma pena e livro para
-tile.blockEnchanter.tooltip.detailed.line2=criar livros encantados
+tile.blockEnchanter.tooltip.detailed.line3=criar livros encantados
 
 tile.blockCombustionGenerator.name=Gerador a Combustão
 tile.blockCombustionGenerator.tooltip.detailed.line1=Queima combustível líquido para gerar energia
@@ -448,7 +454,7 @@ tile.blockBuffer.creative.name=Buffer Criativo
 
 enderio.machine.tooltip.configured=(Configurado)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Placa de Pressão Negra
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Apenas ativada por jogadores
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Pode ser pintada na máquina de pintura,
@@ -470,7 +476,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=a bigorna do Minecraft vanilla
 tile.blockDarkSteelLadder.name=Escadas de Aço Negro
 tile.blockDarkSteelLadder.tooltip.common.line1=Mais rápida que escadas comuns
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Ãncora de Viagem
 tile.blockTravelAnchor.tooltip.detailed.line1=Permite teletransporte entre âncoras
 tile.blockTravelAnchor.tooltip.detailed.line2=Fique de pé em uma Âncora, olhe
@@ -490,7 +496,7 @@ item.itemTravelStaff.tooltip.detailed.line4=Shift-Clique direito vai teletranspo
 item.itemTravelStaff.tooltip.detailed.line5=o jogador uma curta distância
 enderio.itemTravelStaff.notEnoughPower=Sem energia suficiente
 
-//Painter
+#Painter
 tile.blockPainter.name=Máquina de Pintura
 enderio.blockPainter.paintedWith=Pintado com:
 tile.blockPaintedFence.name=Cerca Pintada
@@ -510,7 +516,7 @@ tile.blockPainter.tooltip.detailed.line4=Armações de Vidro, Pedra Luminosa, Ta
 tile.blockPainter.tooltip.detailed.line5=Placas de Pressão de Aço Negro,
 tile.blockPainter.tooltip.detailed.line6=Âncoras de Viagem
 
-//Items
+#Items
 item.itemYetaWrench.name=Chave Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Esconde fachadas de conduto quando segurada,
 item.itemYetaWrench.tooltip.detailed.line2=Shift-Clique direito para quebrar máquinas
@@ -554,7 +560,7 @@ skullEnderResonator.name=Ressoador do Fim
 
 item.itemSpawnEggEnderIO.name=Invoca
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Elmo Negro
 item.darkSteel_chestplate.name=Peitoral Negro
 item.darkSteel_leggings.name=Perneiras Negras
@@ -665,7 +671,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Gera energia do sol.
 enderio.darksteel.upgrade.solar_two.name=Solar II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Gera energia do sol.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Entrada Máxima: 
 enderio.gui.simple.out=Saída Máxima: 
@@ -675,7 +681,7 @@ enderio.gui.send=Enviar
 enderio.gui.receive=Receber
 enderio.gui.sendReceive=Enviar & Receber
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Modo de Redstone
 enderio.gui.tooltip.redstoneControlMode.ignore=Sempre ativo
 enderio.gui.tooltip.redstoneControlMode.on=Ativo com sinal
@@ -699,7 +705,7 @@ enderio.gui.machine.side.up=Cima
 enderio.gui.machine.side.down=Baixo
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Controle de Motores
 enderio.gui.powerMonitor.emit=Emitir
 enderio.gui.powerMonitor.engineSection1=Emitir sinal quando o armazenamento
@@ -714,7 +720,7 @@ enderio.gui.powerMonitor.monHeading3=Buffer das Máquinas
 enderio.gui.powerMonitor.monHeading4=Saída média em 5 segundos
 enderio.gui.powerMonitor.monHeading5=Entrada média em 5 segundos
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Rede de Energia
 enderio.gui.mjReader.conduitBuffer=Buffer Interno
 enderio.gui.mjReader.requestRange=Alcance de pedido por tick
@@ -733,7 +739,7 @@ enderio.gui.mjReader.receiveItems=Pode receber itens de:
 enderio.gui.mjReader.receiveItem1=Pode receber
 enderio.gui.mjReader.receiveItem2=de:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Entrada Redstone Mode
 enderio.gui.capBank.outputRs=Saída Redstone Mode
 enderio.gui.capBank.maxIo=I/O Máximo
@@ -742,7 +748,7 @@ enderio.gui.capBank.maxOutput=Saída Máxima
 enderio.gui.capBank.inputMode=Entrada
 enderio.gui.capBank.outputMode=Saída
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Canal Público
 enderio.gui.trans.privateChannel=Canal Privado
 enderio.gui.trans.addChannel=Adicionar Canal
@@ -754,28 +760,28 @@ enderio.gui.trans.itemMode=Modo Item
 enderio.gui.trans.publicHeading=Público
 enderio.gui.trans.privateHeading=Privado
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Modo Fornalha
 enderio.gui.alloy.mode.all=Qualquer Modo
 enderio.gui.alloy.mode.alloy=Apenas Ligas
 enderio.gui.alloy.mode.furnace=Apenas Fornalha
 
-//Vat
+#Vat
 enderio.vat.outputTank=Tanque de Saída
 enderio.vat.inputTank=Tanque de Entrada
 enderio.gui.machine.vat.dump.1=Despejar no Tanque de Entrada
 enderio.gui.machine.vat.dump.2=Despejar no Tanque de Saída
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Refrigerante
 enderio.combustionGenerator.fuelTank=Combustível
 enderio.combustionGenerator.output=A Gerar:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=A Gerar:
 enderio.stirlingGenerator.burnRate=Taxa de Queima:
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Apenas
 enderio.gui.travelAccessable.privateBlock2=pode mudar as configurações desse bloco
 enderio.gui.travelAccessable.public=Público
@@ -785,11 +791,11 @@ enderio.gui.travelAccessable.unauthorised=Tu não tens permissão para acessar e
 enderio.gui.travelAccessable.enterCode=Código de Acesso Requerido
 enderio.gui.travelAccessable.ok=Autorizar
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=Mostrar Alcance
 enderio.gui.spawnGurad.range=Alcance:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Modo
 enderio.gui.conduit.ioMode.inOut=Entrada / Saída
 enderio.gui.conduit.ioMode.input=Extrair
@@ -828,11 +834,11 @@ enderio.gui.conduit.fluid.filter=Filtro
 
 enderio.gui.conduit.gas.autoExtract=Auto Extrair
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Vínculo da Alma
 description.enchantment.enderio.soulBound=Esse encantamento previne o item de ser perdido na morte
 
-//Configuration
+#Configuration
 enderio.config.title=Configurações do Ender IO
 
 enderio.config.power=Configurações de Energia

resources/assets/enderio/lang/ru_RU.lang

@@ -1,14 +1,14 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=тик/мВ
+enderio.power.tmb=тик/Л
 enderio.power.tick=/тик
 enderio.power.maxOutput=Макс. выход
 enderio.power.generates=Генерирует
 enderio.power.generation_rate=на скорости
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=Интерфейс Края
 tile.blockEnderIo.tooltip.detailed.line1=Даёт удалённый доступ к ближайшим
 tile.blockEnderIo.tooltip.detailed.line2=блокам
@@ -17,7 +17,7 @@ tile.blockEnderIo.tooltip.detailed.line4=с посохом путешестви
 
 item.enderio.itemEnderface.name=Лицо Края
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=Связка труб
 enderio.blockConduitFacade=Фасад для труб
 item.enderio.itemConduitFacade.name=Фасад для труб
@@ -40,6 +40,12 @@ 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.itemLiquidConduit.lockedType=Тип жидкости установлен на
 enderio.itemLiquidConduit.unlockedType=Тип жидкости не установлен
 enderio.itemLiquidConduit.lockedWaila=Установленная жидкость 
@@ -117,10 +123,10 @@ enderio.itemMEConduit.channelsUsed=Каналы: {0,number} из {1,number}
 
 enderio.itemOCConduit.name=Системная труба (OC)
 
-//Entity
+#Entity
 entity.witherSkeleton.name=Скелет-иссушитель
 
-//Materials
+#Materials
 enderio.itemMaterial.name=Материалы
 enderio.silicon.name=Кремний
 enderio.conduitBinder.name=Связующий элемент труб
@@ -144,7 +150,7 @@ enderio.itemEnderios.tooltip.detailed.line2=и 394г пыли Края.
 enderio.itemEnderios.tooltip.detailed.line3=Побочные эффекты пыли Края: тошнота, головокружение, смятение 
 enderio.itemEnderios.tooltip.detailed.line4=и случайная телепортация.
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=Питательный дистиллят
 tile.fluid.nutrient_distillation.name=Питательный дистиллят
 item.bucketNutrient_distillation.name=Ведро питательного дистиллята
@@ -162,16 +168,16 @@ fluid.eio.xpjuice=Жидкий опыт
 tile.fluid.eio.xpjuice.name=Жидкий опыт
 item.bucketXpjuice.name=Ведро опыта
 
-enderio.fluid.millibucket.abr=мВ
+enderio.fluid.millibucket.abr=Л
 
 enderio.fuel.tooltip.heading=Информация о топливе
 enderio.fuel.tooltip.burnTime=время горения {0,number}
-enderio.fluid.millibucketsTick=мВ/тик
+enderio.fluid.millibucketsTick=Л/тик
 enderio.coolant.tooltip.heading=Хладагент
 enderio.coolant.tooltip.degreesPerBucket=Градус за ведро
 enderio.gas.gasTick=Газ/тик
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=Детали механизма
 enderio.machineChassi.name=Корпус механизма
 enderio.basicGear.name=Основная шестерня
@@ -189,7 +195,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Снижение мощност
 tile.blockReinforcedObsidian.name=Укреплённый обсидиан
 tile.blockReinforcedObsidian.tooltip.common.line1=Защищён от иссушителей
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=Расплавленный кварц
 enderio.blockFusedQuartz.fusedQuartz.name=Расплавленный кварц
 enderio.blockFusedQuartz.fusedGlass.name=Почти прозрачное стекло
@@ -201,7 +207,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=Тёмное прозрачное
 item.enderio.itemFusedQuartzFrame.name=Рамка из расплавленного кварца
 enderio.itemPowderIngot=Порошки и слитки
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=Сплав
 enderio.electricalSteel.name=Наэлектризованная сталь
 enderio.energeticAlloy.name=Энергетический сплав
@@ -224,7 +230,7 @@ tile.enderio.vibrantNugget.name=Блок самородка вибрирующе
 tile.enderio.darkSteel.name=Блок тёмной стали
 tile.enderio.soularium.name=Блок соулария
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=Угольный порошок
 enderio.powderIron.name=Железный порошок
 enderio.powderGold.name=Золотой порошок
@@ -234,7 +240,7 @@ enderio.powderEnder.name=Порошок из жемчуга Края
 enderio.powderObsidian.name=Обсидиановый порошок
 enderio.ingotEnderiumBase.name=Основа Края
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=Конденсатор
 enderio.basicCapacitor.name=Основной конденсатор
 enderio.activatedCapacitor.name=Двухслойный конденсатор
@@ -245,7 +251,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Увеличивает х
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=скорость / радиус механизмов
 enderio.machine.tooltip.clearConfig=Это очистит всю хранящуюся информацию!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=Генератор Стирлинга
 tile.blockStirlingGenerator.tooltip.detailed.line1=Сжигает твёрдое топливо для производства энергии
 tile.blockStirlingGenerator.tooltip.detailed.line2=Может быть улучшен, чтобы увеличить выход
@@ -559,7 +565,7 @@ enderio.gui.inventorypanel.tooltip.sync=Синхронизация с NEI
 
 enderio.machine.tooltip.configured=(Настроен)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=Тёмная нажимная пластина
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=Активируется только игроками
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=Может быть покрашена в покрасочном механизме,
@@ -581,7 +587,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=обычной наковаль
 tile.blockDarkSteelLadder.name=Лестница из тёмной стали
 tile.blockDarkSteelLadder.tooltip.common.line1=Быстрее обычных лестниц
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=Якорь путешествия
 tile.blockTravelAnchor.tooltip.detailed.line1=Позволяет телепортироваться между якорями
 tile.blockTravelAnchor.tooltip.detailed.line2=Встаньте на один якорь, посмотрите
@@ -619,7 +625,7 @@ enderio.itemCoordSelector.chat.setCoords=Выбранные координаты
 enderio.itemCoordSelector.chat.newDimension=Новое измерение: %s%s
 enderio.itemCoordSelector.chat.setDimension=Выбранное измерение: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=Покрасочный механизм
 enderio.blockPainter.paintedWith=Покрашено в:
 tile.blockPaintedFence.name=Покрашенный забор
@@ -639,7 +645,7 @@ tile.blockPainter.tooltip.detailed.line4=стеклянных рамок, све
 tile.blockPainter.tooltip.detailed.line5=тёмных нажимных пластин,
 tile.blockPainter.tooltip.detailed.line6=якорей путешествия
 
-//Items
+#Items
 item.itemYetaWrench.name=Гаечный ключ Yeta
 item.itemYetaWrench.tooltip.detailed.line1=Скрывает фасады труб, когда в руке
 item.itemYetaWrench.tooltip.detailed.line2=Shift-ПКМ, чтобы моментально демонтировать
@@ -686,7 +692,7 @@ skullSentientEnder.name=Разумный Край
 
 item.itemSpawnEggEnderIO.name=Призвать существо - 
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=Тёмный шлем
 item.darkSteel_chestplate.name=Тёмная кираса
 item.darkSteel_leggings.name=Тёмные поножи
@@ -819,7 +825,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Генерирует
 enderio.darksteel.upgrade.solar_two.name=Солнечная батарея II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует энергию от солнца.
 
-//------GUI
+#------GUI
 
 enderio.gui.simple.in=Макс. вход:
 enderio.gui.simple.out=Макс. выход:
@@ -833,7 +839,7 @@ enderio.gui.receive=Получать
 enderio.gui.send=Отправлять
 enderio.gui.sendReceive=Отправлять и получать
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=Режим красного камня
 enderio.gui.tooltip.redstoneControlMode.ignore=Всегда активен
 enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу
@@ -881,7 +887,7 @@ enderio.gui.machine.side.up=Верх
 enderio.gui.machine.side.down=Низ
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=Управление двигателем
 enderio.gui.powerMonitor.emit=Подавать сигнал
 enderio.gui.powerMonitor.engineSection1=Подать сигнал, если хранилище заполнено меньше
@@ -897,7 +903,7 @@ enderio.gui.powerMonitor.monHeading4=Средний выход за 5 секун
 enderio.gui.powerMonitor.monHeading5=Средний вход за 5 секунд
 enderio.gui.powerMonitor.noNetworkError=Нет соединения с сетью. Индикатор мощности должен быть подключён к сети для считывания информации.
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=Силовая сеть
 enderio.gui.mjReader.conduitBuffer=Встроенный буфер
 enderio.gui.mjReader.requestRange=Диапазон запросов за тик
@@ -916,7 +922,7 @@ enderio.gui.mjReader.receiveItems=Может получать предметы
 enderio.gui.mjReader.receiveItem1=Может получать
 enderio.gui.mjReader.receiveItem2=от:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=Режим красного камня на входе
 enderio.gui.capBank.outputRs=Режим красного камня на выходе
 enderio.gui.capBank.maxIo=Макс. вход/выход
@@ -925,7 +931,7 @@ enderio.gui.capBank.maxOutput=Макс. выход
 enderio.gui.capBank.inputMode=Вход
 enderio.gui.capBank.outputMode=Выход
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=Общедоступный канал
 enderio.gui.trans.privateChannel=Частный канал
 enderio.gui.trans.addChannel=Добавить канал
@@ -937,37 +943,37 @@ enderio.gui.trans.itemMode=Режим предметов
 enderio.gui.trans.publicHeading=Общедоступный
 enderio.gui.trans.privateHeading=Частный
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=Режим печи
 enderio.gui.alloy.mode.all=Выплавка всех материалов
 enderio.gui.alloy.mode.alloy=Только сплавы
 enderio.gui.alloy.mode.furnace=Только обычные рецепты
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=Сила всасывания
 enderio.gui.vacuum.header.chest=Вакуумный сундук
 enderio.gui.vacuum.header.filter=Предметный фильтр
 enderio.gui.vacuum.header.range=Дальность
 
-//Vat
+#Vat
 enderio.vat.outputTank=Выход чана
 enderio.vat.inputTank=Вход чана
 enderio.gui.machine.vat.dump.1=Сбросить резервуар входа
 enderio.gui.machine.vat.dump.2=Сбросить резервуар выхода
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=Охладитель
 enderio.combustionGenerator.fuelTank=Топливо
 enderio.combustionGenerator.output=Генерирует:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=Генерирование:
 enderio.stirlingGenerator.burnRate=Скорость сгорания:
 enderio.stirlingGenerator.upgradeslot=Слот улучшения
 enderio.stirlingGenerator.upgrades={0} даёт {2}{1,number,#.#}x{3} эффективности
 enderio.stirlingGenerator.remaining=Осталось {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Только
 enderio.gui.travelAccessable.privateBlock2=может управлять настройками этого блока.
 enderio.gui.travelAccessable.public=Общедоступный
@@ -984,12 +990,12 @@ enderio.gui.telepad.configure.travel=Настройки путешествий
 enderio.gui.telepad.configure.telepad=Настройки телепорта
 enderio.gui.telepad.blocked=Телепорт заблокирован!
 
-//Spawn Gurad [sic]
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=Показать дальность
 enderio.gui.spawnGurad.hideRange=Спрятать дальность
 enderio.gui.spawnGurad.range=Дальность:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=Режим
 enderio.gui.conduit.ioMode.inOut=Вход / Выход
 enderio.gui.conduit.ioMode.input=Извлекать
@@ -1009,7 +1015,11 @@ 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.1=предмет не будет принят
 enderio.gui.conduit.item.blacklist=Чёрный список
+enderio.gui.conduit.item.blacklist.tooltip.0=Если список предметов пуст,
+enderio.gui.conduit.item.blacklist.tooltip.1=все предметы будут приняты
 enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на этот|или другие "липкие" выходы.
 enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен
 enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT
@@ -1022,11 +1032,14 @@ enderio.gui.conduit.item.roundRobinEnabled=Цикл включён
 enderio.gui.conduit.item.roundRobinDisabled=Цикл отключен
 enderio.gui.conduit.item.priority=Приоритет
 
-enderio.gui.conduit.item.fuzzy.disabled=Нечёткий режим отключен
-enderio.gui.conduit.item.fuzzy.fuzzy_25=Нечёткое совпадение на 25% урона
-enderio.gui.conduit.item.fuzzy.fuzzy_50=Нечёткое совпадение на 50% урона
-enderio.gui.conduit.item.fuzzy.fuzzy_75=Нечёткое совпадение на 75% урона
-enderio.gui.conduit.item.fuzzy.fuzzy_99=Нечёткое совпадение при любом уроне
+enderio.gui.conduit.item.fuzzy.disabled=Сравнение повреждения: Отключено
+enderio.gui.conduit.item.fuzzy.fuzzy_25=Сравнение повреждения: Повреждено на 25% или более
+enderio.gui.conduit.item.fuzzy.fuzzy_50=Сравнение повреждения: Повреждено на 50% или более
+enderio.gui.conduit.item.fuzzy.fuzzy_75=Сравнение повреждения: Повреждено на 75% или более
+enderio.gui.conduit.item.fuzzy.fuzzy_99=Сравнение повреждения: Повреждено хотя бы раз
+enderio.gui.conduit.item.fuzzy.tooltip.0=Может работать без предметов в фильтре
+enderio.gui.conduit.item.fuzzy.tooltip.1=В таком случае логика его работы
+enderio.gui.conduit.item.fuzzy.tooltip.2=контролируется кнопкой %s
 
 enderio.gui.conduit.item.filterupgrade=Вставить предметный фильтр
 enderio.gui.conduit.item.speedupgrade=Вставить улучшения скорости/понижение скорости
@@ -1045,17 +1058,16 @@ enderio.gui.conduit.fluid.blacklist=Чёрный список
 
 enderio.gui.conduit.gas.autoExtract=Авто-извлечение
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=Ясная погода
 enderio.gui.weather.task.rain=Дождливая погода
 enderio.gui.weather.task.storm=Гроза
-enderio.gui.weather.requireditem=Требуется предмет: %s
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=Печать души
 description.enchantment.enderio.soulBound=Предотвращает потерю предмета из инвентаря после смерти
 
-//Configuration
+#Configuration
 enderio.config.title=Конфигурация Ender IO
 
 enderio.config.power=Настройки энергии
@@ -1100,7 +1112,7 @@ enderio.config.fluid.tooltip=Чистая энергия жидкостей!
 enderio.config.spawner=Настройки электрического спаунера
 enderio.config.spawner.tooltip=У меня закончились остроумные подсказки.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=Броня из тёмной стали
 enderio.category.tools=Инструменты
 enderio.keybind.glidertoggle=Переключить планер

resources/assets/enderio/lang/zh_CN.lang

@@ -1,14 +1,14 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
-enderio.power.tmb=t/mB
+enderio.power.tmb=t/L
 enderio.power.tick=/t
 enderio.power.maxOutput=最大输出
 enderio.power.generates=产能
 enderio.power.generation_rate=速率
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=末影接口
 tile.blockEnderIo.tooltip.detailed.line1=允许远程访问附近的
 tile.blockEnderIo.tooltip.detailed.line2=方块
@@ -17,7 +17,7 @@ tile.blockEnderIo.tooltip.detailed.line4=旅行权杖
 
 item.enderio.itemEnderface.name=末影面板
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=导管接口
 enderio.blockConduitFacade=导管框架
 item.enderio.itemConduitFacade.name=导管框架
@@ -33,15 +33,34 @@ 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=导管开关
 enderio.itemRedstoneConduitInsulated.name=绝缘红石导管
 
-enderio.itemLiquidConduit.name=液体导管
-enderio.itemLiquidConduitAdvanced.name=高压液体导管
-enderio.itemLiquidConduitEnder.name=末影液体导管
-enderio.itemLiquidConduit.lockedType=液体种类锁定为
-enderio.itemLiquidConduit.unlockedType=液体种类解锁
+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.itemLiquidConduit.lockedType=流体种类锁定为
+enderio.itemLiquidConduit.unlockedType=流体种类解锁
 enderio.itemLiquidConduit.lockedWaila=锁定为
 
 enderio.itemLiquidConduit.tooltip.maxExtract=最大提取:
@@ -51,15 +70,16 @@ enderio.itemLiquidConduit.tooltip.detailed.line2=流量取决于流体
 enderio.itemLiquidConduit.tooltip.detailed.line3=黏性
 
 enderio.itemLiquidConduitEnder.tooltip.detailed.line1=流体即时远距离传送
-enderio.itemLiquidConduitEnder.tooltip.detailed.line2=允许多种液体
+enderio.itemLiquidConduitEnder.tooltip.detailed.line2=允许多种流体
 enderio.itemLiquidConduitEnder.tooltip.detailed.line3=同时被传送
 
 enderio.itemItemConduit.name=物品导管
 
 enderio.filterUpgradeBasic.name=基础物品过滤器
 enderio.filterUpgradeAdvanced.name=高级物品过滤器
+enderio.filterUpgradeBig.name=大型物品过滤器
+enderio.filterUpgradeBigAdvanced.name=高级大型物品过滤器
 enderio.itemConduitFilterUpgrade=物品导管升级
-
 enderio.itemConduitFilterUpgrade.configured=已配置
 enderio.itemConduitFilterUpgrade.clearConfigMethod=放到合成格里面清除
 enderio.itemConduitFilterUpgrade.clearConfigWarning=这会清除所有存储的数据!
@@ -115,18 +135,20 @@ enderio.itemMEConduit.name=ME导管
 enderio.itemMEConduitDense.name=致密ME导管
 enderio.itemMEConduit.channelsUsed=第{0,number}频道, 共{1,number}频道
 
-enderio.itemOCConduit.name=网络管道(OC)
+enderio.itemOCConduit.name=网络导管(OC)
 
-//Entity
+#Entity
 entity.witherSkeleton.name=凋零骷髅
 
-//Materials
+#Materials
 enderio.itemMaterial.name=材料
 enderio.silicon.name=硅
 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=复苏末影人头
@@ -144,7 +166,7 @@ enderio.itemEnderios.tooltip.detailed.line2=还有394g末影粉.
 enderio.itemEnderios.tooltip.detailed.line3=末影粉的副作用包括:恶心,头晕,混乱
 enderio.itemEnderios.tooltip.detailed.line4=以及随机传送.
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=营养精华液
 tile.fluid.nutrient_distillation.name=营养精华液
 item.bucketNutrient_distillation.name=桶装营养精华液
@@ -173,38 +195,59 @@ fluid.cloud_seed_concentrated=浓缩云之精华
 tile.fluid.cloud_seed_concentrated.name=浓缩云之精华
 item.bucketCloud_seed_concentrated.name=桶装浓缩云之精华
 
+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=液态XP
 tile.fluid.eio.xpjuice.name=液态XP
 item.bucketXpjuice.name=桶装液态XP
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=燃料详情
 enderio.fuel.tooltip.burnTime=燃烧时间 {0,number}
-enderio.fluid.millibucketsTick=mB/t
+enderio.fluid.millibucketsTick=L/t
 enderio.coolant.tooltip.heading=冷却剂
 enderio.coolant.tooltip.degreesPerBucket=度每桶
 enderio.gas.gasTick=气体每t
 
-//Materials
+#Materials
 enderio.itemMachinePart.name=机器零件
 enderio.machineChassi.name=机器框架
 enderio.basicGear.name=基础齿轮
+enderio.soulMachineChassi.name=灵魂机器框架
+enderio.endSteelMachineChassi.name=末影钢机器底盘
 enderio.pulsatingCrystal.name=脉冲晶体
 enderio.vibrantCrystal.name=充能晶体
 enderio.enderCrystal.name=末影晶体
 enderio.attractorCrystal.name=诱引晶体
 enderio.weatherCrystal.name=天气晶体
-enderio.darkGrindingBall.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=SAG磨粉机研磨球
 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=能抵挡凋零
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=石英玻璃
 enderio.blockFusedQuartz.fusedQuartz.name=石英玻璃
 enderio.blockFusedQuartz.fusedGlass.name=纯净玻璃
@@ -216,7 +259,7 @@ enderio.blockFusedQuartz.darkFusedGlass.name=黑暗纯净玻璃
 item.enderio.itemFusedQuartzFrame.name=石英玻璃框
 enderio.itemPowderIngot=粉和粒
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=合金锭
 enderio.electricalSteel.name=磁钢锭
 enderio.energeticAlloy.name=充能合金锭
@@ -227,6 +270,42 @@ enderio.phasedIron.name=脉冲铁锭
 enderio.vibrantNugget.name=脉冲合金粒
 enderio.darkSteel.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=磁钢块
@@ -238,8 +317,17 @@ tile.enderio.phasedIron.name=脉冲铁块
 tile.enderio.vibrantNugget.name=脉冲合金粒块
 tile.enderio.darkSteel.name=玄钢块
 tile.enderio.soularium.name=魂金块
+tile.enderio.endSteel.name=末影钢块
 
-//Powder / Ingot
+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=煤粉
 enderio.powderIron.name=铁粉
 enderio.powderGold.name=金粉
@@ -249,18 +337,25 @@ enderio.powderEnder.name=末影珍珠粉
 enderio.powderObsidian.name=黑曜石粉
 enderio.ingotEnderiumBase.name=末影锭粗胚
 
-//Capacitors
+#Capacitors
 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=增加机器能量存储与
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=速度/范围
 enderio.machine.tooltip.clearConfig=这会清除所有存储的数据!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=斯特林发电机
 tile.blockStirlingGenerator.tooltip.detailed.line1=燃烧固体燃料产生能量
 tile.blockStirlingGenerator.tooltip.detailed.line2=可通过添加电容器升级
@@ -283,6 +378,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=增加速度与能量存储
 
 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=顶部必须
@@ -382,7 +478,7 @@ enderio.trans.item=物品
 enderio.trans.fluid=流体
 enderio.trans.rail=轨道
 
-enderio.trans.recieving=接收
+enderio.trans.receiving=接收
 enderio.trans.sending=发送
 
 tile.blockPowerMonitor.name=能量监控器
@@ -398,11 +494,11 @@ tile.blockVat.tooltip.detailed.line1=用于生产末影接口中的流体
 
 tile.blockEnchanter.name=附魔器
 tile.blockEnchanter.tooltip.detailed.line1=使用XP让物品与
-tile.blockEnchanter.tooltip.detailed.line2=一个书与笔结合
 tile.blockEnchanter.tooltip.detailed.line2=来制作附魔书
+tile.blockEnchanter.tooltip.detailed.line3=附魔书创造!
 
 tile.blockCombustionGenerator.name=燃烧发电机
-tile.blockCombustionGenerator.tooltip.detailed.line1=燃烧液体燃料产生能量
+tile.blockCombustionGenerator.tooltip.detailed.line1=燃烧流体燃料产生能量
 tile.blockCombustionGenerator.tooltip.detailed.line2=需要冷却剂 (比如水)
 tile.blockCombustionGenerator.tooltip.detailed.line3=输出能量取决于燃料
 
@@ -412,12 +508,22 @@ tile.blockZombieGenerator.tooltip.detailed.line2=来产生能量
 enderio.zombieGenerator.fuelTank=营养液水槽
 enderio.gui.fluid.minReq=激活需要 %s 
 
+tile.blockFrankenzombieGenerator.name=人造僵尸发电机
+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=液时,这台机器就会自动攻
 tile.blockKillerJoe.tooltip.detailed.line3=击附近的生物
 tile.blockKillerJoe.tooltip.detailed.line4=经验能以液态XP的形式
-tile.blockKillerJoe.tooltip.detailed.line5=用液体管道抽出
+tile.blockKillerJoe.tooltip.detailed.line5=用流体管道抽出
 
 enderio.killerJoe.fuelTank=营养液槽
 enderio.killerJoe.giveXp.tooltip=吸收XP
@@ -447,7 +553,7 @@ tile.blockTank.name=流体箱
 tile.blockTank.advanced.name=高压流体箱
 tile.blockTank.tooltip.detailed.line1=便携式流体箱
 tile.blockTank.tooltip.detailed.line2=可用于清空或
-tile.blockTank.tooltip.detailed.line3=注满液体容器
+tile.blockTank.tooltip.detailed.line3=注满流体容器
 enderio.tank.tank=流体箱
 enderio.tooltip.none=空
 enderio.tooltip.fluidStored=存有流体
@@ -459,7 +565,7 @@ enderio.gui.void.mode.always=持续
 enderio.gui.void.mode.always.desc=空白物品栏接受所有物品
 
 enderio.gui.void.mode.if_not_container=非容器
-enderio.gui.void.mode.if_not_container.desc=空白物品栏接受所有物品除了液体容器
+enderio.gui.void.mode.if_not_container.desc=空白物品栏接受所有物品除了流体容器
 
 enderio.gui.void.mode.never=从不
 enderio.gui.void.mode.never.desc=空白物品栏不接受任何物品
@@ -574,7 +680,7 @@ enderio.gui.inventorypanel.tooltip.sync=NEI同步
 
 enderio.machine.tooltip.configured=(已配置)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=玄钢压力板
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=只能被玩家激活
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在喷涂机内喷涂,
@@ -596,7 +702,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=更加结实
 tile.blockDarkSteelLadder.name=玄铁梯子
 tile.blockDarkSteelLadder.tooltip.common.line1=比普通的梯子更易攀爬
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=旅行锚
 tile.blockTravelAnchor.tooltip.detailed.line1=允许在锚点之间传送
 tile.blockTravelAnchor.tooltip.detailed.line2=站在一个锚上, 看着
@@ -634,7 +740,7 @@ enderio.itemCoordSelector.chat.setCoords=设置坐标: %s
 enderio.itemCoordSelector.chat.newDimension=新世界: %s%s
 enderio.itemCoordSelector.chat.setDimension=设置世界: %s%s
 
-//Painter
+#Painter
 tile.blockPainter.name=喷涂机
 enderio.blockPainter.paintedWith=喷涂:
 tile.blockPaintedFence.name=喷涂栅栏
@@ -654,7 +760,7 @@ tile.blockPainter.tooltip.detailed.line4=玻璃框, 萤石, 地毯
 tile.blockPainter.tooltip.detailed.line5=深色压力板
 tile.blockPainter.tooltip.detailed.line6=旅行锚
 
-//Items
+#Items
 item.itemYetaWrench.name=以太扳手
 item.itemYetaWrench.tooltip.detailed.line1=手持时隐藏导管框架
 item.itemYetaWrench.tooltip.detailed.line2=右击可立即
@@ -698,10 +804,12 @@ skullZombieController.name=Z-逻辑控制器
 skullZombieFrankenstien.name=人造僵尸
 skullEnderResonator.name=末影谐振器
 skullSentientEnder.name=意识末影谐振器
+skullSkeletalContractor.name=骷髅契约板
+skullGuardianDiode.name=守卫者二极管
 
 item.itemSpawnEggEnderIO.name=生成
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=玄钢头盔
 item.darkSteel_chestplate.name=玄钢胸甲
 item.darkSteel_leggings.name=玄钢护腿
@@ -711,13 +819,41 @@ 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=终结之剑 MK2
+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=终结之剑 MK4
+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=激活后修剪多个方块/羊
 
@@ -725,12 +861,32 @@ enderio.item.darkSteel_sword.tooltip.line1=增加头颅与末影珍珠的掉落
 enderio.item.darkSteel_sword.tooltip.line2=击中后将阻止末影人传送
 enderio.item.darkSteel_sword.tooltip.line3=充能后伤害+2
 
+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.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=注能
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=能量: $P
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=能量将抵消
@@ -751,6 +907,11 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=能量: $P
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=能量将抵消
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=$D%耐久损耗
 
+enderio.darksteel.upgrade.empowered_five.name=注能 V
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=能量: $P
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=能量将抵消
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=$D%耐久损耗
+
 enderio.darksteel.upgrade.travel.name=旅行
 enderio.darksteel.upgrade.travel.tooltip.detailed.line1=按住shift右击来传送或
 enderio.darksteel.upgrade.travel.tooltip.detailed.line2=激活旅行锚和末影接口
@@ -778,16 +939,16 @@ enderio.darksteel.upgrade.gogglesOfRevealing.disabled=魔法隐藏在了普通
 enderio.darksteel.upgrade.naturalistEye.name=自然之眼
 enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=显示已授粉的树叶
 
-enderio.darksteel.upgrade.apiaristArmor.helmet.name=养蜂人之帽
+enderio.darksteel.upgrade.apiaristArmor.helmet.name=养蜂员之帽
 enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害
 
-enderio.darksteel.upgrade.apiaristArmor.chestplate.name=养蜂人之衣
+enderio.darksteel.upgrade.apiaristArmor.chestplate.name=养蜂员之衣
 enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害
 
-enderio.darksteel.upgrade.apiaristArmor.leggings.name=养蜂人之裤
+enderio.darksteel.upgrade.apiaristArmor.leggings.name=养蜂员之裤
 enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害
 
-enderio.darksteel.upgrade.apiaristArmor.boots.name=养蜂人之鞋
+enderio.darksteel.upgrade.apiaristArmor.boots.name=养蜂员之鞋
 enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害
 
 item.itemGliderWing.name=滑翔翼
@@ -834,7 +995,10 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=利用阳光产能.
 enderio.darksteel.upgrade.solar_two.name=太阳能 II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=利用阳光产能.
 
-//------GUI
+enderio.darksteel.upgrade.solar_three.name=太阳能 III
+enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=利用阳光产能.
+
+#------GUI
 
 enderio.gui.simple.in=最大输入:
 enderio.gui.simple.out=最大输出:
@@ -848,7 +1012,7 @@ enderio.gui.receive=接收
 enderio.gui.send=发送
 enderio.gui.sendReceive=发送和接收
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=红石模式
 enderio.gui.tooltip.redstoneControlMode.ignore=始终工作
 enderio.gui.tooltip.redstoneControlMode.on=收到信号工作
@@ -877,7 +1041,7 @@ enderio.gui.machine.ioMode.disabled=禁用
 enderio.gui.machine.ioMode.pullPush=推 / 拉
 enderio.gui.machine.ioMode.pullPush.colored=%s推 %s/ %s拉
 enderio.gui.machine.ioMode=模式: %s
-enderio.gui.machine.poweredspawner.capture=收获
+enderio.gui.machine.poweredspawner.capture=捕获
 enderio.gui.machine.poweredspawner.spawn=生成
 enderio.gui.machine.receivefilter=接收过滤
 enderio.gui.machine.sendfilter=发送过滤
@@ -896,7 +1060,7 @@ enderio.gui.machine.side.up=上
 enderio.gui.machine.side.down=下
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=引擎控制
 enderio.gui.powerMonitor.emit=发送
 enderio.gui.powerMonitor.engineSection1=输出信号条件:当存储
@@ -912,7 +1076,7 @@ enderio.gui.powerMonitor.monHeading4=5秒平均输出
 enderio.gui.powerMonitor.monHeading5=5秒平均输入
 enderio.gui.powerMonitor.noNetworkError=无管道网络连接. 能量监控器需连接于一个管道网路以读取数据.
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=能量网
 enderio.gui.mjReader.conduitBuffer=内部缓冲
 enderio.gui.mjReader.requestRange=每刻请求范围
@@ -931,7 +1095,7 @@ enderio.gui.mjReader.receiveItems=合法的接收对象:
 enderio.gui.mjReader.receiveItem1=可以接收
 enderio.gui.mjReader.receiveItem2=从:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=输入红石控制
 enderio.gui.capBank.outputRs=输出红石控制
 enderio.gui.capBank.maxIo=最大流量
@@ -940,49 +1104,49 @@ enderio.gui.capBank.maxOutput=最大输出
 enderio.gui.capBank.inputMode=输入模式
 enderio.gui.capBank.outputMode=输出模式
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=公共频道
 enderio.gui.trans.privateChannel=私人频道
 enderio.gui.trans.addChannel=添加频道
 enderio.gui.trans.deleteChannel=删除频道
 enderio.gui.trans.activateChannel=开启频道
 enderio.gui.trans.powerMode=能量模式
-enderio.gui.trans.fluidMode=液体模式
+enderio.gui.trans.fluidMode=流体模式
 enderio.gui.trans.itemMode=物品模式
 enderio.gui.trans.publicHeading=公共
 enderio.gui.trans.privateHeading=私有
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=熔炉模式
 enderio.gui.alloy.mode.all=全部烧炼
 enderio.gui.alloy.mode.alloy=仅限合金
 enderio.gui.alloy.mode.furnace=仅限熔炉
 
-//Vacuum chest
+#Vacuum chest
 enderio.gui.vacuum.range=吸取力度
 enderio.gui.vacuum.header.chest=真空箱子
 enderio.gui.vacuum.header.filter=物品过滤器
 enderio.gui.vacuum.header.range=范围
 
-//Vat
+#Vat
 enderio.vat.outputTank=输出槽
 enderio.vat.inputTank=输入槽
 enderio.gui.machine.vat.dump.1=导出输入槽
 enderio.gui.machine.vat.dump.2=导出输出槽
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=冷却剂
 enderio.combustionGenerator.fuelTank=燃料
 enderio.combustionGenerator.output=产能速率:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=产能速率:
 enderio.stirlingGenerator.burnRate=燃烧速率:
 enderio.stirlingGenerator.upgradeslot=升级栏
 enderio.stirlingGenerator.upgrades={0} 提供 {2}{1,number,#.#}x{3} 的效率
 enderio.stirlingGenerator.remaining=残余 {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=只有
 enderio.gui.travelAccessable.privateBlock2=才能改变该方块的设置.
 enderio.gui.travelAccessable.public=公共
@@ -999,12 +1163,12 @@ enderio.gui.telepad.configure.travel=旅行设置
 enderio.gui.telepad.configure.telepad=传送台设置
 enderio.gui.telepad.blocked=传送锁定!
 
-//Spawn Gurad
+#Spawn Gurad [sic]
 enderio.gui.spawnGurad.showRange=显示范围
 enderio.gui.spawnGurad.hideRange=隐藏范围
 enderio.gui.spawnGurad.range=范围:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=模式
 enderio.gui.conduit.ioMode.inOut=输入图/输出
 enderio.gui.conduit.ioMode.input=提取
@@ -1024,7 +1188,11 @@ enderio.gui.conduit.item.channel=频道
 enderio.gui.conduit.item.ignoreMetaData=忽略Meta数据
 enderio.gui.conduit.item.matchMetaData=匹配Meta数据
 enderio.gui.conduit.item.whitelist=白名单
+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.1=允许所有物品通过
 enderio.gui.conduit.item.stickyEnabled=粘滞模式开启.选定的物品只会被传送到这个或别的粘滞输出.
 enderio.gui.conduit.item.stickyDisbaled=粘滞模式关闭
 enderio.gui.conduit.item.ignoreNBT=忽略NBT数据
@@ -1037,11 +1205,14 @@ enderio.gui.conduit.item.roundRobinEnabled=循环启用
 enderio.gui.conduit.item.roundRobinDisabled=循环禁用
 enderio.gui.conduit.item.priority=优先级
 
-enderio.gui.conduit.item.fuzzy.disabled=模糊模式禁用
-enderio.gui.conduit.item.fuzzy.fuzzy_25=对 25% 损伤进行模糊比对
-enderio.gui.conduit.item.fuzzy.fuzzy_50=对 50% 损伤进行模糊比对
-enderio.gui.conduit.item.fuzzy.fuzzy_75=对 75% 损伤进行模糊比对
-enderio.gui.conduit.item.fuzzy.fuzzy_99=对任何损伤均进行模糊比对
+enderio.gui.conduit.item.fuzzy.disabled=耐久模式：禁用
+enderio.gui.conduit.item.fuzzy.fuzzy_25=耐久模式：耐久低于75%
+enderio.gui.conduit.item.fuzzy.fuzzy_50=耐久模式：耐久低于50%
+enderio.gui.conduit.item.fuzzy.fuzzy_75=耐久模式：耐久低于25%
+enderio.gui.conduit.item.fuzzy.fuzzy_99=耐久模式：非满耐久
+enderio.gui.conduit.item.fuzzy.tooltip.0=没有标记时也可正常工作
+enderio.gui.conduit.item.fuzzy.tooltip.1=在这种情况下，它的逻辑
+enderio.gui.conduit.item.fuzzy.tooltip.2=由 %s 按钮控制
 
 enderio.gui.conduit.item.filterupgrade=插入物品过滤器
 enderio.gui.conduit.item.speedupgrade=插入物品管道速度提升/降低升级
@@ -1060,18 +1231,18 @@ enderio.gui.conduit.fluid.blacklist=黑名单
 
 enderio.gui.conduit.gas.autoExtract=自动提取
 
-//Weather
+#Weather
 enderio.gui.weather.task.clear=清除天气
 enderio.gui.weather.task.rain=雨天
 enderio.gui.weather.task.storm=雷暴天气
-enderio.gui.weather.requireditem=需要物品: %s
+enderio.gui.weather.requiredfluid=需要流体: %s mB
 enderio.weatherObelisk.fuelTank=大气通量仓
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=灵魂绑定
 description.enchantment.enderio.soulBound=该附魔使物品免于死亡掉落
 
-//Configuration
+#Configuration
 enderio.config.title=末影接口配置文件
 
 enderio.config.power=能量设置
@@ -1116,7 +1287,7 @@ enderio.config.fluid.tooltip=纯净的液态能量!
 enderio.config.spawner=电动刷怪笼设置
 enderio.config.spawner.tooltip=我已经想不出什么有趣的提示文本了.
 
-//Keybinds/Waila/NEI/Tooltips
+#Keybinds/Waila/NEI/Tooltips
 enderio.category.darksteelarmor=玄铁护甲
 enderio.category.tools=工具
 enderio.keybind.glidertoggle=滑翔开关
@@ -1134,10 +1305,11 @@ enderio.nei.sagmill=SAG磨粉机
 enderio.nei.sagmill.outputchance=概率: {0,choice,0#'<1'|0<{0,number}}%
 enderio.nei.slicensplice=头颅装配机
 enderio.nei.soulbinder=灵魂绑定器
-enderio.nei.vat=酿液锅
+enderio.nei.vat=酿液桶
 enderio.tooltip.burntime=燃烧时间:
 enderio.tooltip.oredict=矿物辞典:
 enderio.tooltip.meta=Meta:
 enderio.tooltip.uid=UID:
 enderio.tooltip.anvilupgrades=铁砧升级:
 enderio.waila.config.hiddenfacades=隐形栅栏
+

resources/assets/enderio/lang/zh_TW.lang

@@ -1,11 +1,11 @@
-//***  Ender IO *****//
+#***  Ender IO ***#
 
-//Power
+#Power
 enderio.power.rf=RF
 enderio.power.tick=/t
 enderio.power.maxOutput=最大輸出
 
-//Ender IO / Enderface
+#Ender IO / Enderface
 tile.blockEnderIo.name=終界接口
 tile.blockEnderIo.tooltip.detailed.line1=允許遠程訪問附近的
 tile.blockEnderIo.tooltip.detailed.line2=方塊
@@ -14,7 +14,7 @@ tile.blockEnderIo.tooltip.detailed.line4=旅行權杖
 
 item.enderio.itemEnderface.name=終界面板
 
-//Conduits
+#Conduits
 enderio.blockConduitBundle=導管接口
 enderio.blockConduitFacade=導管框架
 item.enderio.itemConduitFacade.name=導管框架
@@ -34,6 +34,12 @@ 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.itemLiquidConduit.lockedType=液體種類鎖定為
 enderio.itemLiquidConduit.unlockedType=液體種類解鎖 
 
@@ -83,7 +89,7 @@ enderio.itemGasConduit.tooltip.detailed.line1=傳送和通用機械兼容的氣
 enderio.itemMEConduit.name=ME導管
 enderio.itemMEConduitDense.name=緻密ME導管
 
-//Materials
+#Materials
 enderio.itemMaterial.name=材料
 enderio.silicon.name=硅
 enderio.conduitBinder.name=導管粘合劑
@@ -98,7 +104,7 @@ enderio.blastResistant=防爆
 enderio.lightEmitter=發光
 enderio.tooltip.isBeaconBase=可用于當作信標底座
 
-//Fluids
+#Fluids
 fluid.nutrient_distillation=營養精華液
 tile.fluid.nutrient_distillation.name=營養精華液
 item.bucketNutrient_distillation.name=桶裝營養精華液
@@ -117,17 +123,16 @@ tile.fluid.eio.xpjuice.name=液態XP
 item.bucketXpjuice.name=桶裝液態XP
 
 
-enderio.fluid.millibucket.abr=mB
+enderio.fluid.millibucket.abr=L
 
 enderio.fuel.tooltip.heading=燃料詳情
 enderio.fuel.tooltip.burnTime=燃燒時間 {0,number}
-enderio.fluid.millibucketsTick=mB/t
-coolant.tooltip.heading=冷卻劑
-enderio.fuel.tooltip.degreesPerBucket=每單位一桶
+enderio.fluid.millibucketsTick=L/t
+enderio.coolant.tooltip.heading=冷卻劑
+enderio.coolant.tooltip.degreesPerBucket=每單位一桶
 enderio.gas.gasTick=Gas/t
 
-
-//Materials
+#Materials
 enderio.itemMachinePart.name=機器零件
 enderio.machineChassi.name=機器框架
 enderio.basicGear.name=基礎齒輪
@@ -142,9 +147,9 @@ enderio.darkGrindingBall.tooltip.detailed.line3=額外輸出
 enderio.darkGrindingBall.tooltip.detailed.line4=功率降低
 
 tile.blockReinforcedObsidian.name=強化黑曜石
-+tile.blockReinforcedObsidian.tooltip.common.line1=能抵擋凋零
+tile.blockReinforcedObsidian.tooltip.common.line1=能抵擋凋零
 
-//Quartz / Glass
+#Quartz / Glass
 tile.blockFusedQuartz.name=石英玻璃
 enderio.blockFusedQuartz.fusedQuartz.name=石英玻璃
 enderio.blockFusedQuartz.fusedGlass.name=純凈玻璃
@@ -154,7 +159,7 @@ enderio.blockFusedQuartz.enlightenedFusedGlass.name=螢光純凈玻璃
 item.enderio.itemFusedQuartzFrame.name=石英玻璃框
 enderio.itemPowderIngot=粉和粒
 
-//Alloys
+#Alloys
 enderio.itemAlloy.name=合金錠
 enderio.electricalSteel.name=磁鋼錠
 enderio.energeticAlloy.name=充能合金錠
@@ -177,7 +182,7 @@ tile.enderio.vibrantNugget.name=脈沖合金粒塊
 tile.enderio.darkSteel.name=玄鋼塊
 tile.enderio.soularium.name=魂金塊
 
-//Powder / Ingot
+#Powder / Ingot
 enderio.powderCoal.name=煤粉
 enderio.powderIron.name=鐵粉
 enderio.powderGold.name=金粉
@@ -186,7 +191,7 @@ enderio.powderTin.name=錫粉
 enderio.powderEnder.name=終界珍珠粉
 enderio.ingotEnderiumBase.name=Enderium Base
 
-//Capacitors
+#Capacitors
 enderio.itemBasicCapacitor.name=電容
 enderio.basicCapacitor.name=基礎電容
 enderio.activatedCapacitor.name=雙層電容
@@ -197,7 +202,7 @@ enderio.machine.tooltip.upgrade.tooltip.detailed.line1=增加機器能量存儲
 enderio.machine.tooltip.upgrade.tooltip.detailed.line2=速度/范圍
 enderio.machine.tooltip.clearConfig=這會清除所有存儲的數據!
 
-//Machines
+#Machines
 tile.blockStirlingGenerator.name=斯特林發電機
 tile.blockStirlingGenerator.tooltip.detailed.line1=燃燒固體燃料產生能量
 tile.blockStirlingGenerator.tooltip.detailed.line2=可通過添加電容器升級
@@ -312,7 +317,7 @@ enderio.trans.item=物品
 enderio.trans.fluid=流體
 enderio.trans.rail=軌
 
-enderio.trans.recieving=接收
+enderio.trans.receiving=接收
 enderio.trans.sending=發送
 
 tile.blockPowerMonitor.name=能量監控器
@@ -329,7 +334,7 @@ tile.blockVat.tooltip.detailed.line1=用于生產終界接口中的流體
 tile.blockEnchanter.name=附魔器
 tile.blockEnchanter.tooltip.detailed.line1=使用XP讓物品與
 tile.blockEnchanter.tooltip.detailed.line2=一個書與筆結合
-tile.blockEnchanter.tooltip.detailed.line2=來制作附魔書
+tile.blockEnchanter.tooltip.detailed.line3=來制作附魔書
 
 tile.blockCombustionGenerator.name=燃燒發電機
 tile.blockCombustionGenerator.tooltip.detailed.line1=燃燒液體燃料產生能量
@@ -424,7 +429,7 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=相鄰的水箱內
 
 enderio.machine.tooltip.configured=(已配置)
 
-//Blocks
+#Blocks
 tile.blockDarkSteelPressurePlate.name=玄鋼壓力板
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=只能被玩家啟用
 tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在粉刷機內粉刷,
@@ -446,7 +451,7 @@ tile.blockDarkSteelAnvil.tooltip.detailed.line2=更加結實耐用
 tile.blockDarkSteelLadder.name=玄鐵階梯
 tile.blockDarkSteelLadder.tooltip.common.line1=比普通階梯快
 
-//Travel
+#Travel
 tile.blockTravelAnchor.name=旅行錨
 tile.blockTravelAnchor.tooltip.detailed.line1=允許在錨點之間傳送
 tile.blockTravelAnchor.tooltip.detailed.line2=站在一個錨上, 看著
@@ -466,7 +471,7 @@ item.itemTravelStaff.tooltip.detailed.line4=<shift><右擊>
 item.itemTravelStaff.tooltip.detailed.line5=可短距離傳送玩家
 enderio.itemTravelStaff.notEnoughPower=能量不足
 
-//Painter
+#Painter
 tile.blockPainter.name=粉刷機
 enderio.blockPainter.paintedWith=粉刷:
 tile.blockPaintedFence.name=粉刷柵欄
@@ -486,7 +491,7 @@ tile.blockPainter.tooltip.detailed.line4=玻璃框, 螢石, 地毯
 tile.blockPainter.tooltip.detailed.line5=深色壓力板
 tile.blockPainter.tooltip.detailed.line6=旅行錨
 
-//Items
+#Items
 item.itemYetaWrench.name=以太扳手
 item.itemYetaWrench.tooltip.detailed.line1=手持時隱藏導管框架
 item.itemYetaWrench.tooltip.detailed.line2=右擊可立即
@@ -528,7 +533,7 @@ skullEnderResonator.name=終界諧振器
 
 item.itemSpawnEggEnderIO.name=生成
 
-//Dark Steel
+#Dark Steel
 item.darkSteel_helmet.name=玄鋼頭盔
 item.darkSteel_chestplate.name=玄鋼胸甲
 item.darkSteel_leggings.name=玄鋼護腿
@@ -537,9 +542,6 @@ item.darkSteel_sword.name=終結之劍
 item.darkSteel_pickaxe.name=玄鋼鏟
 item.darkSteel_axe.name=玄鋼斧
 
-enderio.item.tooltip.showDetails=<按住Shift>
-enderio.item.darkSteel.tooltip.durability=耐久度:
-
 enderio.item.darkSteel_pickaxe.tooltip.effPowered=充能后的效率
 enderio.item.darkSteel_pickaxe.tooltip.effObs=採集黑曜石的效率
 
@@ -639,7 +641,7 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=太陽能發電產生
 enderio.darksteel.upgrade.solar_two.name=太陽能 II
 enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=太陽能發電產生能源.
 
-//------GUI
+#------GUI
 
 enderio.gui.enabled=啟用
 enderio.gui.disabled=停用
@@ -647,7 +649,7 @@ enderio.gui.send=發送
 enderio.gui.receive=接收
 enderio.gui.sendReceive=發送和接收
 
-//Redstone controls
+#Redstone controls
 enderio.gui.tooltip.redstoneControlMode=紅石模式
 enderio.gui.tooltip.redstoneControlMode.ignore=始終工作
 enderio.gui.tooltip.redstoneControlMode.on=收到信號工作
@@ -671,7 +673,7 @@ enderio.gui.machine.side.up=上
 enderio.gui.machine.side.down=下
 
 
-//Power Monitor
+#Power Monitor
 enderio.gui.powerMonitor.engineControl=引擎控制
 enderio.gui.powerMonitor.emit=發送
 enderio.gui.powerMonitor.engineSection1=輸出信號條件:當存儲
@@ -686,7 +688,7 @@ enderio.gui.powerMonitor.monHeading3=機器緩衝
 enderio.gui.powerMonitor.monHeading4=5秒平均輸出
 enderio.gui.powerMonitor.monHeading5=5秒平均輸入
 
-//MJ Reader
+#MJ Reader
 enderio.gui.mjReader.networkHeading=能量網
 enderio.gui.mjReader.conduitBuffer=內部緩衝
 enderio.gui.mjReader.requestRange=每刻請求范圍
@@ -705,7 +707,7 @@ enderio.gui.mjReader.receiveItems=合法的接收對象:
 enderio.gui.mjReader.receiveItem1=可以接收
 enderio.gui.mjReader.receiveItem2=從:
 
-//CapactorBank
+#CapactorBank
 enderio.gui.capBank.inputRs=輸入紅石控制
 enderio.gui.capBank.outputRs=輸出紅石控制
 enderio.gui.capBank.maxIo=最大流量
@@ -714,7 +716,7 @@ enderio.gui.capBank.maxOutput=最大輸出
 enderio.gui.capBank.inputMode=輸入模式
 enderio.gui.capBank.outputMode=輸出模式
 
-//Transceiver
+#Transceiver
 enderio.gui.trans.publicChannel=公共頻道
 enderio.gui.trans.privateChannel=私人頻道
 enderio.gui.trans.addChannel=添加頻道
@@ -726,28 +728,28 @@ enderio.gui.trans.itemMode=物品模式
 enderio.gui.trans.publicHeading=公共
 enderio.gui.trans.privateHeading=私有
 
-//Alloy Smelter
+#Alloy Smelter
 enderio.gui.alloy.mode.heading=熔爐模式
 enderio.gui.alloy.mode.all=全部燒煉
 enderio.gui.alloy.mode.alloy=僅限合金
 enderio.gui.alloy.mode.furnace=僅限熔爐
 
-//Vat
+#Vat
 enderio.vat.outputTank=輸出槽
 enderio.vat.inputTank=輸入槽
 enderio.gui.machine.vat.dump.1=導出輸入槽
 enderio.gui.machine.vat.dump.2=導出輸出槽
 
-//Combustion Gen
+#Combustion Gen
 enderio.combustionGenerator.coolantTank=冷卻劑
 enderio.combustionGenerator.fuelTank=燃料
 enderio.combustionGenerator.output=產能速率:
 
-//Stirling Gen
+#Stirling Gen
 enderio.stirlingGenerator.output=產能速率:
 enderio.stirlingGenerator.burnRate=燃燒速率:
 
-//Travel Blocks
+#Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=只有
 enderio.gui.travelAccessable.privateBlock2=才能改變該方塊的設置.
 enderio.gui.travelAccessable.public=公共
@@ -757,11 +759,11 @@ enderio.gui.travelAccessable.unauthorised=你沒有訪問該方塊的權限.
 enderio.gui.travelAccessable.enterCode=需要訪問密碼
 enderio.gui.travelAccessable.ok=已賦權
 
-//Spawn Gurad
+#Spawn Gurad
 enderio.gui.spawnGurad.showRange=顯示范圍
 enderio.gui.spawnGurad.range=范圍:
 
-//conduits
+#conduits
 enderio.gui.conduit.ioMode=模式
 enderio.gui.conduit.ioMode.inOut=輸入圖/輸出
 enderio.gui.conduit.ioMode.input=提取
@@ -800,10 +802,10 @@ enderio.gui.conduit.fluid.filter=過濾器
 
 enderio.gui.conduit.gas.autoExtract=自動提取
 
-//Enchants
+#Enchants
 enchantment.enderio.soulBound=靈魂綁定
 
-//Configuration
+#Configuration
 enderio.config.title=終界接口配置文件
 
 enderio.config.power=能量設置
@@ -846,4 +848,403 @@ enderio.config.fluid=流體設置
 enderio.config.fluid.tooltip=純凈的液態能量!
 
 enderio.config.spawner=電動刷怪籠設置
-enderio.config.spawner.tooltip=我已經想不出什麼有趣的提示文本了.
+enderio.config.spawner.tooltip=我已經想不出什麼有趣的提示文本了.enderio.power.tmb=t/L
+enderio.power.generates=Generates
+enderio.power.generation_rate=at
+item.enderio.itemConduitFacade.hardened.name=Hardened Conduit Facade
+enderio.item.itemConduitFacade.tooltip.notpainted=Not Painted
+item.enderio.itemConduitFacade.hardened.tooltip=Hardened: Resists breaking and explosions
+enderio.itemPowerConduitEndergyCrude.name=Clay Compound Energy Conduit
+enderio.itemPowerConduitEndergyIron.name=Iron Energy Conduit
+enderio.itemPowerConduitEndergyAluminum.name=Aluminum Energy Conduit
+enderio.itemPowerConduitEndergyGold.name=Gold Energy Conduit
+enderio.itemPowerConduitEndergyCopper.name=Copper Energy Conduit
+enderio.itemPowerConduitEndergySilver.name=Silver Energy Conduit
+enderio.itemPowerConduitEndergyElectrum.name=Electrum Energy Conduit
+enderio.itemPowerConduitEndergyEnergeticSilver.name=Energetic Silver Energy Conduit
+enderio.itemPowerConduitEndergyCrystalline.name=Crystalline Energy Conduit
+enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Crystalline Pink Slime Energy Conduit
+enderio.itemPowerConduitEndergyMelodic.name=Melodic Energy Conduit
+enderio.itemPowerConduitEndergyStellar.name=Stellar Energy Conduit
+enderio.itemLiquidConduit.lockedWaila=Locked to
+enderio.filterUpgradeBig.name=Big Item Filter
+enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter
+item.itemExistingItemFilter.tooltip.detailed.line3=Right click while sneaking
+item.itemExistingItemFilter.tooltip.detailed.line4=on an inventory to add the
+item.itemExistingItemFilter.tooltip.detailed.line5=content to the snapshot
+enderio.item.itemExistingItemFilter.filterUpdated=New items have been added to the snapshot
+enderio.item.itemExistingItemFilter.filterNotUpdated=The snapshot already covers all items in the inventory
+item.itemPowerItemFilter.name=Chargeable Item Filter
+item.itemPowerItemFilter.tooltip.basic.line1=Upgrade for item conduits
+item.itemPowerItemFilter.tooltip.detailed.line1=Filters chargeable items based on
+item.itemPowerItemFilter.tooltip.detailed.line2=how much RF they have stored
+item.itemExtractSpeedDowngrade.name=Item Conduit Speed Downgrade
+item.itemExtractSpeedDowngrade.tooltip.basic.line1=Downgrade for item conduits
+item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Reduces speed to 1
+item.itemExtractSpeedDowngrade.tooltip.detailed.line2=item per extraction
+item.itemInventoryPanelUpgrade.name=Remote Awareness Upgrade
+item.itemInventoryPanelUpgrade.tooltip.basic.line1=Inventory Panel Remote Awareness
+item.itemInventoryPanelUpgrade.tooltip.detailed.line1=Function upgrade for item conduits
+item.itemInventoryPanelUpgrade.tooltip.detailed.line2=Allows Inventory Panels attached
+item.itemInventoryPanelUpgrade.tooltip.detailed.line3=to this network to see and extract
+item.itemInventoryPanelUpgrade.tooltip.detailed.line4=items from this inventory independent
+item.itemInventoryPanelUpgrade.tooltip.detailed.line5=of the conduit mode.
+item.itemInventoryPanelUpgrade.tooltip.detailed.line6=(No need to set the conduit to extract)
+enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels
+enderio.itemOCConduit.name=Network Conduit (OC)
+entity.witherSkeleton.name=Wither Skeleton
+tile.blockSoulariumBars.name=Soularium Bars
+tile.blockEndSteelBars.name=End Steel Bars
+enderio.lightBlocker=Blocks Light
+enderio.dustWheat.name=Flour
+enderio.itemEnderios.name="Enderios"
+enderio.itemEnderios.tooltip.common.line1=Part of a balanced breakfast!
+enderio.itemEnderios.tooltip.detailed.line1=Not actually healthy. Contains 253g of sugar, 53g of fat,
+enderio.itemEnderios.tooltip.detailed.line2=and 394g of ender dust.
+enderio.itemEnderios.tooltip.detailed.line3=Side effects of ender dust include: nausea, dizziness, confusion,
+enderio.itemEnderios.tooltip.detailed.line4=and random teleporting.
+fluid.liquid_sunshine=Liquid Sunshine
+tile.fluid.liquid_sunshine.name=Liquid Sunshine
+item.bucketLiquid_sunshine.name=Liquid Sunshine Bucket
+fluid.cloud_seed=Cloud Seed
+tile.fluid.cloud_seed.name=Cloud Seed
+item.bucketCloud_seed.name=Cloud Seed Bucket
+fluid.cloud_seed_concentrated=Concentrated Cloud Seed
+tile.fluid.cloud_seed_concentrated.name=Concentrated Cloud Seed
+item.bucketCloud_seed_concentrated.name=Concentrated Cloud Seed Bucket
+fluid.ender_distillation=Dew of the Void
+tile.fluid.ender_distillation.name=Dew of the Void
+item.bucketEnder_distillation.name=Dew of the Void Bucket
+fluid.vapor_of_levity=Vapor of Levity
+tile.fluid.vapor_of_levity.name=Vapor of Levity
+item.bucketVapor_of_levity.name=Vapor of Levity Bucket
+enderio.soulMachineChassi.name=Soul Machine Chassis
+enderio.endSteelMachineChassi.name=End Steel Chassis
+enderio.weatherCrystal.name=Weather Crystal
+enderio.electricalGrindingBall.name=Electrical Steel Ball
+enderio.energeticGrindingBall.name=Energetic Alloy Ball
+enderio.vibrantGrindingBall.name=Vibrant Alloy Ball
+enderio.redstoneGrindingBall.name=Redstone Alloy Ball
+enderio.conductiveGrindingBall.name=Conductive Iron Ball
+enderio.pulsatingGrindingBall.name=Pulsating Iron Ball
+enderio.soulariumGrindingBall.name=Soularium Ball
+enderio.endSteelGrindingBall.name=End Steel Ball
+enderio.darkSteelRod.name=Dark Steel Rod
+enderio.blockFusedQuartz.darkFusedQuartz.name=Dark Fused Quartz
+enderio.blockFusedQuartz.darkFusedGlass.name=Dark Clear Glass
+enderio.endSteel.name=End Steel
+enderio.endSteelNugget.name=End Steel Nugget
+enderio.crudeSteel.name=Clay Compound
+enderio.crystallineAlloy.name=Crystalline Alloy
+enderio.melodicAlloy.name=Melodic Alloy
+enderio.stellarAlloy.name=Stellar Alloy
+enderio.crystallinePinkSlime.name=Crystalline Pink Slime
+enderio.energeticSilver.name=Energetic Silver
+enderio.vividAlloy.name=Vivid Alloy
+enderio.crudeSteelGrindingBall.name=Clay Compound Grinding Ball
+enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball
+enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball
+enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball
+enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball
+enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball
+enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball
+enderio.precientCrystal.name=Precient Crystal
+enderio.pulsatingPowder.name=Grains of Piezallity
+enderio.vibrantPowder.name=Grains of Vibrancy
+enderio.enderCrystalPowder.name=Grains of the End
+enderio.precientPowder.name=Grains of Prescience
+enderio.electricalSteel_ball.name=Electrical Steel Ball
+enderio.energeticAlloy_ball.name=Energetic Alloy Ball
+enderio.phasedGold_ball.name=Vibrant Alloy Ball
+enderio.redstoneAlloy_ball.name=Redstone Alloy Ball
+enderio.conductiveIron_ball.name=Conductive Iron Ball
+enderio.phasedIron_ball.name=Pulsating Iron Ball
+enderio.vibrantNugget_ball.name=Vibrant Alloy Nugget Ball
+enderio.darkSteel_ball.name=Dark Steel Ball
+enderio.soularium_ball.name=Soularium Ball
+enderio.endSteel_ball.name=End Steel Ball
+tile.enderio.endSteel.name=End Steel Block
+tile.enderio.crudeSteel.name=Clay Compound Block
+tile.enderio.crystallineAlloy.name=Crystalline Alloy Block
+tile.enderio.melodicAlloy.name=Melodic Alloy Block
+tile.enderio.stellarAlloy.name=Stellar Alloy Block
+tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block
+tile.enderio.energeticSilver.name=Energetic Silver Block
+tile.enderio.vividAlloy.name=Vivid Alloy Block
+enderio.powderObsidian.name=Obsidian Powder
+enderio.crystallineCapacitor.name=Crystalline Capacitor
+enderio.melodicCapacitor.name=Melodic Capacitor
+enderio.stellarCapacitor.name=Stellar Capacitor
+enderio.silverCapacitor.name=Silver Capacitor
+enderio.endergeticCapacitor.name=Endergetic Capacitor
+enderio.endergisedCapacitor.name=Endergised Capacitor
+enderio.totemicCapacitor.name=Totemic Capacitor
+tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell
+tile.blockSolarPanel.tooltip.common.line1=Solar Power!
+enderio.tooltip.sunlightBlocked=Sky Blocked!
+tile.blockCapBank.tooltip.hasItems={0,number,integer} {0,choice,1#item|1<items} in inventory
+enderio.capbank.iodisplay.stable=I/O
+enderio.capbank.iodisplay.gain=In
+enderio.capbank.iodisplay.loss=Out
+enderio.capbank.iodisplay.input=Input
+enderio.capbank.iodisplay.output=Output
+enderio.gui.fluid.minReq=%s Required for activation
+tile.blockFrankenzombieGenerator.name=Frank'N'Zombie Generator
+tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Consumes Nutrient Distillation
+tile.blockFrankenzombieGenerator.tooltip.detailed.line2=to generate even more power
+enderio.frankenzombieGenerator.fuelTank=Nutrient Tank
+tile.blockEnderGenerator.name=Ender Generator
+tile.blockEnderGenerator.tooltip.detailed.line1=Consumes Dew of the Void
+tile.blockEnderGenerator.tooltip.detailed.line2=to generate power
+enderio.enderGenerator.fuelTank=Void Tank
+enderio.farm.gui.baseUse=Base Use:
+enderio.gui.tooltip.voidslot=Void Slot
+enderio.gui.void.mode=Void Mode
+enderio.gui.void.mode.always=Always
+enderio.gui.void.mode.always.desc=Void slot accepts all items
+enderio.gui.void.mode.if_not_container=If Not Container
+enderio.gui.void.mode.if_not_container.desc=Void slot accepts all items that are not fluid containers
+enderio.gui.void.mode.never=Never
+enderio.gui.void.mode.never.desc=Void slot does not accept items
+enderio.tile.blockPoweredSpawner.tooltip.none=None
+tile.blockWeatherObelisk.name=Weather Obelisk
+tile.blockWeatherObelisk.tooltip.detailed.line1=Changes the current weather
+tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and
+tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item
+tile.blockBuffer.item.name=Item Buffer
+tile.blockBuffer.power.name=Power Buffer
+tile.blockBuffer.omni.name=Omni Buffer
+tile.blockBuffer.creative.name=Creative Buffer
+tile.blockInventoryPanel.name=Inventory Panel
+tile.blockInventoryPanel.tooltip.basic.line1=Remote access and crafting
+tile.blockInventoryPanel.tooltip.detailed.line1=Allows remote access to inventories via
+tile.blockInventoryPanel.tooltip.detailed.line2=Remote Awareness Upgrades in item conduits.
+tile.blockInventoryPanel.tooltip.detailed.line3=Uses Nutrient Distillation for power.
+tile.blockInventoryPanel.tooltip.detailed.line4=Offers a persistent crafting grid.
+enderio.gui.inventorypanel.header.crafting=Crafting grid
+enderio.gui.inventorypanel.header.return=Return area
+enderio.gui.inventorypanel.header.storage=Storage area
+enderio.gui.inventorypanel.info.filter=<filter by name>
+enderio.gui.inventorypanel.info.offline=<OFFLINE>
+enderio.gui.inventorypanel.tooltip.return.line1=Item return area
+enderio.gui.inventorypanel.tooltip.return.line2=Items placed here can be extracted
+enderio.gui.inventorypanel.tooltip.return.line3=by an item conduit, but will not be
+enderio.gui.inventorypanel.tooltip.return.line4=used for crafting.
+enderio.gui.inventorypanel.tooltip.return.line5=Click to change into storage area.
+enderio.gui.inventorypanel.tooltip.storage.line1=Item storage area
+enderio.gui.inventorypanel.tooltip.storage.line2=Small temporary item storage area.
+enderio.gui.inventorypanel.tooltip.storage.line3=Click to change into return area
+enderio.gui.inventorypanel.tooltip.filterslot.line1=Filter card slot
+enderio.gui.inventorypanel.tooltip.filterslot.line2=Place configured item filters in
+enderio.gui.inventorypanel.tooltip.filterslot.line3=here to select which items to show.
+enderio.gui.inventorypanel.tooltip.sort.name_down.line1=Sort items by name
+enderio.gui.inventorypanel.tooltip.sort.name_up.line1=Sort items by name
+enderio.gui.inventorypanel.tooltip.sort.name_up.line2=Starting at the end of the alphabet
+enderio.gui.inventorypanel.tooltip.sort.mod_down.line1=Sort items by mod ID
+enderio.gui.inventorypanel.tooltip.sort.mod_down.line2=Items from the same mod are sorted by name
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line1=Sort items by mod ID
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line2=Items from the same mod are sorted by name
+enderio.gui.inventorypanel.tooltip.sort.mod_up.line3=Starting at the end of the alphabet
+enderio.gui.inventorypanel.tooltip.sort.count_down.line1=Sort items by their quantity
+enderio.gui.inventorypanel.tooltip.sort.count_down.line2=Starting with the highest quantity
+enderio.gui.inventorypanel.tooltip.sort.count_up.line1=Sort items by their quantity
+enderio.gui.inventorypanel.tooltip.sort.count_up.line2=Starting with the lonely ones
+enderio.gui.inventorypanel.tooltip.refill.line1=Refills the crafting grid
+enderio.gui.inventorypanel.tooltip.refill.line2=A normal click puts items
+enderio.gui.inventorypanel.tooltip.refill.line3=for one crafting opperations,
+enderio.gui.inventorypanel.tooltip.refill.line4=while a shift click tries to
+enderio.gui.inventorypanel.tooltip.refill.line5=fill the crafting grid.
+enderio.gui.inventorypanel.tooltip.setrecipe.line1=Learn the current crafting recipe
+enderio.gui.inventorypanel.tooltip.setrecipe.line2=Allows the refilling for the
+enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the network.
+enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid
+enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area
+enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank
+enderio.gui.inventorypanel.tooltip.itemsstored=Items Stored: %s
+enderio.gui.inventorypanel.tooltip.addrecipe.line1=Store the current crafting recipe
+enderio.gui.inventorypanel.tooltip.addrecipe.line2=A maximum of 6 recipes can be stored.
+enderio.gui.inventorypanel.tooltip.addrecipe.line3=Left clicking a stored recipe will try to put
+enderio.gui.inventorypanel.tooltip.addrecipe.line4=items for one crafting operation into the grid.
+enderio.gui.inventorypanel.tooltip.addrecipe.line5=Shift left clicking tries to fill the crafting
+enderio.gui.inventorypanel.tooltip.addrecipe.line6=grid to the maximum.
+enderio.gui.inventorypanel.tooltip.addrecipe.line7=Right click a stored recipe to delete it.
+enderio.gui.inventorypanel.tooltip.sync=NEI Sync
+tile.blockTelePad.name=Telepad Block
+tile.blockTelePad.tooltip.detailed.line1=Uses power to teleport entities
+tile.blockTelePad.tooltip.detailed.line2=to a specific position and dimension.
+tile.blockTelePad.tooltip.detailed.line3=Must be placed in a 3x1x3 multiblock.
+enderio.gui.telepad.teleport=Teleport!
+item.itemCoordSelector.name=Coordinate Selector
+item.itemCoordSelector.tooltip.detailed.line1=Stores coordinates of a block.
+item.itemCoordSelector.tooltip.detailed.line2=Right click at block to select
+item.itemCoordSelector.tooltip.detailed.line3=the block adjacent on that side.
+item.itemCoordSelector.tooltip.detailed.line4=Shift right click at a block to
+item.itemCoordSelector.tooltip.detailed.line5=select that specific block.
+item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance.
+enderio.itemCoordSelector.chat.newCoords=New Coords: %s
+enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
+enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
+enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
+enderio.item.itemSoulVessel.tooltip.health=Health:
+enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name:
+enderio.item.itemSoulVessel.tooltip.color=Color:
+enderio.item.itemSoulVessel.tooltip.empty=Empty
+skullSentientEnder.name=Sentient Ender
+skullSkeletalContractor.name=Skeletal Contractor
+skullGuardianDiode.name=Guardian Diode
+item.darkSteel_shears.name=Dark Shears
+item.endSteel_helmet.name=End Steel Helm
+item.endSteel_chestplate.name=End Steel Plate
+item.endSteel_leggings.name=End Steel Leggings
+item.endSteel_boots.name=End Steel Boots
+item.endSteel_sword.name=The Ender MKII
+item.endSteel_pickaxe.name=End Steel Pick
+item.endSteel_axe.name=End Steel Axe
+item.stellar_helmet.name=Stellar Helm
+item.stellar_chestplate.name=Stellar Plate
+item.stellar_leggings.name=Stellar Leggings
+item.stellar_boots.name=Stellar Boots
+item.stellar_sword.name=The Ender MKIV
+item.stellar_pickaxe.name=Stellar Pick
+item.stellar_axe.name=Stellar Axe
+enderio.item.darkSteel.tooltip.lvs=lvs
+enderio.item.darkSteel_pickaxe.tooltip.cost=cost
+enderio.item.endSteel_pickaxe.tooltip.effPowered=Efficiency when powered
+enderio.item.endSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian
+enderio.item.endSteel_pickaxe.tooltip.cost=cost
+enderio.item.stellar_pickaxe.tooltip.effPowered=Efficiency when powered
+enderio.item.stellar_pickaxe.tooltip.effObs=Efficiency breaking obsidian
+enderio.item.stellar_pickaxe.tooltip.cost=cost
+enderio.item.endSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
+enderio.item.stellar_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
+enderio.item.darkSteel_shears.tooltip.multiHarvest=Shears multiple blocks/sheep when empowered
+enderio.item.endSteel_sword.tooltip.line1=Increased skull and ender pearl drops
+enderio.item.endSteel_sword.tooltip.line2=Endermen can't teleport once hit
+enderio.item.endSteel_sword.tooltip.line3=+2 Damage when Powered
+enderio.item.stellar_sword.tooltip.line1=Increased skull and ender pearl drops
+enderio.item.stellar_sword.tooltip.line2=Endermen can't teleport once hit
+enderio.item.stellar_sword.tooltip.line3=+2 Damage when Powered
+enderio.item.endSteel_armor.tooltip.line1=Diamond+ level protection
+enderio.item.endSteel_armor.tooltip.line2=when powered
+enderio.item.stellar_armor.tooltip.line1=Diamond+ level protection
+enderio.item.stellar_armor.tooltip.line2=when powered
+enderio.item.endSteel_boots.tooltip.line1=Fall damage negated
+enderio.item.endSteel_boots.tooltip.line2=when powered
+enderio.item.stellar_boots.tooltip.line1=Fall damage negated
+enderio.item.stellar_boots.tooltip.line2=when powered
+enderio.darksteel.upgrade.empowered_five.name=Empowered V
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=Power: $P
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=$D% damage absorbed
+enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=by power
+enderio.darksteel.upgrade.gogglesOfRevealing.enabled=Magic is being revealed
+enderio.darksteel.upgrade.gogglesOfRevealing.disabled=Magic is hidden from plain sight
+enderio.darksteel.upgrade.naturalistEye.name=Naturalist's Eye
+enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=Shows pollinated tree leaves
+enderio.darksteel.upgrade.apiaristArmor.helmet.name=Apiarist's Hat
+enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.chestplate.name=Apiarist's Shirt
+enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.leggings.name=Apiarist's Pants
+enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.apiaristArmor.boots.name=Apiarist's Shoes
+enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Protection against bees
+enderio.darksteel.upgrade.jump.enabled=Jump Enabled
+enderio.darksteel.upgrade.jump.disabled=Jump Disabled
+enderio.darksteel.upgrade.solar_three.name=Solar III
+enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Generates power from the sun.
+enderio.gui.simple.in=Max In:
+enderio.gui.simple.out=Max Out:
+enderio.gui.available=Available
+enderio.gui.max=Max:
+enderio.gui.progress=Progress {0,number}%
+enderio.gui.machine.button.storelevel=Store 1
+enderio.gui.machine.tooltip.storelevel=level of player XP
+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.visible.line1=Shift click to reset all sides
+enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting
+enderio.gui.machine.poweredspawner.capture=Capture
+enderio.gui.machine.poweredspawner.spawn=Spawn
+enderio.gui.machine.receivefilter=Receive Filter
+enderio.gui.machine.sendfilter=Send Filter
+enderio.gui.machine.sendReceivebuffer=Send/Receive Buffer
+enderio.gui.machine.localbuffer=Local Buffer
+enderio.gui.machine.upkeep=Upkeep:
+enderio.gui.machine.bufferingstacks=Buffering item stacks
+enderio.gui.machine.bufferingsingle=Buffering single items
+enderio.gui.machine.percraft=Per Craft
+enderio.gui.powerMonitor.noNetworkError=No conduit network attached. The Power Monitor needs to be attached to a conduit network to read data from.
+enderio.gui.vacuum.range=Suction Strength
+enderio.gui.vacuum.header.chest=Vacuum Chest
+enderio.gui.vacuum.header.filter=Item Filter
+enderio.gui.vacuum.header.range=Range
+enderio.stirlingGenerator.upgradeslot=Upgrade slot
+enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficiency
+enderio.stirlingGenerator.remaining=Remaining {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
+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.telepad.configure.travel=Travel Settings
+enderio.gui.telepad.configure.telepad=Telepad Settings
+enderio.gui.telepad.blocked=Teleport Blocked!
+enderio.gui.spawnGurad.hideRange=Hide Range
+enderio.gui.conduit.button.clear=Clear
+enderio.gui.conduit.button.merge=Merge
+enderio.gui.conduit.button.show=Show
+enderio.gui.conduit.button.snap=Snapshot
+enderio.gui.conduit.item.whitelist.tooltip.0=If item list is empty, no item
+enderio.gui.conduit.item.whitelist.tooltip.1=will be allowed to pass
+enderio.gui.conduit.item.blacklist.tooltip.0=If item list is empty, all items
+enderio.gui.conduit.item.blacklist.tooltip.1=will be allowed to pass
+enderio.gui.conduit.item.fuzzy.disabled=Damage Mode: Disabled
+enderio.gui.conduit.item.fuzzy.fuzzy_25=Damage Mode: Damaged by 25% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_50=Damage Mode: Damaged by 50% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_75=Damage Mode: Damaged by 75% or more
+enderio.gui.conduit.item.fuzzy.fuzzy_99=Damage Mode: Damaged at least once
+enderio.gui.conduit.item.fuzzy.tooltip.0=Can work without items in the filter
+enderio.gui.conduit.item.fuzzy.tooltip.1=In this case its logic can be
+enderio.gui.conduit.item.fuzzy.tooltip.2=controlled by %s button
+enderio.gui.conduit.item.filterupgrade=Insert Item Filter
+enderio.gui.conduit.item.speedupgrade=Insert Item Conduit Speed Upgrades/Downgrade
+enderio.gui.conduit.item.speedupgrade2=Max upgrades is 15; Max downgrades is 1
+enderio.gui.conduit.item.functionupgrade.line1=Possible function upgrades:
+enderio.gui.conduit.fluid.whitelist=Whitelist
+enderio.gui.conduit.fluid.blacklist=Blacklist
+enderio.gui.weather.task.clear=Clear Weather
+enderio.gui.weather.task.rain=Rainy Weather
+enderio.gui.weather.task.storm=Thunderstorm
+enderio.gui.weather.requiredfluid=Required Fluid: %s L
+enderio.weatherObelisk.fuelTank=Barometric Flux Tank
+description.enchantment.enderio.soulBound=Prevents item from being lost on death
+enderio.category.darksteelarmor=Dark Steel Armor
+enderio.category.tools=Tools
+enderio.keybind.glidertoggle=Glider Toggle
+enderio.keybind.gogglesofrevealing=Goggles of Revealing
+enderio.keybind.nightvision=Night Vision
+enderio.keybind.soundlocator=Sound Locator
+enderio.keybind.speed=Speed
+enderio.keybind.jump=Jump
+enderio.keybind.stepassist=Step Assist
+enderio.keybind.yetawrenchmode=Yeta Wrench Mode
+enderio.keybind.magnet=Toggle Electromagnet
+enderio.nei.alloysmelter=Alloy Smelter
+enderio.nei.enchanter=Enchanter
+enderio.nei.sagmill=SAG Mill
+enderio.nei.sagmill.outputchance=Chance: {0,choice,0#'<1'|0<{0,number}}%
+enderio.nei.slicensplice=Slice'N'Splice
+enderio.nei.soulbinder=Soul Binder
+enderio.nei.vat=Vat
+enderio.tooltip.burntime=Burn Time:
+enderio.tooltip.oredict=Ore Dictionary:
+enderio.tooltip.meta=Meta:
+enderio.tooltip.uid=UID:
+enderio.tooltip.anvilupgrades=Anvil Upgrades:
+enderio.waila.config.hiddenfacades=Sneaky Facades

resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

src/main/java/crazypants/enderio/ClientProxy.java

@@ -36,12 +36,17 @@ import crazypants.enderio.conduit.gas.GasConduit;
 import crazypants.enderio.conduit.gas.GasConduitRenderer;
 import crazypants.enderio.conduit.gas.GasUtil;
 import crazypants.enderio.conduit.item.ItemConduit;
+import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitRenderer;
+import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.LiquidConduit;
 import crazypants.enderio.conduit.liquid.LiquidConduitRenderer;
+import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
 import crazypants.enderio.conduit.me.MEConduit;
 import crazypants.enderio.conduit.me.MEUtil;
 import crazypants.enderio.conduit.oc.OCConduit;
@@ -212,7 +217,12 @@ public class ClientProxy extends CommonProxy {
     PowerConduitEndergy.initIcons();
     LiquidConduit.initIcons();
     AdvancedLiquidConduit.initIcons();
+    AbstractEnderLiquidConduit.initIcons();
     EnderLiquidConduit.initIcons();
+    CrystallineEnderLiquidConduit.initIcons();
+    CrystallinePinkSlimeEnderLiquidConduit.initIcons();
+    MelodicEnderLiquidConduit.initIcons();
+    StellarEnderLiquidConduit.initIcons();
     ItemConduit.initIcons();
     if(GasUtil.isGasConduitEnabled()) {
       GasConduit.initIcons();

src/main/java/crazypants/enderio/Tst.java

@@ -1,11 +0,0 @@
-package crazypants.enderio;
-
-public class Tst {
-
-  /**
-   * @param args
-   */
-  public static void main(String[] args) {
-  }
-
-}

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

@@ -35,10 +35,14 @@ import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.ItemConduitNetwork;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitNetwork;
+import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduitNetwork;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.liquid.LiquidConduitNetwork;
+import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
 import crazypants.enderio.conduit.me.IMEConduit;
 import crazypants.enderio.conduit.me.MEConduitNetwork;
 import crazypants.enderio.conduit.oc.IOCConduit;
@@ -632,8 +636,16 @@ public abstract class AbstractConduit implements IConduit {
       return new RedstoneConduitNetwork();
     } else if (IPowerConduit.class.isAssignableFrom(type)) {
       return new PowerConduitNetwork();
+    } else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) {
+      return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.TYPE);
+    } else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) {
+      return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE);
+    } else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) {
+      return new EnderLiquidConduitNetwork(CrystallinePinkSlimeEnderLiquidConduit.TYPE);
+    } else if (CrystallineEnderLiquidConduit.class.isAssignableFrom(type)) {
+      return new EnderLiquidConduitNetwork(CrystallineEnderLiquidConduit.TYPE);
     } else if (EnderLiquidConduit.class.isAssignableFrom(type)) {
-      return new EnderLiquidConduitNetwork();
+      return new EnderLiquidConduitNetwork(EnderLiquidConduit.TYPE);
     } else if (AdvancedLiquidConduit.class.isAssignableFrom(type)) {
       return new AdvancedLiquidConduitNetwork();
     } else if (ILiquidConduit.class.isAssignableFrom(type)) {

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

@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
+import crazypants.enderio.conduit.gui.*;
 import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker;
 import mods.immibis.core.api.multipart.IMultipartSystem;
 import net.minecraft.block.Block;
@@ -51,12 +52,6 @@ import crazypants.enderio.api.tool.ITool;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
-import crazypants.enderio.conduit.gui.ExternalConnectionContainer;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
-import crazypants.enderio.conduit.gui.PacketFluidFilter;
-import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
-import crazypants.enderio.conduit.gui.PacketSlotVisibility;
 import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
 import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
 import crazypants.enderio.conduit.liquid.PacketFluidLevel;
@@ -66,6 +61,7 @@ import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
 import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor;
 import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength;
 import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor;
+import crazypants.enderio.conduit.packet.PacketRoundRobinMode;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
@@ -97,6 +93,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
     PacketHandler.INSTANCE.registerMessage(PacketExistingItemFilterSnapshot.class, PacketExistingItemFilterSnapshot.class, PacketHandler.nextID(), Side.SERVER);
     PacketHandler.INSTANCE.registerMessage(PacketModItemFilter.class, PacketModItemFilter.class, PacketHandler.nextID(), Side.SERVER);
     PacketHandler.INSTANCE.registerMessage(PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER);
+    PacketHandler.INSTANCE.registerMessage(PacketFluidChannel.class, PacketFluidChannel.class, PacketHandler.nextID(), Side.SERVER);
     PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitSignalColor.class, PacketRedstoneConduitSignalColor.class, PacketHandler.nextID(), Side.SERVER);
     PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitOutputStrength.class, PacketRedstoneConduitOutputStrength.class, PacketHandler.nextID(),
         Side.SERVER);
@@ -104,6 +101,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
     PacketHandler.INSTANCE.registerMessage(PacketSlotVisibility.class, PacketSlotVisibility.class, PacketHandler.nextID(), Side.SERVER);
     PacketHandler.INSTANCE.registerMessage(PacketOCConduitSignalColor.class, PacketOCConduitSignalColor.class,
         PacketHandler.nextID(), Side.SERVER);
+    PacketHandler.INSTANCE.registerMessage(PacketRoundRobinMode.class, PacketRoundRobinMode.class, PacketHandler.nextID(), Side.SERVER);
 
     BlockConduitBundle result = new BlockConduitBundle();
     result.init();

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

@@ -14,6 +14,11 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.gas.GasUtil;
 import crazypants.enderio.conduit.item.filter.ClearFilterRecipe;
 import crazypants.enderio.conduit.item.filter.CopyFilterRecipe;
+import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
 import crazypants.enderio.conduit.me.MEUtil;
 import crazypants.enderio.conduit.oc.OCUtil;
 import crazypants.enderio.config.Config;
@@ -65,7 +70,11 @@ public class ConduitRecipes {
     int numConduits = Config.numConduitsPerRecipe;
     addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', fusedGlass);
     addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', fusedQuartz);
-    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 2), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', phasedGold);
+    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, EnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', phasedGold);
+    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallineEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', crystallineAlloy);
+    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallinePinkSlimeEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', crystallinePinkSlime);
+    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, MelodicEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', melodicAlloy);
+    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, StellarEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', stellarAlloy);
     addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 0), "###", '#', redstoneAlloy);
     addShaped(new ItemStack(EnderIO.itemRedstoneConduit, 1, 1), "lbl", "bcb", "lbl", 'b', binder, 'c', redstoneConduit, 'l', Blocks.lever);
     addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', redstoneAlloy);

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

@@ -19,6 +19,8 @@ import mods.immibis.microblocks.api.IMicroblockSystem;
 import mods.immibis.microblocks.api.MicroblockAPIUtils;
 import mods.immibis.microblocks.api.Part;
 import mods.immibis.microblocks.api.PartType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -162,7 +164,19 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
     facadeMeta = nbtRoot.getInteger("facadeMeta");
 
     if(worldObj != null && worldObj.isRemote) {
-      clientUpdated = true;
+      if (conduits.size() == 1 && conduits.get(0) instanceof IItemConduit) {
+        boolean itemConduitClientUpdated = false;
+        for (Object o : Minecraft.getMinecraft().theWorld.playerEntities) {
+          Entity e = ((Entity) o);
+          if (e.getDistanceSq(this.xCoord, yCoord, zCoord) < 36) {
+            itemConduitClientUpdated = true;
+            break;
+          }
+        }
+        if (itemConduitClientUpdated) clientUpdated = true;
+      } else {
+        clientUpdated = true;
+      }
     }
 
     if (MicroblocksUtil.supportMicroblocks()) {

src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java

@@ -5,6 +5,8 @@ import java.awt.Rectangle;
 import java.util.Collections;
 import java.util.List;
 
+import com.enderio.core.client.gui.button.ToggleButton;
+import crazypants.enderio.conduit.packet.PacketRoundRobinMode;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -26,7 +28,7 @@ import com.enderio.core.common.util.DyeColor;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.FluidFilter;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.packet.PacketExtractMode;
@@ -41,19 +43,24 @@ public class LiquidSettings extends BaseSettingsPanel {
   static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId();
 
   private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();
+  private static final int ID_ROUND_ROBIN_BUTTON = GuiExternalConnection.nextButtonId();
   private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId();
 
   private static final int NEXT_FILTER_ID = 989322;
 
+  private static final int ID_CHANNEL = GuiExternalConnection.nextButtonId();
+
   private final RedstoneModeButton rsB;
+  private final ToggleButton roundRobinB;
   private final ColorButton colorB;
+  private ColorButton channelB;
 
   private static final String autoExtractStr = EnderIO.lang.localize("gui.conduit.fluid.autoExtract");
   private static final String filterStr = EnderIO.lang.localize("gui.conduit.fluid.filter");
 
   private final ILiquidConduit conduit;
 
-  private EnderLiquidConduit eConduit;
+  private AbstractEnderLiquidConduit eConduit;
   private boolean isEnder;
   private static final int filterX = 59;
   private static final int filterY = 63;
@@ -68,13 +75,15 @@ public class LiquidSettings extends BaseSettingsPanel {
     super(IconEIO.WRENCH_OVERLAY_FLUID, EnderIO.lang.localize("itemLiquidConduit.name"), gui, con);
 
     conduit = (ILiquidConduit) con;
-    if(con instanceof EnderLiquidConduit) {
-      eConduit = (EnderLiquidConduit) con;
+    if(con instanceof AbstractEnderLiquidConduit) {
+      eConduit = (AbstractEnderLiquidConduit) con;
       isEnder = true;
 
-      int x = gui.getXSize() - 20;
+
+      int x = 52;
       int y = customTop;
 
+
       inOutNextB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y);
 
       x = filterX - 20;
@@ -87,9 +96,17 @@ public class LiquidSettings extends BaseSettingsPanel {
       gui.getContainer().setInventorySlotsVisible(false);
     }
 
-    int x = gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap * 2;
+    int x = 66;
     int y = customTop;
 
+    if(isEnder)
+    {
+      channelB = new ColorButton(gui, ID_CHANNEL, x, y);
+      channelB.setColorIndex(0);
+      channelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel"));
+      x += channelB.getWidth() + gap;
+    }
+
     rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() {
 
       @Override
@@ -112,6 +129,16 @@ public class LiquidSettings extends BaseSettingsPanel {
     colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y);
     colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor"));
     colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal());
+
+    if (isEnder) {
+      x += rsB.getWidth() + gap;
+      roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN_BUTTON, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN);
+      roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled"));
+      roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled"));
+      roundRobinB.setPaintSelectedBorder(false);
+    } else {
+      roundRobinB = null;
+    }
   }
 
   private void addFilterTooltips() {
@@ -133,16 +160,48 @@ public class LiquidSettings extends BaseSettingsPanel {
       toggleBlacklist();
     } else if(guiButton.id == NEXT_FILTER_ID) {
       inOutShowIn = !inOutShowIn;
+      if(channelB != null) {
+        channelB.onGuiInit();
+        if(isInput()) {
+          channelB.setColorIndex(eConduit.getInputColor(gui.getDir()).ordinal());
+        } else {
+          channelB.setColorIndex(eConduit.getOutputColor(gui.getDir()).ordinal());
+        }
+      }
       if(isInput()) {
+        if (isEnder) {
+          roundRobinB.onGuiInit();
+        }
         rsB.onGuiInit();
         colorB.onGuiInit();
       } else {
+        if (isEnder) {
+          roundRobinB.detach();
+        }
         rsB.detach();
         colorB.detach();
       }
       if(isFilterVisible()) {
         updateWhiteListButton(eConduit.getFilter(gui.getDir(), isInput()));
       }
+    } else if(guiButton.id == ID_CHANNEL) {
+      if(isEnder) {
+
+        DyeColor col = DyeColor.values()[channelB.getColorIndex()];
+
+        if (isInput()) {
+          eConduit.setInputColor(gui.getDir(), col);
+        } else {
+          eConduit.setOutputColor(gui.getDir(), col);
+        }
+        setConduitChannel(col);
+      }
+    } else if(guiButton.id == ID_ROUND_ROBIN_BUTTON) {
+      if (isEnder && isInput()) {
+        final boolean selected = roundRobinB.isSelected();
+        eConduit.setRoundRobin(gui.getDir(), selected);
+        PacketHandler.INSTANCE.sendToServer(new PacketRoundRobinMode(eConduit, gui.getDir()));
+      }
     }
   }
 
@@ -189,8 +248,18 @@ public class LiquidSettings extends BaseSettingsPanel {
 
   protected void setConduitFilter(FluidFilter filter) {
     eConduit.setFilter(gui.getDir(), filter, isInput());
+
     PacketHandler.INSTANCE.sendToServer(new PacketFluidFilter(eConduit, gui.getDir(), filter, isInput()));
   }
+  protected void setConduitChannel(DyeColor channel) {
+    if(isInput()) {
+      eConduit.setInputColor(gui.getDir(), channel);
+    } else {
+      eConduit.setOutputColor(gui.getDir(), channel);
+    }
+
+    PacketHandler.INSTANCE.sendToServer(new PacketFluidChannel(eConduit, gui.getDir(), isInput(), channel));
+  }
 
   @Override
   protected void initCustomOptions() {
@@ -209,6 +278,21 @@ public class LiquidSettings extends BaseSettingsPanel {
       return;
     }
 
+    if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.DISABLED) {
+      channelB.detach();
+    } else {
+      channelB.onGuiInit();
+      if (isInput()) {
+        channelB.setColorIndex(eConduit.getInputColor(gui.getDir()).ordinal());
+      } else {
+        channelB.setColorIndex(eConduit.getOutputColor(gui.getDir()).ordinal());
+      }
+    }
+    if(isInput()) {
+      roundRobinB.onGuiInit();
+      roundRobinB.setSelected(eConduit.isRoundRobin(gui.getDir()));
+    }
+
     if(isFilterVisible()) {
       gui.getContainer().setInventorySlotsVisible(true);
       addFilterTooltips();
@@ -241,6 +325,7 @@ public class LiquidSettings extends BaseSettingsPanel {
     rsB.detach();
     colorB.detach();
     if(isEnder) {
+      roundRobinB.detach();
       gui.getContainer().setInventorySlotsVisible(false);
       if(filterToolTips != null) {
         for (GuiToolTip tt : filterToolTips) {
@@ -251,25 +336,23 @@ public class LiquidSettings extends BaseSettingsPanel {
       }
       inOutNextB.detach();
       whiteListB.detach();
+      channelB.detach();
     }
   }
 
   @Override
   protected void renderCustomOptions(int top, float par1, int par2, int par3) {
     boolean isInput = isInput();
-    if(isInput) {
-      int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2;
-      int y = top;
-      gui.getFontRenderer().drawString(autoExtractStr, left, y, ColorUtil.getRGB(Color.DARK_GRAY));
-    }
     if(isEnder && isFilterVisible()) {
-
+      String inOutStr = EnderIO.lang.localize("gui.conduit.ioMode.output");
       if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.IN_OUT) {
-        String inOutStr = inOutShowIn ? EnderIO.lang.localize("gui.conduit.ioMode.input") : EnderIO.lang.localize("gui.conduit.ioMode.output");
-        int x = gui.getGuiLeft() + gui.getXSize() - 20 - 5 - gui.getFontRenderer().getStringWidth(inOutStr);
-        int y = top;
-        gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY));
+        inOutStr = inOutShowIn ? EnderIO.lang.localize("gui.conduit.ioMode.input") : EnderIO.lang.localize("gui.conduit.ioMode.output");
+      } else if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.INPUT){
+        inOutStr = EnderIO.lang.localize("gui.conduit.ioMode.input");
       }
+      int x = left;
+      int y = top;
+      gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY));
 
       GL11.glColor3f(1, 1, 1);
       gui.bindGuiTexture(1);
@@ -277,8 +360,8 @@ public class LiquidSettings extends BaseSettingsPanel {
 
       FontRenderer fr = gui.getFontRenderer();
       int sw = fr.getStringWidth(filterStr);
-      int x = (gui.width / 2) - sw / 2;
-      int y = top + 20;
+      x = (gui.width / 2) - sw / 2;
+      y = top + 20;
       fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY));
 
       x = gui.getGuiLeft() + filterX;

src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java

@@ -0,0 +1,67 @@
+package crazypants.enderio.conduit.gui;
+
+import com.enderio.core.common.util.DyeColor;
+import cpw.mods.fml.common.network.ByteBufUtils;
+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.conduit.liquid.AbstractEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.FluidFilter;
+import crazypants.enderio.conduit.liquid.ILiquidConduit;
+import crazypants.enderio.conduit.packet.AbstractConduitPacket;
+import crazypants.enderio.conduit.packet.ConTypeEnum;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit> implements IMessageHandler<PacketFluidChannel, IMessage>{
+
+  private ForgeDirection dir;
+  private boolean isInput;
+
+  private DyeColor channel;
+
+  public PacketFluidChannel() {
+  }
+
+  public PacketFluidChannel(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, boolean isInput, DyeColor channel) {
+    super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID);
+    this.dir = dir;
+    this.isInput = isInput;
+    this.channel = channel;
+  }
+
+  @Override
+  public void toBytes(ByteBuf buf) {
+    super.toBytes(buf);
+    buf.writeShort(dir.ordinal());
+    buf.writeBoolean(isInput);
+    buf.writeShort(channel.ordinal());
+  }
+  
+  @Override
+  public void fromBytes(ByteBuf buf) {
+    super.fromBytes(buf);
+    dir = ForgeDirection.values()[buf.readShort()];
+    isInput = buf.readBoolean();
+    channel = DyeColor.values()[buf.readShort()];
+  }
+
+  @Override
+  public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) {
+    ILiquidConduit conduit = message.getTileCasted(ctx);
+    if(! (conduit instanceof AbstractEnderLiquidConduit)) {
+      return null;
+    }    
+    AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit)conduit;
+
+    if(message.isInput)
+      eCon.setInputColor(message.dir, message.channel);
+    else
+      eCon.setOutputColor(message.dir, message.channel);
+
+    message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
+    return null;
+  }
+
+}

src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java

@@ -7,7 +7,7 @@ import cpw.mods.fml.common.network.ByteBufUtils;
 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.conduit.liquid.EnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.FluidFilter;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.packet.AbstractConduitPacket;
@@ -22,7 +22,7 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit> imp
   public PacketFluidFilter() {    
   }
   
-  public PacketFluidFilter(EnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) {
+  public PacketFluidFilter(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) {
     super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID);
     this.dir = dir;
     this.filter = filter;
@@ -52,10 +52,10 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit> imp
   @Override
   public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) {
     ILiquidConduit conduit = message.getTileCasted(ctx);
-    if(! (conduit instanceof EnderLiquidConduit)) {
+    if(! (conduit instanceof AbstractEnderLiquidConduit)) {
       return null;
     }    
-    EnderLiquidConduit eCon = (EnderLiquidConduit)conduit;
+    AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit)conduit;
     eCon.setFilter(message.dir, message.filter, message.isInput);
     message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
     return null;

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

@@ -1,20 +1,16 @@
 package crazypants.enderio.conduit.gui.item;
 
-import net.minecraft.client.gui.GuiButton;
-
-import org.lwjgl.opengl.GL11;
-
-import com.enderio.core.client.gui.GuiContainerBase;
 import com.enderio.core.client.gui.button.CycleButton;
 import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;
 import crazypants.enderio.conduit.item.filter.FuzzyMode;
 import crazypants.enderio.conduit.item.filter.ItemFilter;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
 import crazypants.enderio.gui.IconEIO;
+import net.minecraft.client.gui.GuiButton;
+import org.lwjgl.opengl.GL11;
 
 public class BasicItemFilterGui implements IItemFilterGui {
     
@@ -66,7 +62,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
     int x = butLeft;
     int y = yOffset + 1;
     whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
-    whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
+    whiteListB.setToolTip(getWhitelistTooltips(false));
 
     x += 20;
     useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
@@ -135,16 +131,14 @@ public class BasicItemFilterGui implements IItemFilterGui {
     useMetaB.setSelected(activeFilter.isMatchMeta());
 
     whiteListB.onGuiInit();
+    whiteListB.setToolTip(getWhitelistTooltips(activeFilter.isBlacklist()));
     if(activeFilter.isBlacklist()) {
       whiteListB.setIcon(IconEIO.FILTER_BLACKLIST);
-      whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist"));
     } else {
       whiteListB.setIcon(IconEIO.FILTER_WHITELIST);
-      whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
     }
   }
   
-  
   @Override
   public void actionPerformed(GuiButton guiButton) {
     
@@ -193,5 +187,20 @@ public class BasicItemFilterGui implements IItemFilterGui {
       gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
     }
   }
-  
+
+  private String[] getWhitelistTooltips(boolean isBlacklist) {
+    if(isBlacklist) {
+      return new String[]{
+              EnderIO.lang.localize("gui.conduit.item.blacklist"),
+              EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"),
+              EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1")
+      };
+    } else {
+      return new String[]{
+              EnderIO.lang.localize("gui.conduit.item.whitelist"),
+              EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"),
+              EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1")
+      };
+    }
+  }
 }

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

@@ -128,7 +128,7 @@ public class ItemSettings extends BaseSettingsPanel {
       }
     };
 
-    x += channelB.getWidth() + 4;
+    x += channelB.getWidth() + gap;
     priLeft = x - 8;
 
     rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() {
@@ -149,18 +149,18 @@ public class ItemSettings extends BaseSettingsPanel {
       }
     });
 
-    x += rsB.getWidth() + 4;
+    x += rsB.getWidth() + gap;
     colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y);
     colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal());
     colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.sigCol"));
 
-    x += 4 + colorB.getWidth();
+    x += gap + colorB.getWidth();
     roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN);
     roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled"));
     roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled"));
     roundRobinB.setPaintSelectedBorder(false);
 
-    x += 4 + roundRobinB.getWidth();
+    x += gap + roundRobinB.getWidth();
     loopB = new ToggleButton(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP);
     loopB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedEnabled"));
     loopB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedDisabled"));

src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java

@@ -78,7 +78,7 @@ public class ExistingItemFilter implements IItemFilter {
       matched = existingId != -1 && existingId == OreDictionary.getOreID(toInsert);
     }
     if(!matched) {
-      matched = Item.getIdFromItem(toInsert.getItem()) == Item.getIdFromItem(existing.getItem());
+      matched = toInsert.getItem() == existing.getItem();
       if(matched && matchMeta) {
         matched = toInsert.getItemDamage() == existing.getItemDamage();
       }

src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java

@@ -1,16 +1,15 @@
 package crazypants.enderio.conduit.item.filter;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import net.minecraft.item.ItemStack;
-
 import com.enderio.core.api.client.render.IWidgetIcon;
 import com.enderio.core.client.gui.button.CycleButton;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.gui.IconEIO;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
 
 public enum FuzzyMode implements CycleButton.ICycleEnum {
   DISABLED(IconEIO.FILTER_FUZZY_DISABLED) {
@@ -63,7 +62,13 @@ public enum FuzzyMode implements CycleButton.ICycleEnum {
 
   @Override
   public List<String> getTooltipLines() {
-    return Collections.singletonList(EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))));
+    return Arrays.asList(
+            EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))),
+            EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.0"),
+            EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.1"),
+            EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.2",
+                    EnderIO.lang.localize("gui.conduit.item.whitelist"))
+            );
   }
 
 }

src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java

@@ -1,16 +1,16 @@
 package crazypants.enderio.conduit.item.filter;
 
+import com.enderio.core.client.gui.widget.GhostSlot;
+import com.enderio.core.common.network.NetworkUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;
 import crazypants.enderio.conduit.gui.item.BasicItemFilterGui;
 import crazypants.enderio.conduit.gui.item.IItemFilterGui;
 import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
 import crazypants.enderio.conduit.item.IItemConduit;
+import crazypants.enderio.conduit.item.NetworkedInventory;
 import io.netty.buffer.ByteBuf;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -19,12 +19,9 @@ import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.enderio.core.client.gui.widget.GhostSlot;
-import com.enderio.core.common.network.NetworkUtil;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.conduit.item.NetworkedInventory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class ItemFilter implements IInventory, IItemFilter {
 
@@ -93,43 +90,56 @@ public class ItemFilter implements IInventory, IItemFilter {
     return doesItemPassFilter(item);
   }
 
+  @SuppressWarnings("SimplifiableConditionalExpression")
   public boolean doesItemPassFilter(ItemStack item) {
-    if(!isValid()) {
-      return true;
-    }
-    boolean matched = itemMatched(item);
-    return isBlacklist ? !matched : matched;
+    boolean allow = isValid() && itemMatched(item);
+
+    return isBlacklist ? !allow : allow;
   }
 
   private boolean itemMatched(ItemStack item) {
     if(item == null) {
       return false;
     }
-    boolean doFuzzy = false;
-    boolean fuzzyValue = false;
-    if(fuzzyMode != FuzzyMode.DISABLED && item.getItem().isDamageable()) {
-      doFuzzy = true;
-      fuzzyValue = fuzzyMode.compare(item);
+
+    boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED;
+    boolean damageMatched = false;
+    if(checkDamage && item.getItem().isDamageable()) {
+      damageMatched = fuzzyMode.compare(item);
     }
+
+    if(isItemListEmpty()) {
+      if (checkDamage) {
+        return damageMatched;
+      } else {
+        return false;
+      }
+    }
+
     boolean matched = false;
-    int i = 0;
-    for (ItemStack it : items) {
-      if(it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
+
+    for (int i = 0; i < items.length; i++) {
+      ItemStack it = items[i];
+
+      if (it != null && item.getItem() == it.getItem()) {
         matched = true;
-        boolean fuzzyOk = doFuzzy && fuzzyMode.compare(it) == fuzzyValue;
-        if(matchMeta && !fuzzyOk && item.getItemDamage() != it.getItemDamage()) {
+
+        if(checkDamage && !damageMatched) {
           matched = false;
-        } else if(matchNBT && !isNBTMatch(item, it)) {
+        } else if (matchMeta && item.getItemDamage() != it.getItemDamage()) {
+          matched = false;
+        }else if (matchNBT && !isNBTMatch(item, it)) {
           matched = false;
         }
       }
-      if(!matched && useOreDict && isOreDicMatch(i, item)) {
+
+      if (!matched && useOreDict && isOreDicMatch(i, item)) {
         matched = true;
       }
-      if(matched) {
+
+      if (matched) {
         break;
       }
-      i++;
     }
     return matched;
   }
@@ -184,12 +194,21 @@ public class ItemFilter implements IInventory, IItemFilter {
 
   @Override
   public boolean isValid() {
+    //allows fuzzy mode to be not dependent from filter items
+    if(fuzzyMode != FuzzyMode.DISABLED) {
+      return true;
+    }
+
+    return !isItemListEmpty();
+  }
+
+  private boolean isItemListEmpty() {
     for (ItemStack item : items) {
-      if(item != null) {
-        return true;
+      if (item != null) {
+        return false;
       }
     }
-    return false;
+    return true;
   }
 
   public boolean isBlacklist() {
@@ -285,6 +304,7 @@ public class ItemFilter implements IInventory, IItemFilter {
     numItems = nbtRoot.getInteger("numItems");
 
     if(numItems<10 && isAdvanced) numItems = 10;
+    else if(numItems<5 && !isAdvanced) numItems = 5;
 
     items = new ItemStack[numItems];
     oreIds.clear();

src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java

@@ -0,0 +1,563 @@
+package crazypants.enderio.conduit.liquid;
+
+import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.BlockCoord;
+import com.enderio.core.common.util.DyeColor;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.AbstractConduitNetwork;
+import crazypants.enderio.conduit.ConduitUtil;
+import crazypants.enderio.conduit.ConnectionMode;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.RaytraceResult;
+import crazypants.enderio.conduit.geom.CollidableComponent;
+import crazypants.enderio.conduit.item.ItemConduit;
+import crazypants.enderio.config.Config;
+import crazypants.enderio.machine.RedstoneControlMode;
+import crazypants.enderio.tool.ToolUtil;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Supplier;
+import java.util.Set;
+
+
+public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
+
+  public static final String ICON_KEY_INPUT = ItemConduit.ICON_KEY_INPUT;
+  public static final String ICON_KEY_OUTPUT = ItemConduit.ICON_KEY_OUTPUT;
+  public static final String ICON_KEY_IN_OUT_BG = ItemConduit.ICON_KEY_IN_OUT_BG;
+  public static final String ICON_KEY_IN_OUT_OUT = ItemConduit.ICON_KEY_IN_OUT_OUT;
+  public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN;
+
+  static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
+  private final Set<BlockCoord> filledFromThisTick = new HashSet<>();
+  
+  @SideOnly(Side.CLIENT)
+  public static void initIcons() {
+    IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+      @Override
+      public void registerIcons(IIconRegister register) {
+        ICONS.put(ICON_KEY_INPUT, register.registerIcon(ICON_KEY_INPUT));
+        ICONS.put(ICON_KEY_OUTPUT, register.registerIcon(ICON_KEY_OUTPUT));
+        ICONS.put(ICON_KEY_IN_OUT_OUT, register.registerIcon(ICON_KEY_IN_OUT_OUT));
+        ICONS.put(ICON_KEY_IN_OUT_IN, register.registerIcon(ICON_KEY_IN_OUT_IN));
+        ICONS.put(ICON_KEY_IN_OUT_BG, register.registerIcon(ICON_KEY_IN_OUT_BG));
+      }
+
+      @Override
+      public int getTextureType() {
+        return 0;
+      }
+
+    });
+  }
+
+  public enum Type {
+    ENDER(
+        () -> Config.enderFluidConduitExtractRate,
+        () -> Config.enderFluidConduitMaxIoRate),
+
+    CRYSTALLINE(
+        () -> Config.crystallineEnderFluidConduitExtractRate,
+        () -> Config.crystallineEnderFluidConduitMaxIoRate),
+
+    CRYSTALLINE_PINK_SLIME(
+        () -> Config.crystallinePinkSlimeEnderFluidConduitExtractRate,
+        () -> Config.crystallinePinkSlimeEnderFluidConduitMaxIoRate),
+
+    MELODIC(
+        () -> Config.melodicEnderFluidConduitExtractRate,
+        () -> Config.melodicEnderFluidConduitMaxIoRate),
+
+    STELLAR(
+        () -> Config.stellarEnderFluidConduitExtractRate,
+        () -> Config.stellarEnderFluidConduitMaxIoRate);
+
+    private final Supplier<Integer> getMaxExtractPerTick;
+    private final Supplier<Integer> getMaxIoPerTick;
+
+    Type(Supplier<Integer> getMaxExtractPerTick, Supplier<Integer> getMaxIoPerTick) {
+      this.getMaxExtractPerTick = getMaxExtractPerTick;
+      this.getMaxIoPerTick = getMaxIoPerTick;
+    }
+
+    public int getMaxExtractPerTick() {
+      return getMaxExtractPerTick.get();
+    }
+
+    public int getMaxIoPerTick() {
+      return getMaxIoPerTick.get();
+    }
+  }
+
+  private EnderLiquidConduitNetwork network;
+  private int ticksSinceFailedExtract;
+
+  private final EnumMap<ForgeDirection, FluidFilter> outputFilters = new EnumMap<ForgeDirection, FluidFilter>(ForgeDirection.class);
+  private final EnumMap<ForgeDirection, FluidFilter> inputFilters = new EnumMap<ForgeDirection, FluidFilter>(ForgeDirection.class);
+
+  protected final EnumMap<ForgeDirection, DyeColor> outputColors = new EnumMap<ForgeDirection, DyeColor>(ForgeDirection.class);
+  protected final EnumMap<ForgeDirection, DyeColor> inputColors = new EnumMap<ForgeDirection, DyeColor>(ForgeDirection.class);
+
+  private int roundRobin = 0;
+
+  public abstract Type getType();
+  public abstract int getMetadata();
+  protected abstract IIcon getIconKey();
+  protected abstract IIcon getIconCoreKey();
+
+  @Override
+  public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List<RaytraceResult> all) {
+    if(player.getCurrentEquippedItem() == null) {
+      return false;
+    }
+
+    if(ToolUtil.isToolEquipped(player)) {
+
+      if(!getBundle().getEntity().getWorldObj().isRemote) {
+
+        if(res != null && res.component != null) {
+
+          ForgeDirection connDir = res.component.dir;
+          ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit);
+
+          if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) {
+
+            if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) {
+              setConnectionMode(faceHit, getNextConnectionMode(faceHit));
+              return true;
+            }
+
+            BlockCoord loc = getLocation().getLocation(faceHit);
+            ILiquidConduit n = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class);
+            if(n == null) {
+              return false;
+            }
+            if(!(n instanceof AbstractEnderLiquidConduit)) {
+              return false;
+            }
+            if(getType() != ((AbstractEnderLiquidConduit) n).getType()) {
+              return false;
+            }
+            return ConduitUtil.joinConduits(this, faceHit);
+          } else if(containsExternalConnection(connDir)) {
+            // Toggle extraction mode
+            setConnectionMode(connDir, getNextConnectionMode(connDir));
+          } else if(containsConduitConnection(connDir)) {
+            ConduitUtil.disconectConduits(this, connDir);
+
+          }
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public ItemStack createItem() {
+    return new ItemStack(EnderIO.itemLiquidConduit, 1, getMetadata());
+  }
+
+  @Override
+  public AbstractConduitNetwork<?, ?> getNetwork() {
+    return network;
+  }
+
+  public FluidFilter getFilter(ForgeDirection dir, boolean isInput) {
+    if(isInput) {
+      return inputFilters.get(dir);
+    }
+    return outputFilters.get(dir);
+  }
+
+  public void setFilter(ForgeDirection dir, FluidFilter filter, boolean isInput) {
+    if(isInput) {
+      inputFilters.put(dir, filter);
+    } else {
+      outputFilters.put(dir, filter);
+    }
+  }
+
+  @Override
+  public boolean setNetwork(AbstractConduitNetwork<?, ?> network) {
+    if(network == null) {
+      this.network = null;
+      return true;
+    }
+    if(!(network instanceof EnderLiquidConduitNetwork)) {
+      return false;
+    }
+    this.network = (EnderLiquidConduitNetwork) network;
+    for (ForgeDirection dir : externalConnections) {
+      this.network.connectionChanged(this, dir);
+    }
+
+    return true;
+  }
+
+  @Override
+  public IIcon getTextureForState(CollidableComponent component) {
+    if(component.dir == ForgeDirection.UNKNOWN) {
+      return getIconCoreKey();
+    }
+    return getIconKey();
+  }
+
+  public IIcon getTextureForInputMode() {
+    return ICONS.get(ICON_KEY_INPUT);
+  }
+
+  public IIcon getTextureForOutputMode() {
+    return ICONS.get(ICON_KEY_OUTPUT);
+  }
+
+
+  public IIcon getTextureForInOutMode(boolean input) {
+    return input ? ICONS.get(ICON_KEY_IN_OUT_IN) : ICONS.get(ICON_KEY_IN_OUT_OUT);
+  }
+
+  public IIcon getTextureForInOutBackground() {
+    return ICONS.get(ICON_KEY_IN_OUT_BG);
+  }
+  @Override
+  public IIcon getTransmitionTextureForState(CollidableComponent component) {
+    return null;
+  }
+
+  @Override
+  public boolean canConnectToConduit(ForgeDirection direction, IConduit con) {
+    if(!super.canConnectToConduit(direction, con)) {
+      return false;
+    }
+    if(!(con instanceof AbstractEnderLiquidConduit)) {
+      return false;
+    }
+    if(getType() != ((AbstractEnderLiquidConduit) con).getType()) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) {
+    super.setConnectionMode(dir, mode);
+    refreshConnections(dir);
+  }
+  
+  @Override
+  public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) {
+    super.setExtractionRedstoneMode(mode, dir);
+    refreshConnections(dir);
+  }
+
+  private void refreshConnections(ForgeDirection dir) {
+    if(network == null) {
+      return;
+    }
+    network.connectionChanged(this, dir);
+  }
+
+  @Override
+  public void externalConnectionAdded(ForgeDirection fromDirection) {
+    super.externalConnectionAdded(fromDirection);
+    refreshConnections(fromDirection);
+  }
+
+  @Override
+  public void externalConnectionRemoved(ForgeDirection fromDirection) {
+    super.externalConnectionRemoved(fromDirection);
+    refreshConnections(fromDirection);
+  }
+
+  @Override
+  public void updateEntity(World world) {
+    super.updateEntity(world);
+    filledFromThisTick.clear();
+    if(world.isRemote) {
+      return;
+    }
+    doExtract();
+  }
+
+  private void doExtract() {
+    BlockCoord loc = getLocation();
+    if(!hasExtractableMode()) {
+      return;
+    }
+    if(network == null) {
+      return;
+    }
+
+    // assume failure, reset to 0 if we do extract
+    ticksSinceFailedExtract++;
+    if(ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) {
+      // after 25 ticks of failing, only check every 10 ticks
+      return;
+    }
+
+    for (ForgeDirection dir : externalConnections) {
+      if(autoExtractForDir(dir)) {
+        if(network.extractFrom(this, dir)) {
+          ticksSinceFailedExtract = 0;
+        }
+      }
+    }
+
+  }
+
+  //Fluid API
+
+  @Override
+  public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
+    if(network == null || !getConnectionMode(from).acceptsInput()) {
+      return 0;
+    }
+    
+    // Guard against things that continuously call fill!
+    if(filledFromThisTick.contains(getLocation().getLocation(from))) {
+      return 0;
+    }
+    if(doFill) {
+      filledFromThisTick.add(getLocation().getLocation(from));
+    }
+    
+    return network.fillFrom(this, from, resource, doFill);
+  }
+
+  @Override
+  public boolean canFill(ForgeDirection from, Fluid fluid) {
+    if(network == null) {
+      return false;
+    }
+    return getConnectionMode(from).acceptsInput();
+  }
+
+  @Override
+  public boolean canDrain(ForgeDirection from, Fluid fluid) {
+    return false;
+  }
+
+  @Override
+  public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
+    return null;
+  }
+
+  @Override
+  public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
+    return null;
+  }
+
+  @Override
+  public FluidTankInfo[] getTankInfo(ForgeDirection from) {
+    if(network == null) {
+      return new FluidTankInfo[0];
+    }
+    return network.getTankInfo(this, from);
+  }
+  //@Override
+  public DyeColor getInputColor(ForgeDirection dir) {
+    DyeColor result = inputColors.get(dir);
+    if(result == null) {
+      return DyeColor.GREEN;
+    }
+    return result;
+  }
+
+  //@Override
+  public DyeColor getOutputColor(ForgeDirection dir) {
+    DyeColor result = outputColors.get(dir);
+    if(result == null) {
+      return DyeColor.GREEN;
+    }
+    return result;
+  }
+  //@Override
+  public void setInputColor(ForgeDirection dir, DyeColor col) {
+    inputColors.put(dir, col);
+    if(network != null) {
+      network.notifyNetworkOfUpdate();
+    }
+    setClientStateDirty();
+    collidablesDirty = true;
+  }
+
+  //@Override
+  public void setOutputColor(ForgeDirection dir, DyeColor col) {
+    outputColors.put(dir, col);
+    if(network != null) {
+      network.notifyNetworkOfUpdate();
+    }
+    setClientStateDirty();
+    collidablesDirty = true;
+  }
+  
+  @Override
+  protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
+    super.readTypeSettings(dir, dataRoot);
+
+    if (dataRoot.hasKey("inputColor")) {
+      setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]);
+    }
+    if (dataRoot.hasKey("outputColor")) {
+      setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]);
+    }
+
+    if(dataRoot.hasKey("roundRobin")) {
+      setRoundRobin(dir, dataRoot.getBoolean("roundRobin"));
+    } else {
+      setRoundRobin(dir, true);
+    }
+
+    if (dataRoot.hasKey("outputFilters")) {
+      FluidFilter out = new FluidFilter();
+      out.readFromNBT(dataRoot.getCompoundTag("outputFilters"));
+      outputFilters.put(dir, out);
+    }
+    if (dataRoot.hasKey("inputFilters")) {
+      FluidFilter in = new FluidFilter();
+      in.readFromNBT(dataRoot.getCompoundTag("inputFilters"));
+      inputFilters.put(dir, in);
+    }
+  }
+
+  @Override
+  protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) {
+    super.writeTypeSettingsToNbt(dir, dataRoot);
+
+    dataRoot.setShort("inputColor", (short)getInputColor(dir).ordinal());
+    dataRoot.setShort("outputColor", (short)getOutputColor(dir).ordinal());
+
+    dataRoot.setBoolean("roundRobin", isRoundRobin(dir));
+
+    FluidFilter out = outputFilters.get(dir);
+    if (out != null) {
+      NBTTagCompound outTag = new NBTTagCompound();
+      out.writeToNBT(outTag);
+      dataRoot.setTag("outputFilters", outTag);
+    }
+    FluidFilter in = inputFilters.get(dir);
+    if (in != null) {
+      NBTTagCompound inTag = new NBTTagCompound();
+      in.writeToNBT(inTag);
+      dataRoot.setTag("inputFilters", inTag);
+    }
+
+  }
+
+  @Override
+  public void writeToNBT(NBTTagCompound nbtRoot) {
+    super.writeToNBT(nbtRoot);
+    nbtRoot.setInteger("roundRobin", roundRobin);
+    for (Entry<ForgeDirection, FluidFilter> entry : inputFilters.entrySet()) {
+      if(entry.getValue() != null) {
+        FluidFilter f = entry.getValue();
+        if(f != null && !f.isDefault()) {
+          NBTTagCompound itemRoot = new NBTTagCompound();
+          f.writeToNBT(itemRoot);
+          nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot);
+        }
+      }
+    }
+    for (Entry<ForgeDirection, FluidFilter> entry : outputFilters.entrySet()) {
+      if(entry.getValue() != null) {
+        FluidFilter f = entry.getValue();
+        if(f != null && !f.isDefault()) {
+          NBTTagCompound itemRoot = new NBTTagCompound();
+          f.writeToNBT(itemRoot);
+          nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot);
+        }
+      }
+    }
+    for (Entry<ForgeDirection, DyeColor> entry : inputColors.entrySet()) {
+      if(entry.getValue() != null) {
+        short ord = (short) entry.getValue().ordinal();
+        nbtRoot.setShort("inSC." + entry.getKey().name(), ord);
+      }
+    }
+
+    for (Entry<ForgeDirection, DyeColor> entry : outputColors.entrySet()) {
+      if(entry.getValue() != null) {
+        short ord = (short) entry.getValue().ordinal();
+        nbtRoot.setShort("outSC." + entry.getKey().name(), ord);
+      }
+    }
+  }
+
+  @Override
+  public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) {
+    super.readFromNBT(nbtRoot, nbtVersion);
+    if(nbtRoot.hasKey("roundRobin")) {
+      roundRobin = nbtRoot.getInteger("roundRobin");
+    } else {
+      roundRobin = 0b111111;
+    }
+    for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+      String key = "inFilts." + dir.name();
+      if(nbtRoot.hasKey(key)) {
+        NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
+        FluidFilter f = new FluidFilter();
+        f.readFromNBT(filterTag);
+        if(!f.isEmpty()) {
+          inputFilters.put(dir, f);
+        }
+      }
+      
+      key = "outFilts." + dir.name();
+      if(nbtRoot.hasKey(key)) {
+        NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
+        FluidFilter f = new FluidFilter();
+        f.readFromNBT(filterTag);
+        if(!f.isEmpty()) {
+          outputFilters.put(dir, f);
+        }
+      }
+
+      key = "inSC." + dir.name();
+      if(nbtRoot.hasKey(key)) {
+        short ord = nbtRoot.getShort(key);
+        if(ord >= 0 && ord < DyeColor.values().length) {
+          inputColors.put(dir, DyeColor.values()[ord]);
+        }
+      }
+
+      key = "outSC." + dir.name();
+      if(nbtRoot.hasKey(key)) {
+        short ord = nbtRoot.getShort(key);
+        if(ord >= 0 && ord < DyeColor.values().length) {
+          outputColors.put(dir, DyeColor.values()[ord]);
+        }
+      }
+    }
+
+  }
+
+  public boolean isRoundRobin(ForgeDirection dir) {
+    return (roundRobin & dir.flag) != 0;
+  }
+
+  public void setRoundRobin(ForgeDirection dir, boolean roundRobin) {
+    if (roundRobin)
+      this.roundRobin |= dir.flag;
+    else
+      this.roundRobin &= ~dir.flag;
+  }
+}

src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java

@@ -1,6 +1,8 @@
 package crazypants.enderio.conduit.liquid;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
@@ -31,6 +33,7 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit {
   protected int numEmptyEvents = 0;
   protected boolean fluidTypeLocked = false;
   private int lastLightValue;
+  protected final Set<BlockCoord> filledFromThisTick = new HashSet<>();
 
   @Override
   public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List<RaytraceResult> all) {
@@ -191,6 +194,7 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit {
 
   @Override
   public void updateEntity(World world) {
+    filledFromThisTick.clear();
     int lightValue = getLightValue();
     if(lastLightValue != lightValue) {
       BlockCoord bc = getLocation();

src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java

@@ -239,6 +239,15 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
     if(network == null || !getConnectionMode(from).acceptsInput()) {
       return 0;
     }
+
+    // Guard against things that continuously call fill!
+    if(filledFromThisTick.contains(getLocation().getLocation(from))) {
+      return 0;
+    }
+    if(doFill) {
+      filledFromThisTick.add(getLocation().getLocation(from));
+    }
+
     return network.fill(from, resource, doFill);
   }
 

src/main/java/crazypants/enderio/conduit/liquid/CrystallineEnderLiquidConduit.java

@@ -0,0 +1,57 @@
+package crazypants.enderio.conduit.liquid;
+
+import com.enderio.core.client.render.IconUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class CrystallineEnderLiquidConduit extends AbstractEnderLiquidConduit {
+
+  public static final Type TYPE = Type.CRYSTALLINE;
+  public static final int METADATA = 3;
+  public static final String ICON_KEY = "enderio:liquidConduitCrystallineEnder";
+  public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallineEnder";
+
+  static IIcon iconKey;
+  static IIcon iconCoreKey;
+
+  @SideOnly(Side.CLIENT)
+  public static void initIcons() {
+    IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+      @Override
+      public void registerIcons(IIconRegister register) {
+        iconKey = register.registerIcon(ICON_KEY);
+        iconCoreKey = register.registerIcon(ICON_CORE_KEY);
+      }
+
+      @Override
+      public int getTextureType() {
+        return 0;
+      }
+
+    });
+  }
+
+  @Override
+  public Type getType() {
+    return TYPE;
+  }
+
+  @Override
+  public int getMetadata() {
+    return METADATA;
+  }
+
+  @Override
+  protected IIcon getIconKey() {
+    return iconKey;
+  }
+
+  @Override
+  protected IIcon getIconCoreKey() {
+    return iconCoreKey;
+  }
+}

src/main/java/crazypants/enderio/conduit/liquid/CrystallinePinkSlimeEnderLiquidConduit.java

@@ -0,0 +1,57 @@
+package crazypants.enderio.conduit.liquid;
+
+import com.enderio.core.client.render.IconUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class CrystallinePinkSlimeEnderLiquidConduit extends AbstractEnderLiquidConduit {
+
+  public static final Type TYPE = Type.CRYSTALLINE_PINK_SLIME;
+  public static final int METADATA = 4;
+  public static final String ICON_KEY = "enderio:liquidConduitCrystallinePinkSlimeEnder";
+  public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallinePinkSlimeEnder";
+
+  static IIcon iconKey;
+  static IIcon iconCoreKey;
+
+  @SideOnly(Side.CLIENT)
+  public static void initIcons() {
+    IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+      @Override
+      public void registerIcons(IIconRegister register) {
+        iconKey = register.registerIcon(ICON_KEY);
+        iconCoreKey = register.registerIcon(ICON_CORE_KEY);
+      }
+
+      @Override
+      public int getTextureType() {
+        return 0;
+      }
+
+    });
+  }
+
+  @Override
+  public Type getType() {
+    return TYPE;
+  }
+
+  @Override
+  public int getMetadata() {
+    return METADATA;
+  }
+
+  @Override
+  protected IIcon getIconKey() {
+    return iconKey;
+  }
+
+  @Override
+  protected IIcon getIconCoreKey() {
+    return iconCoreKey;
+  }
+}

src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java

@@ -1,46 +1,21 @@
 package crazypants.enderio.conduit.liquid;
 
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-
 import com.enderio.core.client.render.IconUtil;
-import com.enderio.core.common.util.BlockCoord;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.conduit.AbstractConduitNetwork;
-import crazypants.enderio.conduit.ConduitUtil;
-import crazypants.enderio.conduit.ConnectionMode;
-import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.RaytraceResult;
-import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.machine.RedstoneControlMode;
-import crazypants.enderio.tool.ToolUtil;
 
-public class EnderLiquidConduit extends AbstractLiquidConduit {
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
 
+public class EnderLiquidConduit extends AbstractEnderLiquidConduit {
+
+  public static final Type TYPE = Type.ENDER;
+  public static final int METADATA = 2;
   public static final String ICON_KEY = "enderio:liquidConduitEnder";
   public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreEnder";
-  public static final String ICON_EXTRACT_KEY = "enderio:liquidConduitAdvancedInput";
-  public static final String ICON_INSERT_KEY = "enderio:liquidConduitAdvancedOutput";
-  public static final String ICON_IN_OUT_KEY = "enderio:liquidConduitAdvancedInOut";
 
-  static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
+  static IIcon iconKey;
+  static IIcon iconCoreKey;
 
   @SideOnly(Side.CLIENT)
   public static void initIcons() {
@@ -48,11 +23,8 @@ public class EnderLiquidConduit extends AbstractLiquidConduit {
 
       @Override
       public void registerIcons(IIconRegister register) {
-        ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY));
-        ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY));
-        ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY));
-        ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY));
-        ICONS.put(ICON_IN_OUT_KEY, register.registerIcon(ICON_IN_OUT_KEY));
+        iconKey = register.registerIcon(ICON_KEY);
+        iconCoreKey = register.registerIcon(ICON_CORE_KEY);
       }
 
       @Override
@@ -63,324 +35,23 @@ public class EnderLiquidConduit extends AbstractLiquidConduit {
     });
   }
 
-  private EnderLiquidConduitNetwork network;
-  private int ticksSinceFailedExtract;
-
-  private final EnumMap<ForgeDirection, FluidFilter> outputFilters = new EnumMap<ForgeDirection, FluidFilter>(ForgeDirection.class);
-  private final EnumMap<ForgeDirection, FluidFilter> inputFilters = new EnumMap<ForgeDirection, FluidFilter>(ForgeDirection.class);
-
   @Override
-  public ItemStack createItem() {
-    return new ItemStack(EnderIO.itemLiquidConduit, 1, 2);
+  public Type getType() {
+    return TYPE;
   }
 
   @Override
-  public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List<RaytraceResult> all) {
-    if(player.getCurrentEquippedItem() == null) {
-      return false;
-    }
-
-    if(ToolUtil.isToolEquipped(player)) {
-
-      if(!getBundle().getEntity().getWorldObj().isRemote) {
-
-        if(res != null && res.component != null) {
-
-          ForgeDirection connDir = res.component.dir;
-          ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit);
-
-          if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) {
-
-            if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) {
-              setConnectionMode(faceHit, getNextConnectionMode(faceHit));
-              return true;
-            }
-
-            BlockCoord loc = getLocation().getLocation(faceHit);
-            ILiquidConduit n = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class);
-            if(n == null) {
-              return false;
-            }
-            if(!(n instanceof EnderLiquidConduit)) {
-              return false;
-            }
-            return ConduitUtil.joinConduits(this, faceHit);
-          } else if(containsExternalConnection(connDir)) {
-            // Toggle extraction mode
-            setConnectionMode(connDir, getNextConnectionMode(connDir));
-          } else if(containsConduitConnection(connDir)) {
-            ConduitUtil.disconectConduits(this, connDir);
-
-          }
-        }
-      }
-      return true;
-    }
-    return false;
+  public int getMetadata() {
+    return METADATA;
   }
 
   @Override
-  public AbstractConduitNetwork<?, ?> getNetwork() {
-    return network;
-  }
-
-  public FluidFilter getFilter(ForgeDirection dir, boolean isInput) {
-    if(isInput) {
-      return inputFilters.get(dir);
-    }
-    return outputFilters.get(dir);
-  }
-
-  public void setFilter(ForgeDirection dir, FluidFilter filter, boolean isInput) {
-    if(isInput) {
-      inputFilters.put(dir, filter);
-    } else {
-      outputFilters.put(dir, filter);
-    }
+  protected IIcon getIconKey() {
+    return iconKey;
   }
 
   @Override
-  public boolean setNetwork(AbstractConduitNetwork<?, ?> network) {
-    if(network == null) {
-      this.network = null;
-      return true;
-    }
-    if(!(network instanceof EnderLiquidConduitNetwork)) {
-      return false;
-    }
-    this.network = (EnderLiquidConduitNetwork) network;
-    for (ForgeDirection dir : externalConnections) {
-      this.network.connectionChanged(this, dir);
-    }
-
-    return true;
+  protected IIcon getIconCoreKey() {
+    return iconCoreKey;
   }
-
-  @Override
-  public IIcon getTextureForState(CollidableComponent component) {
-    if(component.dir == ForgeDirection.UNKNOWN) {
-      return ICONS.get(ICON_CORE_KEY);
-    }
-    return ICONS.get(ICON_KEY);
-  }
-
-  public IIcon getTextureForInputMode() {
-    return ICONS.get(ICON_EXTRACT_KEY);
-  }
-
-  public IIcon getTextureForOutputMode() {
-    return ICONS.get(ICON_INSERT_KEY);
-  }
-
-  public IIcon getTextureForInOutMode() {
-    return ICONS.get(ICON_IN_OUT_KEY);
-  }
-
-  @Override
-  public IIcon getTransmitionTextureForState(CollidableComponent component) {
-    return null;
-  }
-
-  @Override
-  public boolean canConnectToConduit(ForgeDirection direction, IConduit con) {
-    if(!super.canConnectToConduit(direction, con)) {
-      return false;
-    }
-    if(!(con instanceof EnderLiquidConduit)) {
-      return false;
-    }
-    return true;
-  }
-
-  @Override
-  public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) {
-    super.setConnectionMode(dir, mode);
-    refreshConnections(dir);
-  }
-  
-  @Override
-  public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) {
-    super.setExtractionRedstoneMode(mode, dir);
-    refreshConnections(dir);
-  }
-
-  private void refreshConnections(ForgeDirection dir) {
-    if(network == null) {
-      return;
-    }
-    network.connectionChanged(this, dir);
-  }
-
-  @Override
-  public void externalConnectionAdded(ForgeDirection fromDirection) {
-    super.externalConnectionAdded(fromDirection);
-    refreshConnections(fromDirection);
-  }
-
-  @Override
-  public void externalConnectionRemoved(ForgeDirection fromDirection) {
-    super.externalConnectionRemoved(fromDirection);
-    refreshConnections(fromDirection);
-  }
-
-  @Override
-  public void updateEntity(World world) {
-    super.updateEntity(world);
-    if(world.isRemote) {
-      return;
-    }
-    doExtract();
-  }
-
-  private void doExtract() {
-    BlockCoord loc = getLocation();
-    if(!hasExtractableMode()) {
-      return;
-    }
-    if(network == null) {
-      return;
-    }
-
-    // assume failure, reset to 0 if we do extract
-    ticksSinceFailedExtract++;
-    if(ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) {
-      // after 25 ticks of failing, only check every 10 ticks
-      return;
-    }
-
-    for (ForgeDirection dir : externalConnections) {
-      if(autoExtractForDir(dir)) {
-        if(network.extractFrom(this, dir)) {
-          ticksSinceFailedExtract = 0;
-        }
-      }
-    }
-
-  }
-
-  //Fluid API
-
-  @Override
-  public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
-    if(network == null || !getConnectionMode(from).acceptsInput()) {
-      return 0;
-    }
-    return network.fillFrom(this, from, resource, doFill);
-  }
-
-  @Override
-  public boolean canFill(ForgeDirection from, Fluid fluid) {
-    if(network == null) {
-      return false;
-    }
-    return getConnectionMode(from).acceptsInput();
-  }
-
-  @Override
-  public boolean canDrain(ForgeDirection from, Fluid fluid) {
-    return false;
-  }
-
-  @Override
-  public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
-    return null;
-  }
-
-  @Override
-  public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
-    return null;
-  }
-
-  @Override
-  public FluidTankInfo[] getTankInfo(ForgeDirection from) {
-    if(network == null) {
-      return new FluidTankInfo[0];
-    }
-    return network.getTankInfo(this, from);
-  }
-  
-  @Override
-  protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-    super.readTypeSettings(dir, dataRoot);
-    if (dataRoot.hasKey("outputFilters")) {
-      FluidFilter out = new FluidFilter();
-      out.readFromNBT(dataRoot.getCompoundTag("outputFilters"));
-      outputFilters.put(dir, out);
-    }
-    if (dataRoot.hasKey("inputFilters")) {
-      FluidFilter in = new FluidFilter();
-      in.readFromNBT(dataRoot.getCompoundTag("inputFilters"));
-      inputFilters.put(dir, in);
-    }
-  }
-
-  @Override
-  protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) {
-    super.writeTypeSettingsToNbt(dir, dataRoot);
-    FluidFilter out = outputFilters.get(dir);
-    if (out != null) {
-      NBTTagCompound outTag = new NBTTagCompound();
-      out.writeToNBT(outTag);
-      dataRoot.setTag("outputFilters", outTag);
-    }
-    FluidFilter in = inputFilters.get(dir);
-    if (in != null) {
-      NBTTagCompound inTag = new NBTTagCompound();
-      in.writeToNBT(inTag);
-      dataRoot.setTag("inputFilters", inTag);
-    }
-  }
-
-  @Override
-  public void writeToNBT(NBTTagCompound nbtRoot) {
-    super.writeToNBT(nbtRoot);
-    for (Entry<ForgeDirection, FluidFilter> entry : inputFilters.entrySet()) {
-      if(entry.getValue() != null) {
-        FluidFilter f = entry.getValue();
-        if(f != null && !f.isDefault()) {
-          NBTTagCompound itemRoot = new NBTTagCompound();
-          f.writeToNBT(itemRoot);
-          nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot);
-        }
-      }
-    }
-    for (Entry<ForgeDirection, FluidFilter> entry : outputFilters.entrySet()) {
-      if(entry.getValue() != null) {
-        FluidFilter f = entry.getValue();
-        if(f != null && !f.isDefault()) {
-          NBTTagCompound itemRoot = new NBTTagCompound();
-          f.writeToNBT(itemRoot);
-          nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot);
-        }
-      }
-    }
-  }
-
-  @Override
-  public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) {
-    super.readFromNBT(nbtRoot, nbtVersion);
-    for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-      String key = "inFilts." + dir.name();
-      if(nbtRoot.hasKey(key)) {
-        NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
-        FluidFilter f = new FluidFilter();
-        f.readFromNBT(filterTag);
-        if(!f.isEmpty()) {
-          inputFilters.put(dir, f);
-        }
-      }
-      
-      key = "outFilts." + dir.name();
-      if(nbtRoot.hasKey(key)) {
-        NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
-        FluidFilter f = new FluidFilter();
-        f.readFromNBT(filterTag);
-        if(!f.isEmpty()) {
-          outputFilters.put(dir, f);
-        }
-      }
-    }
-
-  }
-
-}
+}

src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java

@@ -1,9 +1,6 @@
 package crazypants.enderio.conduit.liquid;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -11,29 +8,66 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
 import com.enderio.core.common.util.BlockCoord;
-import com.enderio.core.common.util.RoundRobinIterator;
 
 import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
-import crazypants.enderio.config.Config;
 
-public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidConduit, EnderLiquidConduit> {
+public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidConduit, AbstractEnderLiquidConduit> {
+  private class TankIterator implements Iterator<NetworkTank> {
+    private int index = -1;
+    private int currentCount = 0;
 
-  public static final int MAX_EXTRACT_PER_TICK = Config.enderFluidConduitExtractRate;
-  public static final int MAX_IO_PER_TICK = Config.enderFluidConduitMaxIoRate;
+    public TankIterator start() {
+      currentCount = 0;
+      return this;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return !tanks.isEmpty() && currentCount < tanks.size();
+    }
+
+    @Override
+    public NetworkTank next() {
+      if (tanks.isEmpty()) {
+        return null;
+      }
+      currentCount++;
+      index++;
+      if (index >= tanks.size()) {
+        index = 0;
+      }
+      return tanks.get(index);
+    }
+
+    @Override
+    public void remove() {
+    }
+
+    public void rewind() {
+      if (index == 0)
+        index = tanks.size() - 1;
+      else
+        index--;
+      currentCount--;
+    }
+  }
+
+  private final AbstractEnderLiquidConduit.Type type;
 
   List<NetworkTank> tanks = new ArrayList<NetworkTank>();
   Map<NetworkTankKey, NetworkTank> tankMap = new HashMap<NetworkTankKey, NetworkTank>();
 
-  Map<NetworkTank, RoundRobinIterator<NetworkTank>> iterators;
+  Map<NetworkTank, TankIterator> iterators;
 
   boolean filling;
 
-  public EnderLiquidConduitNetwork() {
-    super(EnderLiquidConduit.class, ILiquidConduit.class);
+  public EnderLiquidConduitNetwork(AbstractEnderLiquidConduit.Type type) {
+    super(AbstractEnderLiquidConduit.class, ILiquidConduit.class);
+    this.type = type;
   }
 
-  public void connectionChanged(EnderLiquidConduit con, ForgeDirection conDir) {
+  public void connectionChanged(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
     NetworkTankKey key = new NetworkTankKey(con, conDir);
     NetworkTank tank = new NetworkTank(con, conDir);
     tanks.remove(tank); // remove old tank, NB: =/hash is only calced on location and dir
@@ -42,12 +76,12 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
     tankMap.put(key, tank);
   }
 
-  public boolean extractFrom(EnderLiquidConduit con, ForgeDirection conDir) {
+  public boolean extractFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
     NetworkTank tank = getTank(con, conDir);
     if(tank == null || !tank.isValid()) {
       return false;
     }
-    FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), MAX_EXTRACT_PER_TICK, false);
+    FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), type.getMaxExtractPerTick(), false);
     if(drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true)) {
       return false;
     }
@@ -60,17 +94,17 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
       return false;
     }
     //    if(drained.amount != amountAccepted) {
-    //      Log.warn("EnderLiquidConduit.extractFrom: Extracted fluid volume is not equal to inserted volume. Drained=" + drained.amount + " filled="
+    //      Log.warn("AbstractEnderLiquidConduit.extractFrom: Extracted fluid volume is not equal to inserted volume. Drained=" + drained.amount + " filled="
     //          + amountAccepted + " Fluid: " + drained + " Accepted=" + amountAccepted);
     //    }
     return true;
   }
 
-  private NetworkTank getTank(EnderLiquidConduit con, ForgeDirection conDir) {
+  private NetworkTank getTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
     return tankMap.get(new NetworkTankKey(con, conDir));
   }
 
-  public int fillFrom(EnderLiquidConduit con, ForgeDirection conDir, FluidStack resource, boolean doFill) {
+  public int fillFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir, FluidStack resource, boolean doFill) {
     return fillFrom(getTank(con, conDir), resource, doFill);
   }
 
@@ -88,22 +122,26 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
         return 0;
       }
       resource = resource.copy();
-      resource.amount = Math.min(resource.amount, MAX_IO_PER_TICK);
+      resource.amount = Math.min(resource.amount, type.getMaxIoPerTick());
       int filled = 0;
       int remaining = resource.amount;
       //TODO: Only change starting pos of iterator is doFill is true so a false then true returns the same
 
-      for (NetworkTank target : getIteratorForTank(tank)) {
-        if(!target.equals(tank) && target.acceptsOuput && target.isValid() && matchedFilter(resource, target.con, target.conDir, false)) {
+      TankIterator iterator;
+      for (iterator = getIteratorForTank(tank).start(); iterator.hasNext(); ) {
+        NetworkTank target = iterator.next();
+        if (!target.equals(tank) && target.con.getOutputColor(target.conDir).equals(tank.con.getInputColor(tank.conDir)) && target.acceptsOuput && target.isValid() && matchedFilter(resource, target.con, target.conDir, false)) {
           int vol = target.externalTank.fill(target.tankDir, resource.copy(), doFill);
           remaining -= vol;
           filled += vol;
-          if(remaining <= 0) {
-            return filled;
+          if (remaining <= 0) {
+            break;
           }
           resource.amount = remaining;
         }
       }
+      if (!tank.con.isRoundRobin(tank.conDir))
+        iterator.rewind();
       return filled;
 
     } finally {
@@ -111,7 +149,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
     }
   }
 
-  private boolean matchedFilter(FluidStack drained, EnderLiquidConduit con, ForgeDirection conDir, boolean isInput) {
+  private boolean matchedFilter(FluidStack drained, AbstractEnderLiquidConduit con, ForgeDirection conDir, boolean isInput) {
     if(drained == null || con == null || conDir == null) {
       return false;
     }
@@ -122,19 +160,19 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
     return filter.matchesFilter(drained);
   }
 
-  private Iterable<NetworkTank> getIteratorForTank(NetworkTank tank) {
+  private TankIterator getIteratorForTank(NetworkTank tank) {
     if(iterators == null) {
-      iterators = new HashMap<NetworkTank, RoundRobinIterator<NetworkTank>>();
+      iterators = new HashMap<>();
     }
-    RoundRobinIterator<NetworkTank> res = iterators.get(tank);
+    TankIterator res = iterators.get(tank);
     if(res == null) {
-      res = new RoundRobinIterator<NetworkTank>(tanks);
+      res = new TankIterator();
       iterators.put(tank, res);
     }
     return res;
   }
 
-  public FluidTankInfo[] getTankInfo(EnderLiquidConduit con, ForgeDirection conDir) {
+  public FluidTankInfo[] getTankInfo(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
     List<FluidTankInfo> res = new ArrayList<FluidTankInfo>(tanks.size());
     NetworkTank tank = getTank(con, conDir);
     for (NetworkTank target : tanks) {
@@ -155,7 +193,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
     ForgeDirection conDir;
     BlockCoord conduitLoc;
 
-    public NetworkTankKey(EnderLiquidConduit con, ForgeDirection conDir) {
+    public NetworkTankKey(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
       this(con.getLocation(), conDir);
     }
 
@@ -202,14 +240,14 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
 
   static class NetworkTank {
 
-    EnderLiquidConduit con;
+    AbstractEnderLiquidConduit con;
     ForgeDirection conDir;
     IFluidHandler externalTank;
     ForgeDirection tankDir;
     BlockCoord conduitLoc;
     boolean acceptsOuput;
 
-    public NetworkTank(EnderLiquidConduit con, ForgeDirection conDir) {
+    public NetworkTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) {
       this.con = con;
       this.conDir = conDir;
       conduitLoc = con.getLocation();

src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java

@@ -1,6 +1,9 @@
 package crazypants.enderio.conduit.liquid;
 
+import com.enderio.core.common.util.DyeColor;
+import crazypants.enderio.conduit.item.IItemConduit;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 import crazypants.enderio.conduit.ConnectionMode;
@@ -15,7 +18,7 @@ public class EnderLiquidConduitRenderer extends DefaultConduitRenderer {
 
   @Override
   public boolean isRendererForConduit(IConduit conduit) {
-    if(conduit instanceof EnderLiquidConduit) {      
+    if(conduit instanceof AbstractEnderLiquidConduit) {
       return true;
     }
     return false;
@@ -26,19 +29,42 @@ public class EnderLiquidConduitRenderer extends DefaultConduitRenderer {
   public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick,
       float worldLight, RenderBlocks rb) {
     super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb);
-    EnderLiquidConduit pc = (EnderLiquidConduit) conduit;
+
+    AbstractEnderLiquidConduit pc = (AbstractEnderLiquidConduit) conduit;
     for (ForgeDirection dir : conduit.getExternalConnections()) {
-      IIcon tex = null;
+      DyeColor inChannel = null;
+      DyeColor outChannel = null;
+      IIcon inTex = null;
+      IIcon outTex = null;
+      boolean render = true;
       if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) {
-        tex = pc.getTextureForInputMode();
+        inTex = pc.getTextureForInputMode();
+        inChannel = pc.getInputColor(dir);
       } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) {
-        tex = pc.getTextureForOutputMode();
+        outTex = pc.getTextureForOutputMode();
+        outChannel = pc.getOutputColor(dir);
       } else if(conduit.getConnectionMode(dir) == ConnectionMode.IN_OUT) {
-        tex = pc.getTextureForInOutMode();
+        inTex = pc.getTextureForInOutMode(true);
+        outTex = pc.getTextureForInOutMode(false);
+        inChannel = pc.getInputColor(dir);
+        outChannel = pc.getOutputColor(dir);
+      } else {
+        render = false;
       }
-      if(tex != null) {
+      if(render && !rb.hasOverrideBlockTexture()) {
         Offset offset = te.getOffset(ILiquidConduit.class, dir);
-        ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true);
+        ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true);
+
+        if(inChannel != null) {
+          Tessellator.instance.setColorOpaque_I(inChannel.getColor());
+          ConnectionModeGeometry.renderModeConnector(dir, offset, inTex, false);
+        }
+        if(outChannel != null) {
+          Tessellator.instance.setColorOpaque_I(outChannel.getColor());
+          ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false);
+        }
+
+        Tessellator.instance.setColorOpaque_F(1f, 1f, 1f);
       }
     }
   }

src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java

@@ -22,8 +22,11 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
   private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
     new ItemConduitSubtype(ModObject.itemLiquidConduit.name(), "enderio:itemLiquidConduit"),
     new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Advanced", "enderio:itemLiquidConduitAdvanced"),
-    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Ender", "enderio:itemLiquidConduitEnder")
-
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Ender", "enderio:itemLiquidConduitEnder"),
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "CrystallineEnder", "enderio:itemLiquidConduitCrystallineEnder"),
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "CrystallinePinkSlimeEnder", "enderio:itemLiquidConduitCrystallinePinkSlimeEnder"),
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "MelodicEnder", "enderio:itemLiquidConduitMelodicEnder"),
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "StellarEnder", "enderio:itemLiquidConduitStellarEnder")
   };
 
   public static ItemLiquidConduit create() {
@@ -43,12 +46,24 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
 
   @Override
   public IConduit createConduit(ItemStack stack, EntityPlayer player) {
-    if(stack.getItemDamage() == 1) {
-      return new AdvancedLiquidConduit();
-    } else if(stack.getItemDamage() == 2) {
-      return new EnderLiquidConduit();
+    switch (stack.getItemDamage()) {
+      case 0:
+        return new LiquidConduit();
+      case 1:
+        return new AdvancedLiquidConduit();
+      case EnderLiquidConduit.METADATA:
+        return new EnderLiquidConduit();
+      case CrystallineEnderLiquidConduit.METADATA:
+        return new CrystallineEnderLiquidConduit();
+      case CrystallinePinkSlimeEnderLiquidConduit.METADATA:
+        return new CrystallinePinkSlimeEnderLiquidConduit();
+      case MelodicEnderLiquidConduit.METADATA:
+        return new MelodicEnderLiquidConduit();
+      case StellarEnderLiquidConduit.METADATA:
+        return new StellarEnderLiquidConduit();
+      default:
+        throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage());
     }
-    return new LiquidConduit();
   }
 
   @Override
@@ -68,23 +83,53 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
     int extractRate;
     int maxIo;
 
-    if(itemstack.getItemDamage() == 0) {
-      extractRate = Config.fluidConduitExtractRate;
-      maxIo = Config.fluidConduitMaxIoRate;
-    } else if(itemstack.getItemDamage() == 1){
-      extractRate = Config.advancedFluidConduitExtractRate;
-      maxIo = Config.advancedFluidConduitMaxIoRate;
-    } else {
-      extractRate = Config.enderFluidConduitExtractRate;
-      maxIo = Config.enderFluidConduitMaxIoRate;
+    switch (itemstack.getItemDamage()) {
+      case 0:
+        extractRate = Config.fluidConduitExtractRate;
+        maxIo = Config.fluidConduitMaxIoRate;
+        break;
+
+      case 1:
+        extractRate = Config.advancedFluidConduitExtractRate;
+        maxIo = Config.advancedFluidConduitMaxIoRate;
+        break;
+
+      case EnderLiquidConduit.METADATA:
+        extractRate = EnderLiquidConduit.TYPE.getMaxExtractPerTick();
+        maxIo = EnderLiquidConduit.TYPE.getMaxIoPerTick();
+        break;
+
+      case CrystallineEnderLiquidConduit.METADATA:
+        extractRate = CrystallineEnderLiquidConduit.TYPE.getMaxExtractPerTick();
+        maxIo = CrystallineEnderLiquidConduit.TYPE.getMaxIoPerTick();
+        break;
+
+      case CrystallinePinkSlimeEnderLiquidConduit.METADATA:
+        extractRate = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxExtractPerTick();
+        maxIo = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxIoPerTick();
+        break;
+
+      case MelodicEnderLiquidConduit.METADATA:
+        extractRate = MelodicEnderLiquidConduit.TYPE.getMaxExtractPerTick();
+        maxIo = MelodicEnderLiquidConduit.TYPE.getMaxIoPerTick();
+        break;
+
+      case StellarEnderLiquidConduit.METADATA:
+        extractRate = StellarEnderLiquidConduit.TYPE.getMaxExtractPerTick();
+        maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick();
+        break;
+
+      default:
+        throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + itemstack.getItemDamage());
     }
+
     String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick");
     list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt);
     list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt);
 
     if(itemstack.getItemDamage() == 0) {
       SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit");
-    } else if(itemstack.getItemDamage() == 2) {
+    } else if(itemstack.getItemDamage() > 1) {
       SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduitEnder");      
     }
 

src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java

@@ -83,8 +83,6 @@ public class LiquidConduit extends AbstractTankConduit {
 
   private ForgeDirection startPushDir = ForgeDirection.DOWN;
 
-  private final Set<BlockCoord> filledFromThisTick = new HashSet<BlockCoord>();
-
   private long ticksSinceFailedExtract = 0;
 
   @Override
@@ -170,9 +168,7 @@ public class LiquidConduit extends AbstractTankConduit {
       return 0;
     }
 
-    // Note: This is just a guard against mekansims pipes that will continuously
-    // call
-    // fill on us if we push liquid to them.
+  // Guard against things that continuously call fill!
     if(filledFromThisTick.contains(getLocation().getLocation(from))) {
       return 0;
     }

src/main/java/crazypants/enderio/conduit/liquid/MelodicEnderLiquidConduit.java

@@ -0,0 +1,57 @@
+package crazypants.enderio.conduit.liquid;
+
+import com.enderio.core.client.render.IconUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class MelodicEnderLiquidConduit extends AbstractEnderLiquidConduit {
+
+  public static final Type TYPE = Type.MELODIC;
+  public static final int METADATA = 5;
+  public static final String ICON_KEY = "enderio:liquidConduitMelodicEnder";
+  public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreMelodicEnder";
+
+  static IIcon iconKey;
+  static IIcon iconCoreKey;
+
+  @SideOnly(Side.CLIENT)
+  public static void initIcons() {
+    IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+      @Override
+      public void registerIcons(IIconRegister register) {
+        iconKey = register.registerIcon(ICON_KEY);
+        iconCoreKey = register.registerIcon(ICON_CORE_KEY);
+      }
+
+      @Override
+      public int getTextureType() {
+        return 0;
+      }
+
+    });
+  }
+
+  @Override
+  public Type getType() {
+    return TYPE;
+  }
+
+  @Override
+  public int getMetadata() {
+    return METADATA;
+  }
+
+  @Override
+  protected IIcon getIconKey() {
+    return iconKey;
+  }
+
+  @Override
+  protected IIcon getIconCoreKey() {
+    return iconCoreKey;
+  }
+}

src/main/java/crazypants/enderio/conduit/liquid/StellarEnderLiquidConduit.java

@@ -0,0 +1,57 @@
+package crazypants.enderio.conduit.liquid;
+
+import com.enderio.core.client.render.IconUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class StellarEnderLiquidConduit extends AbstractEnderLiquidConduit {
+
+  public static final Type TYPE = Type.STELLAR;
+  public static final int METADATA = 6;
+  public static final String ICON_KEY = "enderio:liquidConduitStellarEnder";
+  public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreStellarEnder";
+
+  static IIcon iconKey;
+  static IIcon iconCoreKey;
+
+  @SideOnly(Side.CLIENT)
+  public static void initIcons() {
+    IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+      @Override
+      public void registerIcons(IIconRegister register) {
+        iconKey = register.registerIcon(ICON_KEY);
+        iconCoreKey = register.registerIcon(ICON_CORE_KEY);
+      }
+
+      @Override
+      public int getTextureType() {
+        return 0;
+      }
+
+    });
+  }
+
+  @Override
+  public Type getType() {
+    return TYPE;
+  }
+
+  @Override
+  public int getMetadata() {
+    return METADATA;
+  }
+
+  @Override
+  protected IIcon getIconKey() {
+    return iconKey;
+  }
+
+  @Override
+  protected IIcon getIconCoreKey() {
+    return iconCoreKey;
+  }
+}

src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java

@@ -0,0 +1,47 @@
+package crazypants.enderio.conduit.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.conduit.liquid.AbstractEnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.ILiquidConduit;
+import io.netty.buffer.ByteBuf;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit> implements IMessageHandler<PacketRoundRobinMode, IMessage> {
+    private ForgeDirection dir;
+    private boolean roundRobin;
+
+    public PacketRoundRobinMode() {
+    }
+
+    public PacketRoundRobinMode(AbstractEnderLiquidConduit eConduit, ForgeDirection dir) {
+        super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID);
+        this.dir = dir;
+        roundRobin = eConduit.isRoundRobin(dir);
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        super.toBytes(buf);
+        buf.writeShort(dir.ordinal());
+        buf.writeBoolean(roundRobin);
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        super.fromBytes(buf);
+        dir = ForgeDirection.values()[buf.readShort()];
+        roundRobin = buf.readBoolean();
+    }
+
+    @Override
+    public IMessage onMessage(PacketRoundRobinMode message, MessageContext ctx) {
+        final ILiquidConduit conduit = message.getTileCasted(ctx);
+        if (conduit instanceof AbstractEnderLiquidConduit) {
+            ((AbstractEnderLiquidConduit) conduit).setRoundRobin(message.dir, message.roundRobin);
+            message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
+        }
+        return null;
+    }
+}

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

@@ -119,6 +119,14 @@ public final class Config {
 
   public static boolean itemConduitUsePhyscialDistance = false;
 
+  public static int stellarEnderFluidConduitExtractRate = 20_000;
+  public static int stellarEnderFluidConduitMaxIoRate = 80_000;
+  public static int melodicEnderFluidConduitExtractRate = 10_000;
+  public static int melodicEnderFluidConduitMaxIoRate = 40_000;
+  public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000;
+  public static int crystallinePinkSlimeEnderFluidConduitMaxIoRate = 8_000;
+  public static int crystallineEnderFluidConduitExtractRate = 1_000;
+  public static int crystallineEnderFluidConduitMaxIoRate = 4_000;
   public static int enderFluidConduitExtractRate = 200;
   public static int enderFluidConduitMaxIoRate = 800;
   public static int advancedFluidConduitExtractRate = 100;
@@ -694,22 +702,46 @@ public final class Config {
         "The range of the wireless charger").getInt(wirelessChargerRange);
 
     fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate,
-        "Number of millibuckets per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate);
+        "Number of liters per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate);
 
     fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate,
-        "Number of millibuckets per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate);
+        "Number of liters per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate);
 
     advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate,
-        "Number of millibuckets per tick extracted by pressurized fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate);
+        "Number of liters per tick extracted by pressurized fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate);
 
     advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate,
-        "Number of millibuckets per tick that can pass through a single connection to an pressurized fluid conduit.").getInt(advancedFluidConduitMaxIoRate);
+        "Number of liters per tick that can pass through a single connection to an pressurized fluid conduit.").getInt(advancedFluidConduitMaxIoRate);
 
     enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate,
-        "Number of millibuckets per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate);
+        "Number of liters per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate);
 
     enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate,
-        "Number of millibuckets per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate);
+        "Number of liters per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate);
+
+    crystallineEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "crystallineEnderFluidConduitExtractRate", crystallineEnderFluidConduitExtractRate,
+        "Number of liters per tick extracted by crystalline ender fluid conduits auto extracting").getInt(crystallineEnderFluidConduitExtractRate);
+
+    crystallineEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "crystallineEnderFluidConduitMaxIoRate", crystallineEnderFluidConduitMaxIoRate,
+        "Number of liters per tick that can pass through a single connection to a crystalline ender fluid conduit.").getInt(crystallineEnderFluidConduitMaxIoRate);
+
+    crystallinePinkSlimeEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "crystallinePinkSlimeEnderFluidConduitExtractRate", crystallinePinkSlimeEnderFluidConduitExtractRate,
+        "Number of liters per tick extracted by crystalline pink slime ender fluid conduits auto extracting").getInt(crystallinePinkSlimeEnderFluidConduitExtractRate);
+
+    crystallinePinkSlimeEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "crystallinePinkSlimeEnderFluidConduitMaxIoRate", crystallinePinkSlimeEnderFluidConduitMaxIoRate,
+        "Number of liters per tick that can pass through a single connection to a crystalline pink slime ender fluid conduit.").getInt(crystallinePinkSlimeEnderFluidConduitMaxIoRate);
+
+    melodicEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "melodicEnderFluidConduitExtractRate", melodicEnderFluidConduitExtractRate,
+        "Number of liters per tick extracted by melodic ender fluid conduits auto extracting").getInt(melodicEnderFluidConduitExtractRate);
+
+    melodicEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "melodicEnderFluidConduitMaxIoRate", melodicEnderFluidConduitMaxIoRate,
+        "Number of liters per tick that can pass through a single connection to a melodic ender fluid conduit.").getInt(melodicEnderFluidConduitMaxIoRate);
+
+    stellarEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "stellarEnderFluidConduitExtractRate", stellarEnderFluidConduitExtractRate,
+        "Number of liters per tick extracted by stellar ender fluid conduits auto extracting").getInt(stellarEnderFluidConduitExtractRate);
+
+    stellarEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "stellarEnderFluidConduitMaxIoRate", stellarEnderFluidConduitMaxIoRate,
+        "Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.").getInt(stellarEnderFluidConduitMaxIoRate);
 
     gasConduitExtractRate = config.get(sectionEfficiency.name, "gasConduitExtractRate", gasConduitExtractRate,
         "Amount of gas per tick extracted by gas conduits auto extracting").getInt(gasConduitExtractRate);
@@ -721,7 +753,7 @@ public final class Config {
         "Use TheKazador's alternative model for the Dimensional Transceiver")
         .getBoolean(false);
     transceiverEnergyLoss = config.get(sectionPower.name, "transceiverEnergyLoss", transceiverEnergyLoss,
-        "Amount of energy lost when transfered by Dimensional Transceiver; 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss);
+        "Amount of energy lost when transferred by Dimensional Transceiver; 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss);
     transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF,
         "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF);
     transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF,

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

@@ -41,9 +41,9 @@ public class TooltipHandlerFluid implements ITooltipCallback {
       } else {
         IFluidCoolant coolant = FluidFuelRegister.instance.getCoolant(fluid);
         if (coolant != null) {
-          list.add(EnderIO.lang.localize("coolant.tooltip.heading"));
+          list.add(EnderIO.lang.localize("enderio.coolant.tooltip.heading"));
           list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerFloat(coolant.getDegreesCoolingPerMB(100) * 1000) + " "
-              + EnderIO.lang.localize("coolant.tooltip.degreesPerBucket"));
+              + EnderIO.lang.localize("enderio.coolant.tooltip.degreesPerBucket"));
         }
       }
     }    

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

@@ -185,6 +185,9 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
     if(entity instanceof EntityPlayer) {
       return false;
     }
+    if(entity.isDead) {
+      return false;
+    }
 
     String entityId = EntityList.getEntityString(entity);
     if(isBlackListed(entityId)) {

src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java

@@ -1,5 +1,6 @@
 package crazypants.enderio.machine;
 
+import crazypants.enderio.power.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
@@ -8,13 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.enderio.core.common.vecmath.VecmathUtil;
 
 import crazypants.enderio.EnderIO;
-import crazypants.enderio.material.ItemCapacitor;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.enderio.power.Capacitors;
-import crazypants.enderio.power.ICapacitor;
-import crazypants.enderio.power.ICapacitorItem;
-import crazypants.enderio.power.IInternalPoweredTile;
-import crazypants.enderio.power.PowerHandlerUtil;
 
 public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
 
@@ -27,7 +22,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
 
   protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) {
     super(slotDefinition);
-    setCapacitor(Capacitors.BASIC_CAPACITOR);
+    capacitorType = Capacitors.BASIC_CAPACITOR;
   }
 
   @Override
@@ -45,7 +40,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
       return;
     }
     boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5));
-    if(powerChanged) {
+    if (powerChanged) {
       lastSyncPowerStored = storedEnergyRF;
       PacketHandler.sendToAllAround(new PacketPowerStorage(this), this);
     }
@@ -60,7 +55,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
 
   @Override
   public int getMaxEnergyRecieved(ForgeDirection dir) {
-    if(isSideDisabled(dir.ordinal())) {
+    if (isSideDisabled(dir.ordinal())) {
       return 0;
     }
     return getCapacitor().getMaxEnergyReceived();
@@ -98,18 +93,16 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
 
   public ICapacitor getCapacitor() {
 
-	  if(capacitor != null) {
-		    return capacitor;
-	  }
+    if (capacitor != null) {
+      return capacitor;
+    } else if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
+      ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
+      if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
+        return EnderIO.itemBasicCapacitor.getCapacitor(contents);
+      }
+    }
 
-	  else if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
-        ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
-        if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
-        	return EnderIO.itemBasicCapacitor.getCapacitor(contents);
-        }
-	  }
-
-	  return capacitorType.capacitor;
+    return capacitorType.capacitor;
 
   }
 
@@ -127,15 +120,13 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
   public void setCapacitor(Capacitors capacitorType) {
     this.capacitorType = capacitorType;
 
-    if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
-        ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
-        if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
-        	setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents));
-        }
-    }
-
-    else {
-    	this.capacitor = capacitorType.capacitor;
+    if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
+      ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
+      if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
+        setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents));
+      }
+    } else {
+      this.capacitor = capacitorType.capacitor;
     }
 
     onCapacitorTypeChange();
@@ -153,7 +144,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
   @Override
   public void setInventorySlotContents(int slot, ItemStack contents) {
     super.setInventorySlotContents(slot, contents);
-    if(slotDefinition.isUpgradeSlot(slot)) {
+    if (slotDefinition.isUpgradeSlot(slot)) {
       updateCapacitorFromSlot();
     }
   }
@@ -161,19 +152,19 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
   @Override
   public ItemStack decrStackSize(int fromSlot, int amount) {
     ItemStack res = super.decrStackSize(fromSlot, amount);
-    if(slotDefinition.isUpgradeSlot(fromSlot)) {
+    if (slotDefinition.isUpgradeSlot(fromSlot)) {
       updateCapacitorFromSlot();
     }
     return res;
   }
 
   private void updateCapacitorFromSlot() {
-    if(slotDefinition.getNumUpgradeSlots() <= 0) {
+    if (slotDefinition.getNumUpgradeSlots() <= 0) {
       setCapacitor(Capacitors.BASIC_CAPACITOR);
       return;
     }
     ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
-    if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) {
+    if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) {
       setCapacitor(Capacitors.BASIC_CAPACITOR);
     } else {
       setCapacitor(Capacitors.values()[contents.getItemDamage()]);
@@ -190,7 +181,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
     super.readCommon(nbtRoot);
     setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
     int energy;
-    if(nbtRoot.hasKey("storedEnergy")) {
+    if (nbtRoot.hasKey("storedEnergy")) {
       float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
       energy = (int) (storedEnergyMJ * 10);
     } else {
@@ -208,5 +199,4 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
     nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF);
     nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal());
   }
-
-}
+}

src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java

@@ -409,7 +409,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver
   @Override
   @SideOnly(Side.CLIENT)
   public AxisAlignedBB getRenderBoundingBox() {
-    if(!type.isMultiblock() || !(network instanceof CapBankClientNetwork)) {
+    if(!getType().isMultiblock() || !(network instanceof CapBankClientNetwork)) {
       return super.getRenderBoundingBox();
     }
 

src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java

@@ -24,6 +24,7 @@ import crazypants.enderio.machine.farm.farmers.PlantableFarmer;
 import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2;
 import crazypants.enderio.machine.farm.farmers.StemFarmer;
 import crazypants.enderio.machine.farm.farmers.TreeFarmer;
+import crazypants.enderio.machine.farm.farmers.ForestryFarmer;
 
 public final class FarmersRegistry {
 
@@ -34,13 +35,10 @@ public final class FarmersRegistry {
     addExtraUtilities();
     addNatura();
     addTiC();
-    addStillHungry();
     addIC2();
-    addMFR();
     addThaumcraft();
     addFlowers();
-    addGrowableOres();
-    addImmersiveEngineering();
+    ForestryFarmer.init();
 
     FarmersCommune.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds)));
     FarmersCommune.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus)));
@@ -178,16 +176,6 @@ public final class FarmersRegistry {
     }
   }
   
-  private static void addMFR() {
-    String mod = "MineFactoryReloaded";
-    String blockName = "rubberwood.sapling";
-    Block saplingBlock = GameRegistry.findBlock(mod, blockName);
-    if(saplingBlock != null) {
-      FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, GameRegistry.findBlock(mod, "rubberwood.log")));
-    }
-    
-  }
-
   private static void addIC2() {
     RubberTreeFarmerIC2 rtf = new RubberTreeFarmerIC2();
     if(rtf.isValid()) {
@@ -195,11 +183,6 @@ public final class FarmersRegistry {
     }
   }
 
-  private static void addStillHungry() {
-    String mod = "stillhungry";
-    addPickable(mod, "grapeBlock", "StillHungry_grapeSeed");
-  }
-
   private static void addExtraUtilities() {
     String mod = "ExtraUtilities";
     String name = "plant/ender_lilly";
@@ -219,36 +202,6 @@ public final class FarmersRegistry {
         GameRegistry.findBlock("Botany", "flower"), 
         GameRegistry.findBlock("Botania", "flower") ) );
   }
-
-  @SuppressWarnings("unchecked")
-  private static void addGrowableOres() {
-    String mod = "B0bGrowsOre";
-    if (!Loader.isModLoaded(mod)) {
-      return;
-    }
-    Pattern[] growableOres = { Pattern.compile("(.+)Reed"), Pattern.compile("oreGrowable(.+)") };
-
-    Iterator<Block> blockIter = Block.blockRegistry.iterator();
-    while (blockIter.hasNext()) {
-      Block block = blockIter.next();
-      String name = Block.blockRegistry.getNameForObject(block);
-      if (name != null && name.startsWith(mod)) {
-        for (Pattern blockPattern : growableOres) {
-          if (blockPattern.matcher(name).find()) {
-            FarmersCommune.joinCommune(new StemFarmer(block, new ItemStack(block)));
-          }
-        }
-      }
-    }
-  }
-
-  private static void addImmersiveEngineering() {
-    Block hemp = GameRegistry.findBlock("ImmersiveEngineering", "hemp");
-    Item hempSeed = GameRegistry.findItem("ImmersiveEngineering", "hemp");
-    if (hemp != null && hempSeed != null) {
-      FarmersCommune.joinCommune(new StemFarmer(hemp, new ItemStack(hempSeed)));
-    }
-  }
   
   private FarmersRegistry() {
   }

src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java

@@ -0,0 +1,68 @@
+package crazypants.enderio.machine.farm.farmers;
+
+import com.enderio.core.common.util.BlockCoord;
+import cpw.mods.fml.common.registry.GameRegistry;
+import crazypants.enderio.Log;
+import crazypants.enderio.machine.farm.TileFarmStation;
+import forestry.api.arboriculture.EnumGermlingType;
+import forestry.api.arboriculture.ITree;
+import forestry.api.arboriculture.ITreeRoot;
+import forestry.api.genetics.AlleleManager;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class ForestryFarmer implements IFarmerJoe {
+    private ITreeRoot root;
+    private Item forestrySapling;
+
+    private ForestryFarmer(ITreeRoot root, Item forestrySapling) {
+        this.root = root;
+        this.forestrySapling = forestrySapling;
+    }
+
+    public static void init() {
+        ITreeRoot root = (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
+        Item forestrySapling = GameRegistry.findItem("Forestry", "sapling");
+        if (root != null && forestrySapling != null) {
+            FarmersCommune.joinCommune(new ForestryFarmer(root, forestrySapling));
+            Log.info("ForestryFarmer engaged.");
+        } else {
+            Log.info("ForestryFarmer borked.");
+        }
+    }
+
+    @Override
+    public boolean canPlant(ItemStack stack) {
+        return stack != null && stack.getItem() == forestrySapling && root.getType(stack) == EnumGermlingType.SAPLING;
+    }
+    
+    @Override
+    public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) {
+        ItemStack sapling = farm.getSeedTypeInSuppliesFor(bc);
+        ITree tree = root.getMember(sapling);
+        if (tree != null && tree.canStay(farm.getWorldObj(), bc.x, bc.y, bc.z)) {
+            farm.takeSeedFromSupplies(sapling, bc, false);
+            root.plantSapling(farm.getWorldObj(), tree, farm.getFakePlayer().getGameProfile(), bc.x, bc.y, bc.z);
+            return true;
+        }
+        return false;
+
+    }
+
+    @Override
+    public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) {
+        return false;
+    }
+    
+
+    @Override
+    public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) {
+        return null;
+    }
+
+
+
+
+
+}

src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java

@@ -128,25 +128,25 @@ public class RecipeConfig {
     for (RecipeGroup group : userConfig.getRecipeGroups().values()) {
       if(!group.enabled) {
         if(recipeGroups.remove(group.name) != null) {
-          Log.info("Disabled core recipe group " + group.name + " due to user config.");
+          Log.debug("Disabled core recipe group " + group.name + " due to user config.");
         }
       } else {
         RecipeGroup modifyGroup = recipeGroups.get(group.name);
         if(modifyGroup == null) {
-          Log.info("Added user defined recipe group " + group.name);
+          Log.debug("Added user defined recipe group " + group.name);
           modifyGroup = new RecipeGroup(group.name);
           recipeGroups.put(group.name, modifyGroup);
         }
         for (RecipeElement recipe : group.recipes.values()) {
           if(recipe.isValid()) {
             if(modifyGroup.recipes.containsKey(recipe.name)) {
-              Log.info("Replacing core recipe " + recipe.name + "  with user defined recipe.");
+              Log.debug("Replacing core recipe " + recipe.name + "  with user defined recipe.");
             } else {
-              Log.info("Added user defined recipe " + recipe.name);
+              Log.debug("Added user defined recipe " + recipe.name);
             }
             modifyGroup.addRecipe(recipe);
           } else {
-            Log.info("Removed recipe " + recipe.name + " due to user config.");
+            Log.debug("Removed recipe " + recipe.name + " due to user config.");
             modifyGroup.recipes.remove(recipe.name);
           }
         }

src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java

@@ -32,15 +32,15 @@ import crazypants.enderio.xp.XpUtil;
 public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess {
 
   public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF;
-  private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2,
+  private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0,POWER_PER_TICK_ONE * 2,
       Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE);
 
   public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF;
-  private static final BasicCapacitor CAP_TWO = new BasicCapacitor(POWER_PER_TICK_TWO * 2,
+  private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,POWER_PER_TICK_TWO * 2,
       Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO);
 
   public static final int  POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF;
-  private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2,
+  private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2,
       Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE);
 
   private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel));

src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java

@@ -48,7 +48,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
   private final SetMultimap<ChannelType, Channel> sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
   private final SetMultimap<ChannelType, Channel> recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
 
-  private ICapacitor capacitor = new BasicCapacitor(Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF);
+  private final ICapacitor capacitor = new BasicCapacitor(0, Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF);
   private boolean sendChannelsDirty = false;
   private boolean recieveChannelsDirty = false;
   private boolean registered = false;
@@ -69,7 +69,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
 
   public TileTransceiver() {
     super(new SlotDefinition(8, 8, 0));
-
     currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF);
     railController = new EnderRailController(this);
 
@@ -161,6 +160,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
     return hasPower();
   }
 
+
   @Override
   public ICapacitor getCapacitor() {
     return capacitor;
@@ -260,7 +260,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
 
   static void readChannels(NBTTagCompound nbtRoot, SetMultimap<ChannelType, Channel> channels, String key) {
     channels.clear();
-    
+
     if(!nbtRoot.hasKey(key)) {
       return;
     }

src/main/java/crazypants/enderio/material/BlockFusedQuartz.java

@@ -118,7 +118,7 @@ public class BlockFusedQuartz extends BlockEio {
     int meta = world.getBlockMetadata(x, y, z);
     Type type = Type.byMeta(meta);
     if (type.blastResistance) {
-      return 2000;
+      return 20;
     } else {
       return super.getExplosionResistance(par1Entity);
     }

src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java

@@ -36,6 +36,7 @@ public class NEIEnderIOConfig implements IConfigureNEI {
     API.registerGuiOverlayHandler(GuiInventoryPanel.class, new InventoryPanelNEIOverlayHandler(), "crafting");
 
     API.hideItem(new ItemStack(EnderIO.blockConduitFacade));
+    API.hideItem(new ItemStack(EnderIO.blockLightNode));
     API.hideItem(new ItemStack(EnderIO.itemEnderface));
     API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedCarpet)));
     API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedSlab)));

src/main/java/crazypants/enderio/power/BasicCapacitor.java

@@ -22,8 +22,8 @@ public class BasicCapacitor implements ICapacitor {
     this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO);
   }
 
-  public BasicCapacitor(int tier, int maxEnergyIn, int maxEnergyStored, int maxEnergyOut) {
-    configure(tier, maxEnergyIn, maxEnergyStored, maxEnergyOut);
+  public BasicCapacitor(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) {
+    configure(tier, maxEnergyReceived, maxEnergyStored, maxEnergyExtracted);
   }
 
 

src/main/java/crazypants/enderio/trigger/TriggerEnderIO.java

@@ -1,124 +0,0 @@
-package crazypants.enderio.trigger;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.gates.ActionManager;
-import buildcraft.api.gates.ITrigger;
-import buildcraft.api.gates.ITriggerParameter;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.machine.power.TileCapacitorBank;
-
-public class TriggerEnderIO implements ITrigger {
-
-  public static IIcon[] triggerIcons = new IIcon[5];
-  public static String[] descriptions = new String[] { "Capacitor Bank has no energy stored", "Capacitor Bank has energy stored",
-      "Capacitor Bank is full with energy", "Capacitor Bank is charging items", "Capacitor Bank finished charging items" };
-
-  public String uniqueTag;
-
-  public int triggerID;
-
-  public TriggerEnderIO(String uniqueTag, int triggerID) {
-    this.uniqueTag = uniqueTag;
-    this.triggerID = triggerID;
-    ActionManager.registerTrigger(this);
-  }
-
-  @Override
-  public String getDescription() {
-    return descriptions[triggerID];
-  }
-
-  //@Override
-  public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) {
-    if(tile instanceof TileCapacitorBank) {
-      TileCapacitorBank capacitorBank = (TileCapacitorBank) tile;
-
-      if(triggerID == 0) {
-        return capacitorBank.getEnergyStored() == 0;
-      }
-      if(triggerID == 1) {
-        return capacitorBank.getEnergyStored() != 0;
-      }
-      if(triggerID == 2) {
-        return capacitorBank.getMaxEnergyStored() - capacitorBank.getEnergyStored() < 5;
-      }
-      if(triggerID == 3 || triggerID == 4) {
-        ItemStack[] items = new ItemStack[capacitorBank.getSizeInventory()];
-        for (int i = 0; i < items.length; i++) {
-          items[i] = capacitorBank.getStackInSlot(i);
-        }
-        boolean capacitorBankEmpty = true;
-        for (int i = 0; i < items.length; i++) {
-          if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
-            capacitorBankEmpty = false;
-          }
-        }
-        if(capacitorBankEmpty) {
-          return false;
-        }
-        boolean hasUnchargedItems = false;
-        for (int i = 0; i < items.length; i++) {
-          if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
-            IChargeableItem item = (IChargeableItem) items[i].getItem();
-            if(item.getEnergyStored(items[i]) < item.getMaxEnergyStored(items[i])) {
-              hasUnchargedItems = true;
-            }
-          }
-        }
-        if(hasUnchargedItems && triggerID == 3) {
-          return true;
-        }
-        if(!hasUnchargedItems && triggerID == 4) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  @Override
-  @SideOnly(Side.CLIENT)
-  public IIcon getIcon() {
-    return triggerIcons[triggerID];
-  }
-
-  @Override
-  @SideOnly(Side.CLIENT)
-  public void registerIcons(IIconRegister iconRegistry) {
-    triggerIcons[0] = iconRegistry.registerIcon("enderio:triggers/noEnergy");
-    triggerIcons[1] = iconRegistry.registerIcon("enderio:triggers/hasEnergy");
-    triggerIcons[2] = iconRegistry.registerIcon("enderio:triggers/fullEnergy");
-    triggerIcons[3] = iconRegistry.registerIcon("enderio:triggers/charging");
-    triggerIcons[4] = iconRegistry.registerIcon("enderio:triggers/chargingDone");
-  }
-
-//  @Override
-//  public int getLegacyId() {
-//    return 0;
-//  }
-
-  @Override
-  public String getUniqueTag() {
-    return this.uniqueTag;
-  }
-
-  @Override
-  public boolean hasParameter() {
-    return false;
-  }
-
-  @Override
-  public ITriggerParameter createParameter() {
-    return null;
-  }
-
-  @Override
-  public boolean requiresParameter() {
-    return false;
-  }
-}

src/main/java/crazypants/enderio/trigger/TriggerProviderEIO.java

@@ -1,39 +0,0 @@
-package crazypants.enderio.trigger;
-
-import java.util.LinkedList;
-
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import buildcraft.api.gates.IOverrideDefaultTriggers;
-import buildcraft.api.gates.ITrigger;
-import buildcraft.api.gates.ITriggerProvider;
-import buildcraft.api.transport.IPipeTile;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.machine.power.TileCapacitorBank;
-
-public class TriggerProviderEIO implements ITriggerProvider {
-	
-	@Override
-	public LinkedList<ITrigger> getNeighborTriggers(Block block, TileEntity tile) {
-		if (tile instanceof IOverrideDefaultTriggers) {
-			return ((IOverrideDefaultTriggers) tile).getTriggers();
-		}
-		
-		LinkedList<ITrigger> triggers = new LinkedList<ITrigger>();
-				
-		if (tile instanceof TileCapacitorBank) {
-			triggers.add(EnderIO.triggerNoEnergy);
-			triggers.add(EnderIO.triggerHasEnergy);
-			triggers.add(EnderIO.triggerFullEnergy);
-			triggers.add(EnderIO.triggerIsCharging);
-			triggers.add(EnderIO.triggerFinishedCharging);
-		}
-		
-		return triggers;
-	}
-
-  @Override
-  public LinkedList<ITrigger> getPipeTriggers(IPipeTile pipe) {
-    return null;
-  }
-}