From 4f1dd6733c558f652595cf0243aaad42fb19a4bf Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 30 Oct 2014 12:50:09 +0800 Subject: [PATCH] Added new item 'Ender Resonator', made in Slice'N'Splice, used to make wireless chargers and dim. trans. 'Easy' recipe config option added to use old, cheaper recipe --- ReleaseNotes.txt | 2 ++ .../config/SliceAndSpliceRecipes_Core.xml | 14 ++++++++++ resources/assets/enderio/lang/en_US.lang | 3 +- .../textures/items/skullEnderResonator.png | Bin 0 -> 266 bytes .../crazypants/enderio/config/Config.java | 8 ++---- .../enderio/machine/MachineRecipes.java | 26 ++++++++++++------ .../enderio/material/FrankenSkull.java | 3 +- 7 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 resources/assets/enderio/textures/items/skullEnderResonator.png diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 9ee422d5..194372fc 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,6 +4,8 @@ Version 2.1.8 Changes - Added text labels to Travel Anchors and improved rendering and selection +- Added new item 'Ender Resonator', made in Slice'N'Splice, used to make wireless chargers and dim. trans. + 'Easy' recipe config option added to use old, cheaper recipe - Old transceiver now hidden in NEI / creative tab. Will be removed soon, convert existing blocks to new version by placing in the crafting grid - #1167 Improved NEI handlers (Tonius) diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index 5883aba0..39e2bce2 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -43,6 +43,20 @@ + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index affc8fd1..4ffb84b5 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -489,8 +489,9 @@ item.itemXpTransfer.tooltip.detailed.line3=Shift-R-Click to transfer levels to item.itemXpTransfer.tooltip.detailed.line4=the tank skullZombieElectrode.name=Zombie Electrode -skullZombieController.name=Zombie Controller +skullZombieController.name=Z-Logic Controller skullZombieFrankenstien.name=Frank'N'Zombie +skullEnderResonator.name=Ender Resonator item.itemSpawnEggEnderIO.name=Spawn diff --git a/resources/assets/enderio/textures/items/skullEnderResonator.png b/resources/assets/enderio/textures/items/skullEnderResonator.png new file mode 100644 index 0000000000000000000000000000000000000000..50ec3066dd8510e4e0a6e68d2c2e40b8ddafdf32 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvPG!T^vI!{F5c-J=i~E#*KP`-kym^HZ;F^HQ|3}t6hTYiJTHUA!*ST z73;s-3$C%9