From ba921c708f022823d315f626d00edafbf0491a76 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 11 Feb 2014 21:40:59 -0500 Subject: [PATCH 1/2] fix cape images being gone --- capes.txt | 4 ++-- capes/default_blue.png | Bin 0 -> 786 bytes capes/default_gray.png | Bin 0 -> 693 bytes capes/default_green.png | Bin 0 -> 757 bytes capes/default_orange.png | Bin 0 -> 721 bytes capes/default_red.png | Bin 0 -> 753 bytes capes/default_yellow.png | Bin 0 -> 813 bytes 7 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 capes/default_blue.png create mode 100644 capes/default_gray.png create mode 100644 capes/default_green.png create mode 100644 capes/default_orange.png create mode 100644 capes/default_red.png create mode 100644 capes/default_yellow.png diff --git a/capes.txt b/capes.txt index 5df07bac..1018e757 100644 --- a/capes.txt +++ b/capes.txt @@ -25,7 +25,7 @@ type1ninja:https://dl.dropboxusercontent.com/s/0ufr1gtqktt1nl2/JeffCape.png turbeauke:http://i.imgur.com/XdOIone.png Nieue:http://i.imgur.com/8c5yUgX.png starr274:https://github.com/SlimeKnights/TinkersConstruct/blob/master/capes/default_gray.png -zeflap:http://i.imgur.com/6OhKrVE.png +zeflap:https://dl.dropboxusercontent.com/s/j9dvs06z7cd16r3/tCape.png kendfinger:https://dl.dropboxusercontent.com/u/48633261/cape.png GameGeek1998:http://i.imgur.com/hiMFLXY.png fumoffu616:https://dl.dropboxusercontent.com/s/f70j8xfwax1p0t5/myeah.png @@ -46,6 +46,6 @@ the_j485:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png dgdas12:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png SatanicSanta:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png GPuzzle:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png -ajloveslily14:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png +ajloveslily14:https://dl.dropboxusercontent.com/s/8yl77gjf4cygnzo/cape.png multisofteis:http://i.imgur.com/AgGBsX8.png ----------------------------------------FINALISED - ONLY ALLOW REMOVAL OF CAPES---------------------------------------- diff --git a/capes/default_blue.png b/capes/default_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..e6bd3586392641f64e11fc24699c4241d2e958b4 GIT binary patch literal 786 zcmV+t1MU2YP)VGd000McNliru-3S#21Ui!JLk<7{0-s4l zK~!ko?U&tZ6G0Tme>1a*?dD^%B~3$3Q==D!!g0r>d-A+`ENie8nQx9-G~N-5sG@36VqV*S$- z!f=mC!vQFIHD0}ZfKrCl70Bo3VuS78XOz~IXO{?u{fQGm19+u6g~B`{5db?oUjfJ$ zs#L1WOi%j=g0<0PW`KxAuq-TIVyp83fJ$|lOlBH@;cy#&roo`U0o~u7SQ}FGYV>+- z6e@WcaDbbeMI<7hpCg;iAtHzf{r(2VWD$|^PPBtDSsZgDnMVNN%(>gN)>ct!zr=~y z*yzU1yO6NR{*wUR&PVDC9<}-f0E(rfakQ^oK8^2B0rE#jRwCT|Y;rT;+4I*ln~NjE zzF(!??(t~l4SLMuM=6b)D<}UF90ogV_r9>+nu$xG?^pLLLO-Cp^$D#tVKDeD>Y0q2 z{3Ecp+a(MJgu(7uqd|Xz;oeSM2DNc8&XLKv0}e`=>*hu#8^=ljWU@J|4dZd6vvKNM zi6%pU(o6#@Lb0?!(W}Ip9}GhBg(}))4s}xSj>i9y4U#E#>V-zw``=KLQK2;-N-vu7ZsMCJ~JYo?mBb z%E4$w7+SQ*`0r;EB@@^z>%07*qoM6N<$g5D8va{vGU literal 0 HcmV?d00001 diff --git a/capes/default_gray.png b/capes/default_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..7931dac451e275481a9850d92b212398d9613415 GIT binary patch literal 693 zcmV;m0!safP)VGd000McNliru-3S#I2RS_M;s*c#0zyed zK~!ko?Uy}I>o6FFAKQUK6E|*wlp(-W1_b|sv45T!#9qWwNIya$1^W(HiO7W(-Hk+k zq)3r%S@N6X^PUKR@p$YWA0JsRmq;lovDPAlpxf<|rYSc!H)L6c5Q1$;DarGE`=Vb$ zFdB`VQi_X<3$iR@GMQA9CnqO3=jiwQOs7*04-b)2QWV9H8}IGyx#@KJ>x&Qo)uD|s zoSmIjlR^k)vl&lMPdq$4@c#Zz+Xw)(*4*9Qp_IZ}i`KeYuvjcmN^x*-z&IO z9LMx}Jw84@0Lb$k=Nw@ek|YV8P6y{4&bf9f0Khp%nx@R>a{!VgAqf6XzrDRN7z}uM zdHHq|Yc0KAkHuo~qe1>k1(ay5vDOlXA-lV~)%fe{D?*5k3J^jdgg`0P%qswJd3niX zGO60&=fhrKU$;{JRROXrBS{j{G^O-}^1xSDS2a`IMi_?8RlxoIJ*TIqwMkMM0kDJU>5IU(px?z-qN(Hk%=({E`ElbB(nP|2VGd000McNliru-3S#21r;DBPZj_G0)k0I zK~!ko?U%c56HyR`zd2`bj$<%Zu8vs9UU}KP;!Z6 z8AT!F?%2fZJ!dGKu!*pfHn#SYR$J_zqn&^MnKL5*%dd^Lzj)dk5Q*gk=M-<1U;<_z zL^R%{9M%;voQql^`>nzd5KKHXT24IrJfi$F$krB&}>??NRIj#_%b zwn|hLZGXG`A_M?iA1qfMId&I?<;S@LFqXCTjOtp()+aDW;2A9ffcQFWzIB8q;5!|{ z>0AU^hn-L;-?lW{j#0w^jL!?DnE>Y;9!NJqRSBmR?t5G3*@DAzzNZ0h&m;jf^rfdDu@cLeZ__j zVPOr00000NkvXXu0mjfulPY) literal 0 HcmV?d00001 diff --git a/capes/default_orange.png b/capes/default_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..31d907e943038c0ff6c0dfdd4741816190c776ae GIT binary patch literal 721 zcmV;?0xtcDP)VGd000McNliru-3S#21uy0*mZSgx0$xc( zK~!ko?UqeX6Hyd~pL^${(}FGipg^N0B(@MBDaI8`Ho9C%#2mTb-#+6&PMia$E zjUUn@P@{+~mCXobz4*u)j&Ta{@gHBcB)vh5=<8 zT88B9o}wc`Dz3$^!K-ZqDL}klC46i_xecA4@Ua(fZq(sIz``PQcHq+h_7318fAhhf zf|t9uUj!52gMjs2m|ugZ$JGgWBviW`et~Zz@cLv96JXAUtsacFAU8awRE~e>ya#y) zn$GyGj?}8jh zf{Ak9e7J}y$s`is$cLcSVyzSf>&2+_0Ty1g$vr9(1UGoU4aHoFE8y?DAJm^U#wH$p z8f!2(9&+~PGvP&&*~4@eD!?1UQ6Jo|U8+``Jit_N!2SvRE=IR}DSs0RDR%}F;Ew^0 z3xk8?Y|dS_eC7V-F|S%p0P+TeMjW?nm~rFYmqrEzsOAJJ5Y!!L ztb*TKjuQOkQJ)5LboC(>YhoA{QYygRVGd000McNliru-3S#21_)>ka0~zd0)9zE zK~!ko?U&7J6Hye$fA>yiCNs@IT8OksYB3=tp_^{<0=0sVpc@~+m2cr=_y%s>2*s7q ztqTi9Y13AW3)47F^D&tm7d2y2lhkD=%nt?z&f&s2_kTXF0(e`i$w%L((d%I-#h5?@ zLn+oRi^th4uNw_Mce_(Qvq%BogJ7}KJt6fhmlMx0cwQ)QadpM}Rx2_-U0Y))LecX$ z_kDIV8B$tvIUL@3aLzR4)AjYePeKadU8}{u2nE;WWxf8_sx{X~N1V6Y99&+~8;w{t zQUIlNnm5hnjkHfrC|XwJaMtf*D8+6jgCB-VmjDe=b{w{Bn@|LRZ-W55e^T?Sd zA`;n`P5~mq2zau(%5k>~K;84mXbnI+45_*<%^;Y0NFYKfou<+2p_GcB0>n0* z%>qzzoanZz`}>%=9C!8qP=x$M^NgJWz8)U(aC;koaTOOlkN)W?X9owEGiqA{>oE-a zpC;&sAs78V4<<%n!Silz*7y1HXZ!2i8iS!o)F@+J0zZdCI$=n6&YW)s0l$XBXbhS$ zZFmbyAP`~2ai)xJwF-b|7z7hd(N>BL(~MNG6bY!hE+RtNamc%F6nxm}uxZ;^3vT?8 zZAbrun61lERQXJXm0FF;9CWvTd|w-2|ITO*yRW?2wwX-4$a# z0j3n-l*@CSHY_W4(*ExRhzJ$OLAx%>FpwaC(P&BuT5GDVOJ5{VGd000McNliru-3S#21{#~R0Ym@*0=h{= zK~!ko?Uzk!8&?#DpL=IK8qG*@gJoGGf5=J`)oo+ihNPQd2Sc(B2_euQPzoVGCW|b) z>Y~v95D5LGV7e`)Cbe-bV=R%>mSjtsnR~O4J+6r4ZmnS+7#QZ9xp2>Y&pG!9fbYKj zQm_B~u*mA3d1W8Q0+P z!$oR)O@92j9vSbg74QSiY-y6(-XY7M<}gjc;i3P(3+Ja&`p=D{OCJOi;N`0W?ygKz z@-lq$_3d-35VVdq*{!|hm){z6x{A1A0xXtYzW-t8RN5PqymaJH+v}&r@{LJa?I3mm zkN}mk!~C2>7-|6a_d5X0mePFj*#}HbStz9=d+ZdTG$^H6TP^TwK(;k%|3g2A0Y*CL<0Q1)yB_cO&&zRg{14k(KVeS1FK;0Qg@QfS3NQg$EuX#p4*C2} z)B-&(*S`(=ZML@C7>1yIJlF4 zpBm6VX@%pY2aMTVKP57*iSM7^0xe5Yn6{(bk3|5g*Rp`3Qg$g8-DvY+&}O!j#Gk3_2?9v1;cCUjFl~e|QQ8O8fD)vXRIg>}^%P3==LW4A`kW0> rVHnSVB_t#yBqSsxBqSsxB*cMtz(eb8_H)al00000NkvXXu0mjfaq)2g literal 0 HcmV?d00001 From d0c1ba6f2edfb8381b27b40141f68716f62f8b24 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 11 Feb 2014 23:45:25 -0500 Subject: [PATCH 2/2] compile against jars from dvs1 for now --- build.gradle | 6 +++--- build.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d8248465..f2115c8e 100644 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,8 @@ repositories { artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" } maven { - name 'SlimeKnights Maven FS' - url 'http://aeon.sunstrike.io' + name 'DVS1 Maven FS' + url 'http://dvs1.progwml6.com/files/maven' } maven { name 'ForgeFS' @@ -76,7 +76,7 @@ if (configFile2.exists()){ } dependencies { - compile "mantle:Mantle:${config.mantle_version}:dev" + compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf" //compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar' //compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar' //compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar' diff --git a/build.properties b/build.properties index f3a331a5..53d647c4 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.2 forge_version=10.12.0.1027 -mantle_version=ccabb5 +mantle_version=98.cb9feb6 FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.8