From f6f8e02d6b013cf2c5c4e6b1d490fdb65b063443 Mon Sep 17 00:00:00 2001 From: KitsuShadow Date: Tue, 1 Sep 2015 22:32:34 -0400 Subject: [PATCH] OreDictionary and Recipe changes --- bin/com/kitsu/medievalcraft/Main.class | Bin 6767 -> 6767 bytes .../kitsu/medievalcraft/compat/ModDict.class | Bin 1308 -> 1597 bytes .../medievalcraft/crafting/ModCrafting.class | Bin 49791 -> 50089 bytes bin/mcmod.info | 2 +- .../java/com/kitsu/medievalcraft/Main.java | 2 +- .../kitsu/medievalcraft/compat/ModDict.java | 6 ++++++ .../medievalcraft/crafting/ModCrafting.java | 11 ++++++++++- src/main/resources/mcmod.info | 2 +- 8 files changed, 19 insertions(+), 4 deletions(-) diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index 7bf6378f56000ba51619d74a8be8639376e97f0e..7677b6146b74fc8e2b5d29da22c6fa3e16956636 100644 GIT binary patch delta 12 UcmaEF^4?^^Rz{1B+jdF<04b;i{r~^~ delta 12 UcmaEF^4?^^Rz|ap+jdF<04bgY`~Uy| diff --git a/bin/com/kitsu/medievalcraft/compat/ModDict.class b/bin/com/kitsu/medievalcraft/compat/ModDict.class index 5332af6ef8cd75a249e87feac2d0dd524d669b1a..8ffa318d09d4c25045b018dab0e416a0510d4781 100644 GIT binary patch delta 433 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 literal 49791 zcmdUY2V7Lg_W#t~1%?hHqKFL(A}UzH28tpU1O%~w3oNj(6e(g&Of)eXO^l}Z_!47c zsv1j7USiCPiAjv&r7_4bW!9Fbb)* zF0>{&tk5*QwAxnIjFDf1y{x9nW-V{RC~}HwZ)vtWk|tT3s+z5(4qGbl6htj#Tr zHjFYn@uWE`mEf$pW?QALF?C9vtvRXIUT1S+vNzjmld|9~bu>t1jrDRs|E30Oxy?0t zkfWux)YfQSq*Ykb${hAOd-G_FXrI0X&?}?9+-6207!7F8)O!x{N5Lpepl}q3ktt2d z^g}RTfjBamQB->c4)#YKP?!|aNgzKdqH}viB>STnr--fs`AZSq+AAW(AH_LE^b{xn znJ@~T0{Wh&)R-@Ahf&y+`ZBAdz}je+pH-zlq9_cM*<57@6AYNr9#u-yN%fgge~dbN zv2b3qwXDVu4L}3UC<&vEr?EkIM_R^diGWK>xjt!2%& zMuEnnaTu8)np$krD*%6=jJ|IEtuv;|DP{;XUQWVaO#Xu=s3A*A5UuqKZFN&@*5)c(qaVsfQ_W}!sKSHx(jE0>HPCMwnhy48t*>`r6myy` zN+nN{;!O2NGf#Yq#bwYFT>2Z8d@ zObC5zd3mm_%-#ULl;Tz2%HpYW+_dCeUQ+uONF@~tG)qn~tg_xwZfj#}**sgIIZB7J zxkTyEg64s(nwpxVGD`%SuQcRvDkrbG(b^yzN(CyD4FRxB)Y!^%p=*-`0a6+l7iU40 zKrC7mCpql`RZC8bG?V0$l@5Vwm0YcIs;#NYg6dVbMH1Npff^A6Nl00h)m~R?wL40x zY>rwRtedf?>04jl#z_}WwV)O$CQgZI6=;zZ6JdxctFkpUH#n@#HaX4`ftE^!FoVHi ztE`mskc0aTltudoZ zFzW5i9i6@c{-`#ROZe^mkYGPscdlXJP;xw zY!qmdlo|;0DulhoR$gdzIHcsOq~xnH>UuWGSu&!pl`37l$bzm1V)3HIQa3jWbdwy6 zf?OFjw+M8r9EUeG*Vln^SEJ1W{Y%ya=_98%!k#BR;0}Sd$j$)}L*SS>(jFGH6{N*U zzsW{-3$zX0qcfB=Ijp6C^fcSMsUQy+U}4Bc_X%{r9M!onC=LncL4mf*>VQUD1+3NO zS>TUy8aoAgNFw14)&?2=nP|5_dz2O>wwxA+^7w}Z+NS_FSsTFVD>YYsRG@#$`e2A- zdqab*JkQxKhkRV1{c=d*u-AgqfmU*@trm0uBeDqGGZXzspr>T#K%HTHOA{Dv0D4-W zXV4+(T(Czsf(M>HbKUFn6a%>Zb5ePWRnQ$4=miBz##gzu60(AH2kiG!JueFMk_6=^ z+e%77xJ2@bK(ERkYD;LfSsUu>CRyvit!3lu0=*#{gCGhT%j&I;OuGZtYYTb{hFr2_ zi3I$PK<`Q(lhlKZ@&V|5fj*E`Om>m}_L20rk3D#@KAF@ka5p*RQGt%hz5@Ef_M{E? znVjPiHODUm`ciSo46LPA)ZQXJn1bV73YOM5%prReVj`d(HCRMaFOVTa3b!RNn~mDQiy3s{(&4pWX=jg4_gPFzhdI zfI@Dsb66KUk^AF79Bjrx7=;>JYC3F8HftShs2EbV4t-|3Z=r!NbJnLKVdu-V~`uzTTXjQV)&tEb0V&Ph3!EgU0oXE`r( zg}u?1Uf(L`8Y^&DS?AYU-&muZ*McEW!;37q2Na;uOx#Q0c-2q3a-J3XW#c{q_mwj; z!4h9rBYhhu2;5(?3CY%EZFPl0CLSPgl5DV4Ktwky0R!+Lfd|VghwWQD0`NuminFB@kIJVo;OtA#}gkk!)!o-Wr-XSG^3 zCD<7P=Sps+;?jDMuo~wJJX4L{RPV5t>j8ob1y)G|Tq8K_&FK(;<&u52z;hIPE3DOx z8vANIPvBx%uND-wkV~b{7uYJ*7$%)2uNHQkbZcXy%`wGZZoy?R4f`V4ATzN|;0nnX zRAqHk

FN?^MZ3~QjHBD1~)R_6h@Mqr1sk88@AxK7}DSrgo7ZOwp7rE)!$8-N!G z+$h`3t`L?(HVfP$>sXW3(JY;|Rp3Q3c0Dbw6z%K2u7n1w*cY z$AdI{qrf-eo25_Mnq3#Ea#eCmTAi4kv%VE(yVxoXwOQbQN&LYrb+D_n)KyM#&O>_R z9RhEW&Jk*>ZD?McS6|Vb(b!UEhf6IBmTAP|#Y$m!3%pH=@GFBA6LvcXgl;CjSK#|( zt<3t=h6Z-4$gw#bHrRZ#@dE-sh_}NU0vcUtgUz?wY14H}JD?}9K%$?3A(IHl4}peH zH>(@FYlB;jcMH5n;twu!!Onuk308Xxei+bOOUvXW9})Ob$rP?8nNeR4xwbY<3G^|6 zAIJNZC)bsqnIpK3n+Kb@%#QE@fuEEjRX$zN*H8H%}W5itb9S>BW>8HSR3rHC%&ZSrIy531b$Vr1UO`qvF^Pt z@Efu|L>npBR_@9sv+-L3zbzYsAi`Cp)-MykEAV^D%F@yEV8?(p<^%A)QVaeF3fPA~ zf#n~3$l3t*a$e?T;$s4Ts=Pq%3$kaE?5Xb#p9}nj5(>Ni!o^dqWni1HU=DHCI14_m zCIf;`$eJ>lF5vG3R*8jkp8?Nm$hXVf5&tOgPg0U6aR_;)jgB%@c`P_@;8yVf<=+UlBB=ZMimTBHhm>=;I#9z)&rQ)vHLA4MhP*$5O zAt|-DG+9V6j6ZS8xbayt^YSOm%Ac7#L3R%nBuw&!tBo7(Q#7}+5Qz{ZQnm-kB{nNR zuK`kJ3xRt|7@{YWL<`bMHaqPh8=dwbodxM48$z6FZ-#71OLhm4u7bqry-MUgI=C+; z#dQ~?hinLzXk7J9Lk=Ll1W}ntfNU#is)8E|a-ku81nDdL1gaUxTW(s91VL0%;*3Mr z5Ca5J35gN|buK?4g9K4INf2ac&GofeFi4K`LW-maGDMCL;cRlw!<}K6Aj2g?h|xDs z$2U@tRN2_!^xg)`C_zR`mT;s06m_3#oKr1h1sNyXqfZynhATr5b+;zakTR)WsWnrO ziL$?%b5*@Q=PW@c%lcrWhn({u2oEwvkg3Y&o9vF7{Q8!%Dyi)0g5-GUF}7U{44IIUVnIq|mrxy- zw1j3wt01MS)xZENX?bqFTnk9KAU4@5lt|gn)lex&mFi|F!fBm>vRkzvH6B|B%hp;! z>O8g%lC2GbEb!QxEL)odX_l>FZ6=c^ome(66r@!)yBtpf)-A4(Ef!>nHwHDpGC`Jm zV^H|c7i5Ju1~t741z9N>I<$eP!;mm9669jZ;^w~6jWVoFwt@cS60+7z*0i~HawRBm z?L;n>SxT1swUc&>-Jh%{mz&9DAlJi4+uQ)q-5(WkyPC*9mgHmv*JJ8wFAKZ9Hg1ndKHiZuQb%#l>bpR95Dp{}34) zcL=gY#)cU#UYc9vouEvzRgk;9$Q&x$w+V8Om-b<@{XRkN_tHLGwm&Gyb}#KCWcyA* z9+K^D&Z_BjkaE`Df~b2wo*0x?9~MO2|MA42)cU9(>PC1=;TngHr4PL7w!+ zFhtJcDM1c;V^C^*Mvz0^7?d8L6Xbbs3`&tN2y(<5gVN+ng1qd7VX)HVtAf1djX`Ph z4ME=Y#-KF$wjl3#V^ErWPmuS$F(^%bD9A_N7?dVI5#*>h2BpbQ1^LVygVN*|f_&+X zL22@9L5_Q4P?|g;$hTe?l9eXE7vu+T3`&zf3G%Zy2Bpbg1W`AzJosd?(&TS~{O(PH z(&V3lB5w>*lavTby)j5lQZA^;8-vs&wFv6xjX`RX1_&y=F-T3)AVGt@Fr-LL(ojKF zBI!X7DN>U(LQs`SdSZ~8q)~!)^frXlB<&<r+Tfi<>9$eOChsgtxh;Y&^v`Q3Hwdb3 zOnPQf+TA3m%7s0%DD7S?s7i!AvZyVTUMHx^g*~$`Q3?+|p0SM4S%?QRuRrOBS9DD7?&RAtJZS(J9~6I3P3o>`Q39~4yO%br=3 zc6SP@Qf7}V&TVzKpekwh%%ZgWu%Ie!_RONR`>3EQarVrjwEMWADs}eEqO^NJP?bD; zW>MOGN>G(PduCDEeMV4~Kzn9U+I>z?l|p-FQQCb$P?bb`W>MOGNl=wWdt`BLwXX`Q z5^2vYO1p0es#0msEK0j?3#yW7*EJ>FXonk}Z7$a3-uj-PDx>b|+PB#c4}=7`8*y*si)uB zl=lzSlTluuopU~Clc^4;>Cb|ml#v{&9-@=Ccid6^D(ETM8s$Xgk>__o|ByVvt{Yx% z{TUJr%Qn}nJaACKnCk7iMd;q!B$(N)w+9YC!TcphsD8`ay}uAFP`0|zd*lfgEJX5z zHR<~67A~7Rx)k7%DN?Wwk}1gfc!GQXj)FzYrU+;MGZ|t8Q|HAYP4cF0v%SH+ zcdTGtW$zA}`p;zPCRlgL5+d)#SG6@C>nT_-xBi}3dJEP^^>30l`A-|apI`}Y{XMZH z3N}EpgqB*Ho8gRUkg2;bEL|{_REw(mW;=wg-Y`Khl}r1V zwKVGoFWGF8U|I4c$LxBRM#{(*Or^|0O=T_RY1Tv`Lr&4GQ%f=Ebti~y>0Uuo}+E^86Jvt`%IyaK!H#b1QLoshWyue9||tojY4;z zh<&I7P#t%m=zS;#s4hED>^>9+RQDaI$AiF3P%n7z06^rsKk9)ZP$G&&si+T{h~gCo zf&t)3W7jZAP-3X({dS|?h6srZL1)=TI2k}hU-%S_`e~i7oC8CIBhE-BtB~A_H0~;c zyT;(Ilicve<(nI~)!=S8jk{TL!vJpFH3s)WgBut<%68*kY;Y?iN;bTCmc7j2R`rTfb&HjCohl0f>$>Ue;@#*{mp#1c>@q_OS6FtV zD?`jq`&}akzfKMglqqDfHuw#4aMxfk_{~Q5+s>i;6-M{l4L#kd+W;sxt=?sD-}~QZ z_JF~?!;tMw54#NRy#}{JqAb=H$s-2$V}Qh^vnM2Oc;hYwfqtGe7!OL*nw;7Nku2=l zHk{8xld{Z}|9#U^h13Jwq*M=R+dzLu8$>LlT z-lJ?c`p^*j$?0N0Jtwid7;Pi=^V7wCb#7vLTd~Ja7kh3>*kx`j_FE~|WrZK4`F@gU z;ms6Mss+crZ6njo15ZM4S7+r@r=YXpCC?kW{@o3|^pbFlfHfQw_b9~d^eB`IywzpI z?dWYK51Wg&V?VAuj_tt$q-hgSQ2;==bV4J-aA;fScsVa`H;&kYqm*CZP7<5TgOvoi zKIpTMpxivz4MUf<7@QKqah#f7cXt`6O%#B{Hskj+#`oA8_jX5s`{`Q6YSVNfSNezO z@P-@@H2Nh&aBDhK0i|>Xb2oH`9%!qxdyU>hjo#sSgqm$Cj2n*O-4s&h@)|r!3UK-m zL?j+-2*{8EobeovGnIfzAfWBGhbPPaF5^T0sVbtIG-tp$hP*rjkX+WmxxlSlE4;Qq z;DR>u0UKz^0)`w&gCiZENg1vX(0jvf@4h)5QD9ul4XkUg8PZCmHJvdLj!UID&?_hh zNJG0A_Dpwq#=?s$jmfzB%Z2*v{b6$YY;vH#Yjae~vFv@CW~&YET0rY`4|F~PUvWrl?F&Aai1AP#W7mD#)AQkWOC->-bs`q|s+KpkOGWIQx`xM?KJtEM# z!^$WR$9tts+b(es9)_Ilc%O1med)yihR=RlH2QDHPr&B@SFDBz&*T2*|9)JV!vEKC zpZ>oe7lX3g#@&wZF}&`u94^3Jy)SxEudx_Ob(%GGTDIet;j^EXet>%S8R8*%`JctZ zR_{T)+6doq?OfsbedQV-%FuHHHHG7k<<8+;g8}7HZQD^jKhu}sFICU4p=UV$#yt%1 zx6-SOHT(xPZRZLvbMlupfhtgb2EU(@upR%(b`i7>#z@fi7#RiO1U6FFO4Q`sBNRUO zwEOnF-NdBr%LEedB^4xAE&|%(sboq6>89CEy1APM zglP+SJ9~l+^qy@J2~T78_BLkwdb*DZm;Ps;XQH<;+t<@IrZUz*@5XXvA1=?*16FF= zJzzoKE@LTy+SNrkR$6nn{$CVmgn|+{wEYOdHfKRN;(r!+8p5>p3j|A^1>uS01 z)7vl5c}K{#UO|lOR#uD0ByiP{ESha6*=mJSmD6M;kLIpQNz5=>^JS|k+SH~?p{z7V zo3$=L%+{8?XyzTY(;I<%-hW+4oU0(XQZ#SBy!mG?OolvDyXApdq}{buUoCWoJafC{ zkuq=cltC(_b}i9hJvS@aWu;%VUz)(V7SCCgtx-PjH* z`L|!*S*_&PZh2?7Qb4=q{TC~>NbQPf(Z(Q)WMyD!^#$#)Qc(Nloz+T#?Ur|TD+RY(o>wc;p&@s6nM8+%-q|H3GUR%+A~N)P zwA7hIt&%zqiw@HaA(xr3|2{N|hz!|7R_`L~+Nc~wM}}(E9+!zbJKrx6To4&*x>bX) z(bo|AyC5(f!c_(Ym0$kdT8OzTG6Y66KS<$q^PMBktwv@yk4y!Z_ zh92a(l}iu4!GIz|%x%Ns5gme&ocx`uL*#M=p^Zzzft*VXzQGXjOJoQb!F_dj!hqnD z$c$L1Ahb~f+?3SR;1dkt-)W`*pKz^EaD&pf80s`V7#N;4F!&@Y!oH9h)Y`~USR7V4 z^GLXH>QaMB=w(9bo6R$<*o6iB(}m^5e+o5V! z@!~rph3wV97*=}g9|HsVKjfRB8N*EPo(aY`W(vMVZT0{LAh~?z0|SiAKYeGW;4lr0 zp_z|$FiIi50~2(S+Wy;U=9mt~SY>>&@&}&Oz!;j5&vrO-5koV+0aK&4p*EWN>P#@s zJ1c+prL1^Q17mCk-<%1?H=BW&p@A{hneYB7Fab}how|*gel);nE3j|O6fjH!W0*-k zu;X%I4UBKhVe+*2Q$Pjty3wAP8^M`>(UxIxS+kTfj(X5g8=$!ij#U8-; z;_ae~>TcBl0!)05B5XimzxqHz7|@+2e3x*D*wAoI;~ zNaq3?P>*|%b=SctL&>b&H(j-`i;)1C4JDg?H#^jGZFkA4Ahi zM`J8N0}M1;q|fll0)(z{qS>IX%GWwmjX@sJXs~>8dA=$XM}}@k(Yt8MZ66(66@nu} zwxbC3X~$VkRq1dYc>AIb&Z4yAQ@2O$&gE2it8W`GjhxlAgaptKiovcG>U+!?O5Imf!(y6}2aK@=Bg-7yTmrw0G z$vamycsNz1@Er-?VmR|ul@|CIgNIX93Sai{sUAF>s?xaz2A@Qxhf`H5zov37r>f`b zlO4`DRi&jmg!XOh=L*5YsVcSk7{i&TsKBj-$Hh~E%=vjpq#5IJe;c1 zI$vWr^Hh~CFfjNeGS56!rOi47l}EP!@a0@>a^|TjZT+XPoO!BBmz;^kH_L{HQ&qa$ z0Ha+``XjI{9|CwJXNJD&jjNeGkG{wrSOLWT+5n|W68s*DqW+4Q3~;0V0$=K zrR#JshGu-S`*=82rSi*~|I?}Jxh{EuXP&B3Ot+1Fq^oT}2>|EbvabgF7R zVeMlN_IRplJZ#+-P5bZMpX>VP@l@4#{<sov>+eV7;Z)Ul)?4l9z60a&RMmLu+t+A3ovIoSfUEo3zSE7z zQ&r;;a9^YGbgF7R1a4T$Ckv3rQ&rp5TL+At#mnjHvMDO~-iJKPM!y^W3?|T!t-=4?=%9$HyENGQ4i*8-U(0nfOo>X6OOw|d=e~Ci3*M%JYsl@ zj20&zc-rSo_4ou&hno~0Z#wabr*??eFnH91PcTGYrM?*8Ia=Dc>78r9M#7hC;Auhk z#giD(;u{PRm#GKuy{N$_9vKm!Am|a|R0+JF5h3cT`fp#v!j~#MU>1)UeBzy9KfAs+ zs6V7g+;({_H}lPc8V0w))ptAfM-<(>^c=4U&oyL1-*;gF)40AHXGDyS#W$f7ny2=B z_iu@~@A)!z+J6Oqu8IkHN&}-?iJq1O`4G$q4UBFkPhfmwrr>+DuQ2Klwf=Ll6x>w< zqie=3n3O_%XQrTyY8wUzKD%aovI_)p4b0g!;}bA}i?nYIdeV$;Cf{6iiZ3-V`exvk z#p+;uvl)nD4UE3d{BsT*@S^suL62tAR$$+lDPX*o#&DJBgMJ{gbS=4?%(uY&w`p3^ z!MK~u$6(+vN`6zX&DV;I%T(Q)^}XCTZtb_)3Cqh`sKfFN8Vme!mD9h@=x#FK=6`O- zfM;KTe6loqItKKp8{eSu@a0N(G+J=^#&0|v1G=R;x)b|mJ@j-8=&l;giG72{(=nh& z-T1_9JRJjiM58ImH~!=47|^T9e3z$sItFxyr3IO9JjuhCE8R?|3?)_L8!(=Z0o_#N zYcw8?0o`@uTSIv|26WerkI{HI26Wer7U}K#a^<<+F7R{==&l7RwVO+0p{-zZR&?|ye z7Z$2lz)$|cPbRP^y`qz|qKjS;=d9?VSHwFj`sx+^ofS!X#b9T}5WQl!vqFCLRLzBr zc2>x5Vaf{i2^ELSEaB|3S=DT?~ma{S_tSo*vL3e<`y`T{kulV}0Aphg~x>UcNQ#1l|69}KT?sD)2Q3wa4@rEG-%S`Lwbv3%&bUWH$dI0KnppB-3Xp`wMyxu}rnm$8U znSOw}Q|KBqN7tGKygH)m%<<@Y^I)hOf^Ia|qFc_8AE71YJz33T#h7S2p zN6-7uMu+`v=mq}x`Y_-l^ijZf=wo3)?}`9)R79diM|ydqwmBQ@cI>f zA80{81olBc1`a{r1`bCj0~^sVfd|m3z{BXbz}L|4LE-4npjh~^*?3HY24NPIhI!CL zYzjIbn}d$vfM95s!gmgDe{!#Ef5zDzD4xJ(FoT?`{DZN zVB8R02BjS@h<4zn=ta0WdKGSoUXK?>Z^Et7pF;UHUKD)-FOB{UFY9E%%R7bQ^EyT0 z^E=f*xd5-|)Qm6ebUt3$=~BF^)0Oz5PS@j$I~|Ae2fVt|&v;D?#cN}N@ue{x@w%8; zygsH8%0>9Hn5B3_%*FVMn2mU2%nf)`%x(C}m>;1$g|CYF17F?QA79hC1HQI%SA1RP zUikXXi=jLp-_ZF&d{gJk@XejC$G3F;7rwRgUHG=nzvElGP`tT|3ID507{0wrEWV>l zZ@i^TBEGZB1yHWWTf3~qcXzoOZ|kxd-_vCqzPHPR_`X<_s0g|2V*%ki$*jd)M&O?YqYUHIWx_}Q)4J@}EX0`Kb@h9B)3i686Q4L{yB z5%2Fh6hF~54Ik*b0m`fKlU=XFPj$T=AME-7e!A;k{7l!!@S(VH{7hUlem1T%elD&L zem*V*AC4P^Ux>@VN8+x5@+SOZ+^zVfxO?!+aeMG9ar^PBaR>2h-D2>o-MZn|yY<9x zb{mM_>XwGz?lu9x(=8jn+wB%8@4)YM+loKvwgZ3I?J@jOx2N&P-Co3>bbB2i?Vf-? z={^V_>z;x??LG#7);$}4-aQ|G(S08NvU?f+s{3vzAH`pHe;j|){aJjX`|J4I?jPXq zx_^$p@BR(`p+^S(zDE}RvBwnrbB|g0WRG(EOOIOoYmbHaRF7r&w;o5Jd=3BJ<4ycW zkE8g{9^Vqw<5z-vQbKzA5!!Pelx2kVtRSYIjl|sZJYwm&n)vnHK>T}NO#*s;0p$rI zdVWuWdj3g*dj*h?UJ)d;R~Hi2s|N}1)e7Zu647e~>CkH(iRyJN>DcQw65Z==(y7-2 zBqpAbPVxSvb9^9)jgKZ><9m^~_yMF_{4mlzeiZ2ue+87+ke>0^llb^8q<8#w(kFf& z=^Otf=@);9B=n9Y{d)H#{d@N&19~Tuq~2r5z}}O{px!gc;NFEKx%W0GA0#QgcaovK zA1A|lKSzf5ewB>q{T>3x@x zoW2*48GSD$xqaV<@+isc`x(ja`vaNT50Qd?ex$Hp7@5_tBPr_VfU=Ry?$<)*_PdbG z>vtI`?sp9->31uc-){@C_WPC0Pe7zJfs*osU}8&%Ar%QdNo7JJsY*yD_Jq|?t|!$A z8%RyUO~jFK7pYCyPU;f&k@|!uNkhURvY>w~Y3SdRH1_XJn);`Z=KfVFTE+sWeo50Rz)pCHTnA12HDzfR8U{{cC_|1q*6aU?lEaV)tYF@vm3%pt21 z=aP#OZRFy_Inr9E67y?){v_QTu!bT@G+F1lWPZjMXn$43%MbQlN*zQ$W2L6%(JII3rw~`$LA0j&k?k5ioJVbU4e3|SX_$Jvi zD3R(8EwZPWBHvK%N+Mgd7<34ta9W zQSzTb$H`NJejo=2Pa;nZo<^P?JcAq>Tuh!FTuq)E+(e!qyo?+kd?9&Z@M}=MLyio7 zpS(EuEArCdljP-OOkPR$C$A=lkk^vSp{ypaC)biUlb4XUk}oE2Ctpt9Nxqi6n|w2Q zFZnwtPm=eOPmvE(Eaan<2=Z}C7xGC;JUN<@M2@8lA)ltKf%0-(ka82AnX-+1o$??# zp0b;qNZC)mO?jStm+~68Zs=Ch7Zf75yOgU-{GIpe#5_|3B!M;{YPZegb_1n;)r}YV8ncyG{Qj#j%cBSMl7X+ zN4x;#t2BAU8+6EsPw3DQC+M&dztG_${-h&D=F#CJi|ELab7|_xDw;O3nT{H{oQ@v3 zl8zbqI+X9yu_HgA=_9|Q86!{9@u`?jNHx>U)HzUE>BQ7>nw8o>C#No>*{K)NDXEvz zsj2Tnd6Z5|{fy?Meotql{z-GwEHp1Ih~}r2LRm#;rq$5Gv{pJRZ6z&ATSsT7ZKQM3 zjzReqotyRzEl&HDmW(pd`J;lVbyOrR9c72Io|cVjq~)W|qqb3NX~n2bv~tvSv})AX zP<~JCqkf{*qY14U9Yh_YqiF5uF0^j+0w`N){pclh!RU)=eVU-88O0y=q(%y?R_Ky=L4*dhNIzdfm7pdi}T(dc(LK zQ0}ESj(ddOJnm_F%eYtQt>fOMw~aeSH;?;@{wsYf-JG6DZ%@ynTheFJJJYRnYkD=k zE4_){oxYfEOMf29m+3v}uhIL`Kce@iAEytb|4bjuKy-VCiSEdl4dr~gGoy^|%BZKi zGnUdl8LQ~tjP>;4j7@Z3#-~tzO&`fPLI0ic8+~lNg+4w$l3T5W3PRx=O$NaLIpU&mr5Z(*G$Z)aU5?_;r(pJZJp zA7XLYv8-!$Pu4BFH|vp|%z9>zVZE{^vH0v6tao-H>yy0=$_H8B?47J%_I{R-{XFZR z{TfTmexD7$%j9~+(q_e?OrnBTJb6CohayDd2EgL$ei4B`_5X$G-@F_>w z$SLo#)G42{v?<@QQBzK_(Nh^4Gu5AsomvcKIU6^%lBG{=W*Jjgu<=vZunAK)vdpPB zu!&P|W0R)-2<0i3HT4gcJuQGunHI&SPK#sHruAjhrzNqRX)B>z!)8od$MU9K%krn) z&Sp-#mlaIg#R{iA!e&hmVTIE>u%hYFZ1(hcHfQ=^Hg|d|n>T$tE1o`?l}x`G%G=re z>36cy={s53^v7BG^kAw#*SVNolxt=e=LWJ%a--Oq+#YOgZhv-Z?qIeq z_hKm5vGuu^v&(a@XB%?2uq$%!XB%@LVw>{(*v7nIc4b}|yE?B6yC$zMyEbnyyDo1y zyFPCnlpEO%c~`NU^6p_b=j~y)vwQQOVfW>~!0w;fgWWf?FMD8Sf3|(*Ft%f62HQDv z3VUc~F55M83zYY;-81iJduQ%r56?Wv_RT!P9+~+Xd$gb*d!%3>`*%Syd%R#W+h0(? zo+v0`2MTQL$%4I5KF0o2@B}+p@D_Wz;23+R;2U_pLT?AzHE_TB7I_WkTA_QUKNC>O9FXE(E- zXRlxXlteUkk-hjKJ0nBzGeIhoUq(>c94o3j+k3pk&% ziks$K&dqaf;FdYJbH6$Fa{oCyc)(mU_n#Zc#oQ1cG&hC^&+W}a<__ecb4T#7xnp?v z+)Yqk$0O$6$UDs4%A@A)pW4_HdD0lE4^LFuG^Pb@G^A7Xg^IqqD=6%5X&O65Y6_4b7i^uYW;tZZx zJe?0Hp2L%h%lW|KT0W?_i4QJ52<7uUx%dblQv41dTKpLwR{Sj=Ui>Q`QG)o$l6)v< z^VE`gd{l{@k1lE9V@l5BV@p=^aV6_{ddY`Se#$dSzTgu|e&U()37Zn=HJF=%)gW8&OgOxSTWDDGCtE9!V9dOd7-rz zpJg4ui>xVpw)GMyFXMBpSMa&koA^BIUA)-3otIem@%h&M+*%sR=aOUkd~Ys$Zd@_W9v{3m{?jq-K2V7}hg zkzZ!(#xJ+^<{NBFp}c@!VOzyF*{6R_ zi*Kn+;9DyP@VhHV@@bq%sxtZRsw}>@s(?RSRm%5O)$m8En)#zuOZdO54nz40f2`_tzQ5`d z{zTOYexT|X{-mAo|JVcgQ}$4P&~AgWhCgkuArp)v^4Q>fZd->Vf>V>Y@Dg>a|dA;BQoK;%`;o!r!jm#^0&l z$=|Jhl)qPffWKc8#ow#x!at~q;~&-}@{ejp@Q-WK`6o5m{AkS#eyrvWD7W!XYwqKp z*X-k8)Ewkr)*Rtq)x62Su6dsycO>(#9V7TRjx>J4k;T7t%;euWiuw1BO8$eRmjCG3 z59LArlj9IS>3E(0;`o^V>iCMEa{S1DbDZM8*G}iZ)z0L9)Xp-YTAK;iE-;bWB_>+C z(!^@lnRx9+ld1L?lwYxnYky@I)mcm-b?K(ix@D%Yx?QI5x)Y{p_1HAMKFpL;-@`Pc zKE;$_3xQ$>c2EQ>c4~6 zALiPID05vy4|7dJyt$zv*}R}(B)l@sjSVH{riL1*t24JWEHy7|xDZ~KnOhs~G%sq{ z0d>2~OB#`9zLwM zo~!^U9=3VDi4_863fo=sEt>_DIU=%n6DtDB649^tJT@CBzlbr#b~Xnn|A=|T*=#OQ z0g?OWe$D0qB_fZ^eS;MP6&QJR?g3T;R8R*x_YO86sNkqsUGkWfm7@ng_+C1-U88!B z(W&P&s!x$l9n+}3O&Zk?>C|N!l@Oy-ccGBn|b^Q-(RN`En`dp(1v}#lm*QrgK zl!5(pYQNSxXqryFqfvvab?T%>C10#jDG{2Kl>0P)N!h9SOUm<_#)stS)XN$*v_Plc z(x_p@I`yGO4Y%pkXBsuap;IR`YGkucoz$q*WjghzMy0LPs8J@JTB}i`gLF#w&M}eN ze8=3TQDYNz>S2uy$Y<^|>Zx>I#jT7NxaLyIrHE57w#2 zH7ZBjlZa#?5QTwikiV@^2Nm)stj?sKdsx9St*)?Ir;cmXtOYvtqec}i(x}<`8a8{KRyQYDo8_DvG-_^do!Y5U^Tz3v z9;?N=c8fpLT1#3qYCh4a%Qec{S*PyOsM4W2^@2u~&DE(dG(DGJpw-!Q%(k1fx{3sy z+N)8OnL4F=aaE~SS9L;@Y+tQW)v;P@^)`*F8KF}LHOetlr#{xG+69^vWGhlWK~dhM+^l+DgSkF7AVG5#yQLX2URC`;Q#;t diff --git a/bin/mcmod.info b/bin/mcmod.info index 6d1fc51e..d2a5c657 100644 --- a/bin/mcmod.info +++ b/bin/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.6}", + "version": "{2.2.8}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index b9832c1a..06a01f38 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -55,7 +55,7 @@ public class Main { public static final String MODID = "kitsumedievalcraft"; public static final String MODNAME = "ForgeCraft"; - public static final String VERSION = "2.2.6"; + public static final String VERSION = "2.2.8"; public static SimpleNetworkWrapper sNet; diff --git a/src/main/java/com/kitsu/medievalcraft/compat/ModDict.java b/src/main/java/com/kitsu/medievalcraft/compat/ModDict.java index 2e224385..c4d264a3 100644 --- a/src/main/java/com/kitsu/medievalcraft/compat/ModDict.java +++ b/src/main/java/com/kitsu/medievalcraft/compat/ModDict.java @@ -1,5 +1,6 @@ package com.kitsu.medievalcraft.compat; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -23,6 +24,11 @@ public class ModDict { OreDictionary.registerOre("pulpWood", new ItemStack(ModItems.woodPulp, 1, 0)); OreDictionary.registerOre("knappedFlint", new ItemStack(ModItems.flintKnapped, 1, 0)); + OreDictionary.registerOre("blockClay", new ItemStack(Blocks.clay, 1, 0)); + OreDictionary.registerOre("clumpClay", new ItemStack(Items.clay_ball, 1, 0)); + OreDictionary.registerOre("clumpFuel", new ItemStack(ModBlocks.shitblock, 1, 0)); + + OreDictionary.registerOre("ingotBrickClay", new ItemStack(Items.brick, 1, 0)); //OreDictionary.registerOre("cordage", new ItemStack(ModItems.leatherString, 1, 0)); //OreDictionary.registerOre("itemLeather", ModItems.cutLeather); //OreDictionary.replacements.put(new ItemStack(Item.leather), "itemLeather"); diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index 36048b7f..b2bbc6c0 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -167,6 +167,9 @@ public final class ModCrafting { GameRegistry.addRecipe(new ItemStack(ModBlocks.forge), new Object [] {"xax", "xsx", "xxx", 'x', Blocks.stonebrick, 'a', Blocks.stone_slab, 's', ModBlocks.firebox}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.forge), new Object [] + {"xax", "xsx", "xxx", + 'x', Blocks.nether_brick, 'a', Blocks.stone_slab, 's', ModBlocks.firebox}); GameRegistry.addRecipe(new ItemStack(ModBlocks.solidFilter), new Object[] {"xyx", "y y", "xyx", 'x', ModItems.splitBoard, @@ -187,11 +190,17 @@ public final class ModCrafting { GameRegistry.addRecipe(new ItemStack(ModBlocks.firebox), new Object[] {"x x", "x x", "xxx", 'x', Items.brick}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.firebox), new Object[] + {"x x", "x x", "xxx", + 'x', Items.netherbrick}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.firebox), new Object[] + {"x x", "x x", "xxx", + Character.valueOf('x'), "ingotBrickClay"}); //-----------------------LEATHER STUFF-----------------------// //GameRegistry.addRecipe(new ItemStack(ModItems.rawCuredLeather), new Object[]{"x", "z", 'x', Items.leather, 'z', ModItems.salt}); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rawCuredLeather), new Object[]{Items.leather, ModItems.salt}); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rawCuredLeather), new Object[]{Items.leather, "foodSalt"}); GameRegistry.addRecipe(new ItemStack(ModItems.finishedLeather), new Object[]{"x",'x', ModItems.tannedLeather}); //GameRegistry.addRecipe(new ItemStack(ModItems.rawCuredLeather), new Object[]{"x", "z", 'x', Items.leather, 'z', ModItems.salt}); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 6d1fc51e..d2a5c657 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.6}", + "version": "{2.2.8}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",