From 31fbf5ee14a815d6911bf270c4b69308deef3f52 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 18 Jan 2014 11:41:41 -0500 Subject: [PATCH] Added clay recipe, thanks @VapourDrive! --- common/mekanism/common/Mekanism.java | 4 ++++ .../assets/mekanism/infuse/Infusions.png | Bin 3309 -> 3583 bytes resources/assets/mekanism/lang/en_US.lang | 1 + 3 files changed, 5 insertions(+) diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 581dd1ec5..8c9f42644 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -685,6 +685,7 @@ public class Mekanism RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Item.ingotIron)), new ItemStack(EnrichedIron)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Item.ingotIron)), new ItemStack(EnrichedAlloy)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Block.dirt)), new ItemStack(Block.blockClay)); if(InfuseRegistry.contains("BIO")) { @@ -707,6 +708,8 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100)); InfuseRegistry.registerInfuseObject(new ItemStack(Item.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100)); + InfuseRegistry.registerInfuseObject(new ItemStack(Block.mushroomRed), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Block.mushroomBrown), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); } /** @@ -1082,6 +1085,7 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("TIN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 4, 0).setUnlocalizedName("infuse.tin")); InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 8, 0).setUnlocalizedName("infuse.diamond")); InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 16, 0).setUnlocalizedName("infuse.redstone")); + InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 20, 0).setUnlocalizedName("infuse.fungi")); } @EventHandler diff --git a/resources/assets/mekanism/infuse/Infusions.png b/resources/assets/mekanism/infuse/Infusions.png index 6584e6a3e95353905c8478fbc472c56ed11e4aff..b390751d5e65f7403dfbb91d9eb55b7a8430e11b 100644 GIT binary patch delta 1593 zcmXw3dsvHm9Dnz2tJX#D=^~S~O4R8}_tM#`V%?tZ;~|%hORcLy7h>;LqSN!VWQo&C zt4Py97?oI~vJQXsf{>^peP)?U$I-_{ zvE}uda*uj?pHuM1s)4>I5>4to!6&NAU9?jZZR<#QEEGsz*C9a`FyD_Y4^|0Pvtx-( zE_SIt+2b8UGgA*&?@OqlI^VhwWQGHcNk*Ei_o|7rcqyc@LYioHFV@^VGm! zDf_~KH}DZpV6}&G=id1t^6JtmT<0`39;b~1Gj%Y$zLHzqrLi~v`ja?vWT6ag8y&1n zULVeatuZvp9w1Bc-M-kN#Wq(P+M(Jp;b-mtL=PnFQ4bAR&j#9VkigdbyVK|q+pePz z%))$eAbMO(KNS2hTvX;NAk62o-vH@y6BphtaSJqir^7Cm292TRxY)!PgN9(fCtzPm^%+23 z`brDL8>sz*-ltB@w=L)mt~(CXFER8)Mpl{>(n@hDTxsl;~M+_Vii1#AZGJE1^Iqodj_hq?Uk6o$e zi8m8v%$hq8N11{HnBx%Uc!m>P#&yY!C50^tvd0AzD#W#UaHiUxNn+s?`rK%w>s=!f zt7#O%S`TjeUqQe}gqJCLVWNB&J{7{I7e^&%K@8)T^QpPbDKFhb8lKFXS1(9XetqjI zz9`;r?m$R_Y)<1kSH->3>6H>0rU4_kZbAw-lBVWMhVAj3D${nL#e;gR8~?mX1<#u^ zu*PYtXA|0UPmuGHiU(t98bvxRe+l!#c9!=V7QB_8qk$>?6xigcSIA?#CveQp0ae^X zjs`oKVQx6EFARI2oT!xW2DjMi5BKZc-famFClQPA;*uTbctghffz~%*92W1-bSJco z?10NF8SR#aP1PKCFjLED8@@12GQhG$4rP7I8lI8lZzMLn)qAD`ekT+q02z9ecwpcJ z>w3Nfoxe`p{hu5_c~_~D>c;i|F*owNw0y3vL%vuv2+bloBh)VP$>&DO90S`EeUj)~(f}&>DHc zQan#0Jz0(w=gn(=LeBG#-A4-W_!w*&uvhf^;7Qt@I-qCXly@(B;70+xz z#KcBKws8crLb#fU@=NE@{LXLfw8Pma4q8WCfm(Cw)lUxgmppWTh*xeFxASMquRbE-@!Vk& dXVLs}<%%Lk^}CJv5h#G2ptWHE7yaV${slpm)U*Hq delta 1322 zcmV+_1=afh8|@jeQv`nqgh@m}RCodH-A{;BRTu#9qo@!GErRf0TGOJINre?sPPhny z64F)MtX4ruNZ~RN2@7hWW{VJ7$e2nHNCj3TB?f^m62xaS(jSfC8QCmm#A&`eGf&<1 zwR-2>-&xFi_xaw;`F{7l&vWnn?zszwhli)jT$`AfC_DCkFu#9T&YnI~{#^fDZ+X0P zt{gu2czOHfSIUlkd&|_t>9Xg`-anU_#q!p4S#aYO&j=9cXMsi0x%lEo>vp@%V|?+W zjdeQZw)LgN7eCsS(F^676&uR-9ec`_C6APYS5Gys#}_}^<=F>62@t46U}3hOpa1rC z8R{%ABa^dV{_KC}y`KPq{t-wgfavppGfqC0D-hXIsv@)>1qdx=)yJ&QX0D+W1IswFQzqV+$U?}yMyqN%jz7t3%fT#rA{oSGF zIDpfDeYZY!h(JmpodBW|Fv@^60tD(8NGE{1zggCl0mp&BH=f>Hzkmn`v{)cr2k_7X ztIDcnE6aalE7q2s$M%PplX410*F%JC-Isrr}aP0rb#XuSX0(A?dj{!s}@IC*mX-)-R@69DtH-g?1XsbYa1Q1Za z+&=15U|Y8saSxP0IswGB0MRZj^WXnKZ3%*Dr9gi=0mQWcvHu^Fg1otLYb((NO<+(2 z(g`2}|9knhW?sOZUpW;xC>w$}+9{Ae2pCKsjvQ?!1Suv2Y3EiW>VXkRj{xE{U|b6@ zUkflW5&|L6LV@%MAWj2LP0kzuJlR4mArlxdf%FI`XJ!NC;w=!1&B#OGy(+b7Dy+67y(3k@TsA?BiDNZ1oCqN#t0y)0B6qx5F|jL zW`XnwAZ7#_nLK4u(3;n}z7v=eNGE`p5hz+z1ey_OPSFE_N(IshAZ`vCEp`FS2-JU2 z_(7mrfph}6Z}FW?u`?K;V9o$Fk$3G@Wg2_QZhmjcJEK%Hq90`(+4AyA<}IswF-fKdllP z-EQxdv!~CLu}-JAJl;81u8dyjEyq0p4*xtmA7GpYoLMZ=K##{00t5&UAV9Nc3V;KX gkO~VK_zwdA0!X$i1js2G=l}o!07*qoM6N<$f<&E7i~s-t diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index bc48d84c0..a5986c49c 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -91,6 +91,7 @@ infuse.carbon=Carbon infuse.tin=Tin infuse.diamond=Diamond infuse.redstone=Redstone +infuse.fungi=Fungi //Ore Block tile.OreBlock.OsmiumOre.name=Osmium Ore