From 1b610403b35657efc599d75fb267b6531852d8f9 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Sun, 5 Apr 2020 23:46:19 +0200 Subject: [PATCH 1/2] Update localization, add filter recipes --- gradle.properties | 2 +- resources/assets/enderio/lang/en_US.lang | 16 +++++++++++++++- .../enderio/conduit/ConduitRecipes.java | 7 +++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26901b86..34ffc9c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.7.10 forge_version=10.13.4.1448-1.7.10 forgeDep_version=10.13.4.1448 -mod_version=2.3.0.432_beta +mod_version=2.3.0.500_beta #Comment out this line to get rid of the appendix #mod_appendix=beta diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 2f88b928..b618c0e7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -841,9 +841,13 @@ 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 @@ -855,18 +859,28 @@ 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 diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 17be6df0..a1835185 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -55,6 +55,7 @@ public class ConduitRecipes { String binder = CONDUIT_BINDER.oreDict; ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal()); //Recipes addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder); @@ -167,6 +168,12 @@ public class ConduitRecipes { ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone"); + ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0); + addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian"); + + ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1); + addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot()); + ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0); addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench); From 3d40b4aae92197f302475edffa7b564594691a91 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Fri, 17 Apr 2020 00:37:51 +0200 Subject: [PATCH 2/2] Added Stellar Armor Textures --- .../textures/models/armor/stellar_layer_1.png | Bin 0 -> 1313 bytes .../textures/models/armor/stellar_layer_2.png | Bin 0 -> 1199 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/assets/enderio/textures/models/armor/stellar_layer_1.png create mode 100644 resources/assets/enderio/textures/models/armor/stellar_layer_2.png diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_1.png b/resources/assets/enderio/textures/models/armor/stellar_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7dcac9f4d261adf431c6c627c310f1dcb85b01e5 GIT binary patch literal 1313 zcmV++1>X9JP)N2bZe?^J zG%heMGBNQWX_Wu~1fEGmK~!i%-Iz~noK+OY-%Y-YWGlglbRmwVm13zHYgfo85;QU z-h0nE_r1?^@12>pT3%ir%fVAG6?o*pzVc(YYtYvC+}vDRH!YM>#*!9!yaBg1HVkjT z;d8GWv94`=r^!Tn(jpIHg+BoTkvDGMY>3Uqc8g53CoS?ww02);{DC(>g8v?r1{#-G z`0mOTL;VNB0Ds)I>wXN87~;idW4lEr+LIP}5ZU%2$a8jf)&$48X%G*YXir+?kyv*A z_ue&wwl^TFn-((Bo@(x?y(Z?##Umz6I~+my)vNCrw6h#)nS;5QlernE4gGufO7HI7 zx=$=y^mdYo_S6PQyq+?Gc<)ZvgqN~r$OH*gzMq3RiEDnw5w9G@vqf(wUTlULuzus) z6c)MvWiMsX6hsOQ;pBaqF0G@zwP+u`}Ri}A0?`C9+ z-cE)u8B3)PHegqQb}4_=B4=i13<+0X1`Gy&mftqMFW0(X8?-&dGl4QuLM3`I#NW7n8Ql|0*2*1!c zv5#f7ld|guWJR9Gk1P~VmgA8rA6&ZBU{bTPIXzDtJ6z92`=LFLHi-F|XipEhw66B&qR9~$r*?~{?>V8 z5(5zW+#9F=lg9@qF+{Rhi3jy3H30FLAkjQAVQNl5n*qcSIgVHt+3_o|8K1ANHtx7U zuqVc;QLPsL@V<_rel{;0J%83{>wBW$NGfV8_=S&NxK_SgTP?@lJXbG*Hewj3?}c)d zdG`8uhChz_Mz4Rnj=g{JqM>{L>B>rNP=uJShw8l8j8xQC(931OM<0)V2H*bUR};>U zB*bf62Ka?Pc5uH5*Uw|xj1fbGM9BcXOEJyq4dA&W2E;2seV_ z)&_atuK~NQBd*VY?D(sW#j@M#>jWsq4g+m(qUQ7cm>&g4s+HlLSz1~$5TwOPoW?W` zG6{GI_(gD!x%V+WJ0ULfdGZ0EtE{Z3M)4L@xyi;N>!5 zoOoa74W_L;pHCa1%m)(g`!Rp`mkJkE=fxMwp;IRcPvA$(>380)`!OEd@pJ&j@ikb= z4?}*kw#JpCy3Ig@j`XAk`268tDqK|0zIM|7D~qRuc@U|%a-V)>(V(s4_J6@n#nZru}w?TbBmf>@<=Qy%C+Ulad$QS literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_2.png b/resources/assets/enderio/textures/models/armor/stellar_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..244dc233f93af8a2d67712703d75f7a5b1570d50 GIT binary patch literal 1199 zcmV;g1W@~lP)N2bZe?^J zG%heMGBNQWX_Wu~1T0BJK~!i%-IrfWl|c~3&*$+<2+0efK#S8qq|_`+N~9Ex`WoK! z3A~6*Boi$Zj+vO2f55yb3`|fgH8TxMw3{H=e1@KvdH2jYM{CKG7e97(W_Hg!v-`fj zCi?sPvr^tr@4(TsNjJB!Ai$=-sHn(XmoGTyvSKdM=mxB=uM4^X)pwc&e_ba3zs3@+ zF&AkdmgpNmAaZGCB_`JL9Tb*mjk!oe(L8-Z|DkUH1^?V}G3cjQ@OEZK;QUZDKwo#B zy7oaN8luHozJtONtuYsAATrZS5Mx0>fe7~3<%4)&iPo5lG!%=I|FSVJz}5}0*5wP9 zXicK%^hptOqV}=~;|cpf`0VUm0k)Ncwb%oDVNdK0KWy-AYs+nHZboy&tfE6=iPl67 zpm>gK1mYWC7eu&ouLL%M0-3M(z@CV6fA}GuIgDFHheV6DkOnL+O`D*|Q+2g60^R`5 z8MD>`Ho%I3yl4PVb@k(8VSD?z03Ss%nZh||1CYyg+=u(-!YVo>yFZeZ1Yd06{o)$| zwsSxB+<={(@9y*ZJ2$^DCBW7oZh=^Faj{u=C|GMIVt?m}eoi5>tgI|?@phBg05*JV z0H1qnuUs5>19++$6vh`B8{mV@*#L^yd+e3Gya7ZP>Tj%L*4n*t;0;KnQZbU(ueun? zWLi!(kPm8VYGTm8-~FtjLz4D`5RFs)n+Eve$$!&;W7QR|qPgLZ8ej?cvDRh6Dmo-- zKZwuR==3u*AX`%qvxH*KnD*zwDmo;wm)V7;o9;nJhkG_OB=+d&sEmFN;;DfFu^Ss3 zBXJsEh#$uqt}QGq6kkb6i2xfu#H^x2l6WyT<{tO3)76*=3otLk*(o2=DYIhD`!_OEB^_xKPI6=vdmfVUA#4kqW$xa;V?4|$! N002ovPDHLkV1fXNC^P^7 literal 0 HcmV?d00001