bump version

Merge remote-tracking branch 'Zoko/master'
Fixed Transceiver crash
2026-11-15 17:45:08 +00:00 · 2020-04-18 23:40:47 +02:00 · 2020-04-18 23:40:09 +02:00 · 2020-04-18 23:27:46 +02:00 · 2020-04-17 11:25:35 +02:00 · 2020-04-17 11:23:56 +02:00
266 changed files with 4198 additions and 741 deletions
@@ -27,6 +27,14 @@
 ## gedit
 *~

+## minecraft files
+/asm
+/config
+/saves
+/logs
+/crash-reports
+
 ## translation reports
 resources/assets/enderio/lang/*.lang.txt
 *.bat
+libs/
@@ -49,11 +49,10 @@ repositories {
    mavenCentral()
    maven { url = "http://mobiusstrip.eu/maven" }
    maven { url = "http://chickenbones.net/maven/" }
-    maven { url = "http://dl.tsr.me/artifactory/libs-release-local" }
    maven { url = "http://maven.tterrag.com" }
    maven { url = "http://maven.ic2.player.to" }
    maven { url = "http://maven.cil.li/" }
-    mavenLocal()
+	maven { url = "https://gregtech.overminddl1.com/" }
 }

 dependencies {
@@ -1,8 +1,8 @@
 minecraft_version=1.7.10
-forge_version=10.13.4.1448-1.7.10
-forgeDep_version=10.13.4.1448
+forge_version=10.13.4.1614-1.7.10
+forgeDep_version=10.13.4.1614

-mod_version=2.3.0.433_beta
+mod_version=2.3.1.9_beta

 #Comment out this line to get rid of the appendix
 #mod_appendix=beta
@@ -11,12 +11,12 @@ buildcraft_version=6.1.5
 waila_version=1.5.10
 ccc_version=1.0.7.46
 ccl_version=1.1.3.138
-ae2_version=rv1-stable-1
+ae2_version=rv3-stable-24
 endercore_version=1.7.10-0.2.0.35_beta
 ee3_version=1.7.10-0.3.507
 forestry_version=forestry_1.7.10:3.6.2.19
 opencomputers_version=MC1.7.10-1.5.+

-toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,)
+toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,)

 curse_projectId=64578
@@ -1,6 +1,5 @@
-#Tue Aug 19 17:12:51 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
@@ -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
@@ -389,6 +389,75 @@
    </recipe>
  </recipeGroup>

+  <recipeGroup name="Endergy" >
+    <recipe name="Crude Steel" energyCost="5000" >
+      <input>
+        <itemStack oreDictionary="gravel" />
+        <itemStack oreDictionary="itemClay" />
+		<itemStack oreDictionary="cobblestone" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrudeSteel" number="1" exp="0.1" />
+      </output>
+    </recipe>
+    <recipe name="Crystalline Alloy" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotGold" />
+        <itemStack oreDictionary="itemPulsatingPowder" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrystallineAlloy" number="1" exp="0.5" />
+      </output>
+    </recipe>
+    <recipe name="Melodic Alloy" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="ingotEndSteel" />
+        <itemStack oreDictionary="pearlEnderEye" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotMelodicAlloy" number="1" exp="1" />
+      </output>
+    </recipe>
+    <recipe name="Stellar Alloy" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="itemNetherStar" />
+        <itemStack oreDictionary="ingotMelodicAlloy" />
+		<itemStack oreDictionary="itemClay" number="4" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotStellarAlloy" number="2" />
+      </output>
+    </recipe>
+    <recipe name="Crystalline Pink Slime" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="slimeballPink" number="2" />
+        <itemStack oreDictionary="itemPulsatingPowder" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrystallinePinkSlime" />
+      </output>
+    </recipe>
+    <recipe name="Energetic Silver" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotSilver" />
+        <itemStack oreDictionary="dustRedstone" />
+        <itemStack oreDictionary="dustGlowstone" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotEnergeticSilver" number="1" />
+      </output>
+    </recipe>
+    <recipe name="Vivid Alloy" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotEnergeticSilver" number="1" />
+        <itemStack oreDictionary="pearlEnder" number="1" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotVividAlloy" number="1" />
+      </output>
+    </recipe>
+  </recipeGroup>
+  
  <vanillaFurnaceRecipes enabled="true" />

 </AlloySmelterRecipes>
@@ -236,6 +236,38 @@
      <output>
        <itemStack oreDictionary="dustEnderPearl" number="1" />
      </output>
+    </recipe>
+	<recipe name="PulsatingCrystal" energyCost="1600" >
+      <input>
+        <itemStack oreDictionary="itemPulsatingCrystal" />
+      </input>
+      <output>
+        <itemStack oreDictionary="itemPulsatingPowder" number="1" />
+      </output>
+    </recipe>
+	    <recipe name="VibrantCrystal" energyCost="1600" >
+      <input>
+        <itemStack oreDictionary="itemVibrantCrystal" />
+      </input>
+      <output>
+        <itemStack oreDictionary="itemVibrantPowder" number="1" />
+      </output>
+    </recipe>
+	    <recipe name="Ender Crystal" energyCost="1600" >
+      <input>
+        <itemStack oreDictionary="itemEnderCrystal" />
+      </input>
+      <output>
+        <itemStack oreDictionary="itemEnderCrystalPowder" number="1" />
+      </output>
+    </recipe>
+	    <recipe name="PrescienceCrystal" energyCost="1600" >
+      <input>
+        <itemStack oreDictionary="itemPrecientCrystal" />
+      </input>
+      <output>
+        <itemStack oreDictionary="itemPrecientPowder" number="1" />
+      </output>
    </recipe>
  </recipeGroup>

@@ -2964,40 +2996,74 @@
      <itemStack oreDictionary="itemFlint" />
    </grindingBall>
 	
-    <grindingBall id="DarkSteelBall" grindingMultiplier="1.5" chanceMultiplier="2" powerMultiplier="0.7" durationRF="100000" >
+    <grindingBall id="DarkSteelBall2" grindingMultiplier="1.5" chanceMultiplier="2" powerMultiplier="0.7" durationRF="100000" >
      <itemStack oreDictionary="itemDarkGrindingBall" />
    </grindingBall>
 	
 	<grindingBall id="ElectricalSteelBall" grindingMultiplier="1.2" chanceMultiplier="1.65" powerMultiplier="0.8" durationRF="40000" >
-      <itemStack oreDictionary="itemElectricalGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="0" />
 	</grindingBall>

 	<grindingBall id="EnergeticAlloyBall" grindingMultiplier="1.6" chanceMultiplier="1.1" powerMultiplier="1.1" durationRF="80000" >
-      <itemStack oreDictionary="itemEnergeticGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="1" />
 	</grindingBall>

 	<grindingBall id="VibrantAlloyBall" grindingMultiplier="1.75" chanceMultiplier="1.35" powerMultiplier="1.35" durationRF="80000" >
-      <itemStack oreDictionary="itemVibrantGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="2" />
 	</grindingBall>

 	<grindingBall id="RedstoneAlloyBall" grindingMultiplier="1.00" chanceMultiplier="1.00" powerMultiplier="0.35" durationRF="30000" >
-      <itemStack oreDictionary="itemRedstoneGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="3" />
 	</grindingBall>

 	<grindingBall id="ConductiveIronBall" grindingMultiplier="1.35" chanceMultiplier="1.00" powerMultiplier="1.0" durationRF="40000" >
-      <itemStack oreDictionary="itemConductiveGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="4" />
 	</grindingBall>

 	<grindingBall id="PulsatingIronBall" grindingMultiplier="1.0" chanceMultiplier="1.85" powerMultiplier="1.0" durationRF="100000" >
-      <itemStack oreDictionary="itemPulsatingGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="5" />
 	</grindingBall>
+	
+	<grindingBall id="DarkSteelBall" grindingMultiplier="1.5" chanceMultiplier="2" powerMultiplier="0.7" durationRF="100000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="6" />
+    </grindingBall>

 	<grindingBall id="SoulariumBall" grindingMultiplier="1.2" chanceMultiplier="2.15" powerMultiplier="0.9" durationRF="80000" >
-      <itemStack oreDictionary="itemSoulariumGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="7" />
 	</grindingBall>

 	<grindingBall id="EndSteelBall" grindingMultiplier="1.4" chanceMultiplier="2.4" powerMultiplier="0.7" durationRF="75000" >
-      <itemStack oreDictionary="itemEndSteelGrindingBall" />
+      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="8" />
+	</grindingBall>
+	
+	<!-- Endergy Balls	!-->
+	
+	<grindingBall id="CrudeSteelBall" grindingMultiplier="1.2" chanceMultiplier="1.25" powerMultiplier="0.85" durationRF="24000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="0" />
+	</grindingBall>
+	
+	<grindingBall id="CrystallineAlloyBall" grindingMultiplier="1.8" chanceMultiplier="1.4" powerMultiplier="1.45" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="1" />
+	</grindingBall>
+	
+	<grindingBall id="MelodicAlloyBall" grindingMultiplier="2.0" chanceMultiplier="1.45" powerMultiplier="1.55" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="2" />
+	</grindingBall>
+	
+	<grindingBall id="StellarAlloyBall" grindingMultiplier="2.3" chanceMultiplier="2.25" powerMultiplier="2.2" durationRF="160000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="3" />
+	</grindingBall>
+	
+	<grindingBall id="CrystallinePinkSlimeBall" grindingMultiplier="1.75" chanceMultiplier="1.55" powerMultiplier="1.55" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="4" />
+	</grindingBall>
+	
+	<grindingBall id="EnergeticSilverBall" grindingMultiplier="1.6" chanceMultiplier="1.1" powerMultiplier="1.1" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="5" />
+	</grindingBall>
+	
+	<grindingBall id="VividAlloyBall" grindingMultiplier="1.75" chanceMultiplier="1.35" powerMultiplier="1.35" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="6" />
 	</grindingBall>

    <excludes>
@@ -61,6 +61,45 @@
      <output>
        <itemStack modID="EnderIO" itemName="itemFrankenSkull" itemMeta="3" />
      </output>
+    </recipe>
+	<recipe name="Skeletal Contractor" energyCost="20000" >
+      <input>
+        <itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="7" slot="0" />
+        <itemStack modID="minecraft" itemName="skull" itemMeta="0" slot="1" />
+        <itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="7" slot="2" />
+        <itemStack modID="minecraft" itemName="rotten_flesh" itemMeta="0" slot="3" />
+        <itemStack oreDictionary="itemSilicon" slot="4" />
+        <itemStack modID="minecraft" itemName="rotten_flesh" itemMeta="0" slot="5" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="itemFrankenSkull" itemMeta="5" />
+      </output>
+    </recipe>	
+	<recipe name="Guardian Diode" energyCost="20000" >
+      <input>
+        <itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="1" slot="0" />
+        <itemStack oreDictionary="gemDiamond" slot="1" />
+        <itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="1" slot="2" />
+        <itemStack modID="EnderIO" itemName="itemMaterial" itemMeta="5" slot="3" />
+        <itemStack oreDictionary="itemSilicon" slot="4" />
+        <itemStack modID="EnderIO" itemName="itemMaterial" itemMeta="5" slot="5" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="itemFrankenSkull" itemMeta="6" />
+      </output>
+    </recipe>
+		<recipe name="Totemic Capacitor" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="ingotSoularium" slot="0" />
+        <itemStack modID="minecraft" itemName="golden_apple" itemMeta="1" slot="1" />
+        <itemStack oreDictionary="ingotSoularium" slot="2" />
+        <itemStack oreDictionary="itemVibrantPowder" slot="3" />
+        <itemStack oreDictionary="capacitorCrystalline" slot="4" />
+        <itemStack oreDictionary="itemVibrantPowder" slot="5" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="itemBasicCapacitor" itemMeta="6" />
+      </output>
    </recipe>
  </recipeGroup>

@@ -127,6 +127,26 @@
      <output>
        <fluidStack name="cloud_seed_concentrated" />
      </output>
+    </recipe>
+	<recipe name="Ender Distillation" energyCost="15000">
+      <input>
+        <itemStack oreDictionary="itemPulsatingPowder" slot="0" multiplier="2" />
+        <itemStack oreDictionary="itemEnderCrystalPowder" slot="1" multiplier="2" />
+        <fluidStack name="nutrient_distillation" multiplier="1" />
+      </input>
+      <output>
+        <fluidStack name="ender_distillation" />
+      </output>
+    </recipe>
+	<recipe name="Vapor of Levity" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="itemPulsatingPowder" slot="0" multiplier="1" />
+        <itemStack oreDictionary="itemPrecientPowder" slot="1" multiplier="1" />
+        <fluidStack name="ender_distillation" multiplier="1" />
+      </input>
+      <output>
+        <fluidStack name="vapor_of_levity" />
+      </output>
    </recipe>
  </recipeGroup>

@@ -33,6 +33,19 @@ enderio.itemPowerConduit.name=Energy Conduit
 enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit
 enderio.itemPowerConduitEnder.name=Ender Energy Conduit

+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.itemRedstoneConduit.name=Redstone Conduit
 enderio.itemRedstoneConduitSwitch.name=Conduit Switch
 enderio.itemRedstoneConduitInsulated.name=Insulated Redstone Conduit
@@ -58,8 +71,9 @@ enderio.itemItemConduit.name=Item Conduit

 enderio.filterUpgradeBasic.name=Basic Item Filter
 enderio.filterUpgradeAdvanced.name=Advanced Item Filter
+enderio.filterUpgradeBig.name=Big Item Filter
+enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter
 enderio.itemConduitFilterUpgrade=Upgrade for item conduits
-
 enderio.itemConduitFilterUpgrade.configured=Configured
 enderio.itemConduitFilterUpgrade.clearConfigMethod=Place in crafting grid to clear
 enderio.itemConduitFilterUpgrade.clearConfigWarning=This will clear all stored filter settings!
@@ -127,6 +141,8 @@ enderio.conduitBinder.name=Conduit Binder
 enderio.binderComposite.name=Binder Composite
 enderio.phasedIronNugget.name=Pulsating Iron Nugget
 tile.blockDarkIronBars.name=Dark Iron Bars
+tile.blockSoulariumBars.name=Soularium Bars
+tile.blockEndSteelBars.name=End Steel Bars
 tile.blockEndermanSkull.name=Enderman Skull
 tile.blockEndermanSkull.base.name=Enderman Head
 tile.blockEndermanSkull.reanimated.name=Reanimated Enderman Head
@@ -173,6 +189,14 @@ 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
+
 fluid.eio.xpjuice=Liquid XP
 tile.fluid.eio.xpjuice.name=Liquid XP
 item.bucketXpjuice.name=XP Bucket
@@ -197,6 +221,7 @@ enderio.vibrantCrystal.name=Vibrant Crystal
 enderio.enderCrystal.name=Ender Crystal
 enderio.attractorCrystal.name=Enticing Crystal
 enderio.weatherCrystal.name=Weather Crystal
+
 enderio.darkGrindingBall.name=Dark Steel Ball
 enderio.electricalGrindingBall.name=Electrical Steel Ball
 enderio.energeticGrindingBall.name=Energetic Alloy Ball
@@ -206,10 +231,12 @@ enderio.conductiveGrindingBall.name=Conductive Iron Ball
 enderio.pulsatingGrindingBall.name=Pulsating Iron Ball
 enderio.soulariumGrindingBall.name=Soularium Ball
 enderio.endSteelGrindingBall.name=End Steel Ball
+
 enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball
 enderio.darkGrindingBall.tooltip.detailed.line2=Main Output
 enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output
 enderio.darkGrindingBall.tooltip.detailed.line4=Power Reduction
+enderio.darkSteelRod.name=Dark Steel Rod

 tile.blockReinforcedObsidian.name=Reinforced Obsidian
 tile.blockReinforcedObsidian.tooltip.common.line1=Wither Proof
@@ -240,6 +267,39 @@ enderio.soularium.name=Soularium
 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
+
+//Balls
+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.blockIngotStorage.name=Ingot Storage
 tile.enderio.electricalSteel.name=Electrical Steel Block
@@ -253,6 +313,14 @@ tile.enderio.darkSteel.name=Dark Steel Block
 tile.enderio.soularium.name=Soularium Block
 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
+
 //Powder / Ingot
 enderio.powderCoal.name=Coal Powder
 enderio.powderIron.name=Iron Powder
@@ -268,6 +336,13 @@ enderio.itemBasicCapacitor.name=Capacitor
 enderio.basicCapacitor.name=Basic Capacitor
 enderio.activatedCapacitor.name=Double-Layer Capacitor
 enderio.enderCapacitor.name=Octadic Capacitor
+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

 enderio.machine.tooltip.upgrade=Machine Upgrade
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Increases energy storage and
@@ -297,6 +372,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=speed and energy storage

 tile.blockSolarPanel.name=Photovoltaic Cell
 tile.blockSolarPanel.advanced.name=Advanced Photovoltaic Cell
+tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell
 tile.blockSolarPanel.tooltip.common.line1=Solar Power!
 tile.blockSolarPanel.tooltip.detailed.line1=Produces power during daylight hours
 tile.blockSolarPanel.tooltip.detailed.line2=Must have a clear line of sight to
@@ -426,6 +502,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=to generate power
 enderio.zombieGenerator.fuelTank=Nutrient Tank
 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
+
 tile.blockKillerJoe.name=Killer Joe
 tile.blockKillerJoe.tooltip.detailed.line1=Attacks nearby creatures when
 tile.blockKillerJoe.tooltip.detailed.line2=supplied with a sword and
@@ -712,6 +798,8 @@ skullZombieController.name=Z-Logic Controller
 skullZombieFrankenstien.name=Frank'N'Zombie
 skullEnderResonator.name=Ender Resonator 
 skullSentientEnder.name=Sentient Ender
+skullSkeletalContractor.name=Skeletal Contractor
+skullGuardianDiode.name=Guardian Diode

 item.itemSpawnEggEnderIO.name=Spawn

@@ -725,13 +813,41 @@ item.darkSteel_pickaxe.name=Dark Pick
 item.darkSteel_axe.name=Dark Axe
 item.darkSteel_shears.name=Dark Shears

+//End Steel
+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
+
+//Stellar
+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.effPowered=Efficiency when powered
 enderio.item.darkSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian
 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.darkSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
+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

@@ -739,12 +855,32 @@ enderio.item.darkSteel_sword.tooltip.line1=Increased skull and ender pearl drops
 enderio.item.darkSteel_sword.tooltip.line2=Endermen can't teleport once hit
 enderio.item.darkSteel_sword.tooltip.line3=+2 Damage when Powered

+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.darkSteel_armor.tooltip.line1=Diamond level protection
 enderio.item.darkSteel_armor.tooltip.line2=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.darkSteel_boots.tooltip.line1=Fall damage negated
 enderio.item.darkSteel_boots.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_one.name=Empowered
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Power: $P
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=$D% damage absorbed
@@ -765,6 +901,11 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=Power: $P
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=$D% damage absorbed
 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=by power

+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.travel.name=Travel
 enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Hold shift and R-Click to teleport or
 enderio.darksteel.upgrade.travel.tooltip.detailed.line2=activate a travel anchor or Ender IO
@@ -848,6 +989,9 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Generates power from
 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.
+
 //------GUI

 enderio.gui.simple.in=Max In:
@@ -0,0 +1,23 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 500
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		},
+  		{
+  			"index": 1,
+  			"time": 20
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		}
+  	]
+  }  
+}
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
Author	SHA1	Message	Date
DreamMasterXXL	364f833b55	bump version	2020-04-18 23:40:47 +02:00
DreamMasterXXL	36eaeeb615	Merge remote-tracking branch 'Zoko/master'	2020-04-18 23:40:09 +02:00
Zoko061602	49c17652cd	Fixed Transceiver crash	2020-04-18 23:27:46 +02:00
DreamMasterXXL	6abe5ea4a9	bump version	2020-04-17 11:25:35 +02:00
Martin Robertz	be44112161	Merge pull request #15 from Zoko061602/master Fixed basic ItemFilter	2020-04-17 11:23:56 +02:00
Zoko061602	88d90c2d07	Fixed basic ItemFilter	2020-04-17 00:52:36 +02:00
DreamMasterXXL	7da7525257	Merge remote-tracking branch 'Zoko/master' # Conflicts: # gradle.properties	2020-04-17 00:49:58 +02:00
Zoko061602	3d40b4aae9	Added Stellar Armor Textures	2020-04-17 00:37:51 +02:00
Zoko061602	1b610403b3	Update localization, add filter recipes	2020-04-05 23:46:19 +02:00
Dream-Master	7d239bd2ab	ore dicted Endsteel nugget	2020-04-05 23:28:51 +02:00
Dream-Master	d325af0a96	bump version	2020-04-05 22:46:36 +02:00
Dream-Master	4735800f6c	update tooltip in lang file for stellar tools and armor	2020-04-05 22:18:11 +02:00
Dream-Master	a0be2aac7f	rename crude steel to Clay Compound	2020-04-05 20:43:32 +02:00
Dream-Master	5716fb0d21	bump version	2020-04-05 19:36:39 +02:00
Martin Robertz	c64025e8ca	Merge pull request #14 from Zoko061602/master Capacitors, Conduits, Stellar Armor	2020-04-05 19:35:54 +02:00
Zoko061602	bc46a1f198	Capacitors, Conduits, Stellar Armor	2020-04-05 18:29:44 +02:00
Dream-Master	88c32a6a63	bump version	2020-04-02 14:17:27 +02:00
Martin Robertz	5a0728e920	Merge pull request #13 from Zoko061602/master Added Big Item Filter	2020-04-02 14:16:03 +02:00
Dream-Master	15d53aeea2	bump version	2020-04-02 14:14:48 +02:00
Zoko061602	4e9b00702a	Added Big Item Filter	2020-04-02 14:13:47 +02:00
Martin Robertz	d2d2190950	Merge pull request #12 from Zoko061602/master Fixed Conduit Filter	2020-04-02 13:48:39 +02:00
Zoko061602	0d00ff00cb	Fixed Conduit Filter	2020-04-02 13:43:51 +02:00
Dream-Master	9a5bdf55ca	update version	2020-03-14 13:04:55 +01:00
Martin Robertz	0a571dd576	Merge pull request #10 from Zoko061602/master Fixed Armor again	2020-03-14 13:03:22 +01:00
Zoko061602	30befc896c	Fixed Armor again	2020-03-14 13:01:08 +01:00
Dream-Master	bb0d7b9a5c	update gradle	2020-03-13 23:48:08 +01:00
Martin Robertz	81b1e8406a	Merge pull request #9 from Zoko061602/master Fixed Armor & new Conduit texture	2020-03-13 22:23:31 +01:00
Zoko061602	805ba22e52	Fixed Armor & new Conduit texture	2020-03-13 22:07:16 +01:00
Dream-Master	030a91397a	bump version	2020-03-12 22:05:37 +01:00
Dream-Master	be2a33caf6	bump version	2020-03-12 22:04:10 +01:00
Dream-Master	2286835f18	update gitignore	2020-03-12 22:02:06 +01:00
Martin Robertz	819c765b27	Merge pull request #8 from Zoko061602/master Fixed Upgrades	2020-03-12 21:59:25 +01:00
Zoko061602	ab0de22156	Fixed Upgrades	2020-03-12 21:51:15 +01:00
Dream-Master	a833d33948	bump version	2020-02-08 23:26:01 +01:00
Martin Robertz	8bf700dae1	Merge pull request #7 from Zoko061602/master EnderIO 1.12 stuff	2020-02-08 23:10:56 +01:00
Zoko061602	06d0749766	Fixed missing localization	2020-02-08 21:33:51 +01:00
Zoko061602	fb64552ca4	Added more 1.12 content - Added Generators - Added Fluids - made grindingBalls seperate Items - Added solar Panel 3	2020-02-08 03:20:54 +01:00
Zoko061602	548d8d3d17	Add EndSteel Armor - Added EndSteel Armor - Added Capacitor - Added Empowered 5	2020-02-05 01:25:27 +01:00
Dream-Master	7b02c75145	make gradle working	2020-02-03 23:45:14 +01:00
Dream-Master	91fe33272b	Revert "update gradle" This reverts commit `d1a124e2be`.	2020-02-03 23:24:01 +01:00
Dream-Master	d1a124e2be	update gradle	2020-02-03 23:20:59 +01:00