From a4e5dc04766d371a5674b83ea867176cd6ef5b85 Mon Sep 17 00:00:00 2001 From: mikx Date: Mon, 1 Apr 2019 06:33:26 -0400 Subject: [PATCH] 6.2.0 - url updates --- .vs/PoE-MxFilterGen/v15/.suo | Bin 97792 -> 99840 bytes PoE-MxFilterGen/json/settings.cs | 1 + PoE-MxFilterGen/main.cs | 12 ++++++------ PoE-MxFilterGen/obj/Debug/mxfiltergen.exe | Bin 305152 -> 305664 bytes PoE-MxFilterGen/obj/Debug/mxfiltergen.pdb | Bin 46592 -> 46592 bytes 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.vs/PoE-MxFilterGen/v15/.suo b/.vs/PoE-MxFilterGen/v15/.suo index 0fea9ba26802d3c7185c550a6190ed5445c5459b..7dceb5948fa6287cbe84477fce307f0183f5c22b 100644 GIT binary patch delta 3805 zcmcha3s6+&6@c%#`(PsrL0ky93X3ccTal7S z6O(`DyXSxZ=lbWN>^?c;m^3HX8uKy0QSa%(^ z^X<@qQ~UuwL4oax_K1G!zP5}Fa$F38Qs1GcS~Njh`86afh$DoWFcO(W5`n~WB7#^= z#1VN!6rm%+h%_RWSVvPF@%tm) zmG{AS-IYtAjy)Rak@Up8IlJez*U%(u3w5>cl5`R6!S+)m*((+V+X6|v1!V$JRSZvXqE=m$4-Y)o{YHg|F6Qy#hLO7>-*r1b^%<(y-N;D zv1(817>*rLYMAvIcq#RD&0pC4utrZ>k8DV|tnjA43Fxdahu4!@ej25Mkdh{+8viuA z-&kP3WxSNhdz`JXAKRQA;KC_-K8bCm9pSrarJ0~2`;P)I4e}myt9pWUXtCXVUdw`# zMK>MnXRisv*p}4+LpYV?2a7zF9S-Qbc^2Nlwkk+g5<$OK<`J5Rax-}T}@++4#svj09^;b`h?!I_77EipT!^G(%*opU+ zB;p4*GSE5QBEGu`mSdku8}*y#4VB-!Hlupz@wJoX8M-rp`Q_Uz=$lz5Ixi!g!n1(8u1HvWp2tFR5?ZblK2&Inqb?UA?YJV2nwE$rN?;Bx^tRP%9wS`by|>` z`LK=euv_LZ%$0}vy@^;}kREL|nfH~|Z*OU6X=vbByePz7TObX6E}zGhp1wKI$CC6B z&Pnf7!#&QGQ`XyjRC979GGW?K_nrJC^@b|!{KGQQmkK&>)hI;35?a7A64Q{WpmI_} zBmcWRjQ94i32b1~oC)E~v8m09IIhM_`e-KMkVs z&<3O2xb+xF8+p%*KD;qe&rF6?yQs*(vN+4Fs<3H7FkCl5uCD`wK7h^xKu|+cwqUiLykz za9o46u5@j#)s&Y#>yS+-6eOXq--nfdT_s+PfCOyrjlQo}U|J!`Y32tUh|!qjS9C@InN~VqFQrt=V^@04o z18Pv--i1FU3=5GUgh^ZYp*ZjwX2E-Wbpe zurp<)I8zRhm^<+e6t3D)m@p-lWtCdiWZRrMYqFo-SFy7+quf=-en_%QQE}`W(nWD> zL3@fFKRmb_*Vo6%&wR8;rLyMaTAwDT{^q&8@eC9?2U+H z&5(*8oHNq*Y3lZ8XxLc@E&P|hpn0)PKORPUi~r}MKE`)%o|yeQd;hT#=3d9}NgF8m zp?t9O^Oak0?@*}A_JU+k9O4X^#4kmmP*`waSO^E-XQimmlg2##1JFp}9KT>P5c?hg zSN!kEe?sL!s?-qd|A_)e&gY5dUGT8zGr(Y6skJ1-TIR^fu-S4-GR*AXNTA@ZGTYa6 z&h6y$x)5!#nk<&Pm~_6<%?DC}AJ_odqGvNS4L5BEk4hY@fCokUR)`X-_dz!vaui{Y K!+Hm1Ui%*txhH@C delta 3595 zcmchZ4NO#57RTSY^B4yhC|@cSR6YhBbie_06cw0}5z&fDSMj43MMT9SMI9{Ck9nan ztu0oVlln|!tbMh#v8D_2EVH}mnn!7yMmLMC{jiPO6*aqQs!7v8nkLoRbLYcam)%NQ zd&zIk{W|yEchCPGp46_FevIgtKQ=}X1RZhH@As1l)K~UYrm$G)!1?l(|NaEb)T?d4 zR@Mqn;V^rez00sw*BaxY{(q%%A3;b*5L4V!sYc8ACy>3LSV3$e5(pD9g-9ft2|bZQ zL=uyTMZ`E_43R{n5%&?<#6H4Eln{KM;)ytdZz4(%+(H>ub`bdl--v~54v|aD zAo7STqJYRGY{Xt-2{DIwfN&7e#AJd$tcYweVJCJH%ZLSplej_S3(1xfg?!c7R9Q@L z$N6NFiHQU?{eKAASh5F0^|hUq<8#)B8hp~jRIesB5Myuauci8CVmmpkd4wvDh6ZPa zY!lhJgf-OWi}8|iNBhY;+U`($DOnF|i2e4y&;MW4-M2?Q_yoT{oqYLG@V5?YfRFLm z-i;PSn#Z-keQwu61oat+G$N#h#=xYz5W~;3z{4KuZ}X?9|98;& zI4{d-1s?Q$1P?mze5OxzTqM6`*cp=&Z ze)UH5SuoJ83%nM_$C%Win7@tQ3y0!!)r_PnfRAwR*k?Q)rC2(D7PfSpje$g3J**4< z1auX(E93Minv*fkEUKyItDsC06)QuQHAS6b`Vu^;=Zt)l93Q#k#nh7q-nhye9TPj$ zw2b2*nt1Ed)-<#-V?+(Tm|y)N(G4)b_kb%eSWx>g3GHPP=+wTl5>TcwPrgfkh1|Z6 z#@75ZMy_kFNm|;^_XfS#T;PVcak#(_)79ab(V!$S?*bzkVg*} zv1Q@2%3LPDl?f?Xe7$htIgsn$*$vLQR{DFq(7A9{fz9f(+aMEki9!yhvk55elVnF7 z%ur_(59%Q4rqal?;NhpLR=vACcGn=Nj542S7=4>sqxjXUYBtpqP-z!wS)S2JzWjpnq8t{Lqat>^ zUZqwYKLPT)wP2IiZ383vx0uu|n_dE?i{XN$+th7a4ukg%VDiVCAQk^qj&45#{HC*4TfxOQH;erc8b)`O4%&&uhQP=TM2plW!{Z+0;SW6uV--GPPUwIQLwbjIWJ=%Fz}Imf&&v;dsPy$64O%bBk)4ob!-hxDXj?^l@&o>`l1q$yZy3+rpu|g{)!2; z%aSTxu>(ri?5cLv0oayhmTy)-EY7~R7`1B_`sA3$KV;||q*ibV^}-&Zj`B_LqbWk@ z#+u=$G1rlR2luCUoUH2|5 ze=S*k&buc9UzwMJ|F~e4A4r2?d4D=7DR?j50pH>b@PT~V2n)!4jQ5>(!1hJ1yVCjj zpw3T=qtA{l!t*>k`lLe80Gozgp<|n?yl3$A8Dv8-9EJK31n&L2CPGjRI=RURiKZaqPj*tTkg() z`MNa&QF6Znij)iNr@N7Fwd55P25-k`Qd!p$V7=oYQyi6GU)2WT9_#X+iBiYHI_#YR jcIG3wJ;rVcY!t%!4OJD$mm|nYx_9dNZKTt+46OeFxY4ju diff --git a/PoE-MxFilterGen/json/settings.cs b/PoE-MxFilterGen/json/settings.cs index 1dde224..6649295 100644 --- a/PoE-MxFilterGen/json/settings.cs +++ b/PoE-MxFilterGen/json/settings.cs @@ -81,6 +81,7 @@ namespace PoE_MxFilterGen.json minimumValue = js.minimumValue, chancingMinValue = js.chancingMinValue, verbose = js.verbose, + strict = js.strict, section = section }; var raw = JsonConvert.SerializeObject(se, Formatting.Indented); diff --git a/PoE-MxFilterGen/main.cs b/PoE-MxFilterGen/main.cs index 774fc78..8a1cc6b 100644 --- a/PoE-MxFilterGen/main.cs +++ b/PoE-MxFilterGen/main.cs @@ -17,7 +17,7 @@ namespace PoE_MxFilterGen { private static DateTime dt = DateTime.Now; - public static string version = "6.1.0"; + public static string version = "6.2.0"; public static string fDate = string.Format("{0}-{1}-{2}", dt.Day, dt.Month, dt.Year); public static string section = ""; @@ -64,10 +64,10 @@ namespace PoE_MxFilterGen if (!File.Exists("settings.json")) { msg.CMW("ERROR: settings.json not found! Downloading a template...", true, 3); - web.DownloadFile("https://data.mxnet.xyz/poe/json/mxfiltergen_temp_settings.json", "settings.json"); + web.DownloadFile("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/json/mxfiltergen_temp_settings.json", "settings.json"); } - web.DownloadFile("https://data.mxnet.xyz/poe/bin/mxfiltergen_updater.exe", "PoE-MxFilterGen-Updater.exe"); + web.DownloadFile("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/bin/mxfiltergen_updater.exe", "PoE-MxFilterGen-Updater.exe"); msg.Splash(); @@ -88,7 +88,7 @@ namespace PoE_MxFilterGen giturl = json.settings.GetGIT(); // Check for updates - string remote_version = web.ReadString(@"https://data.mxnet.xyz/poe/txt/mxfiltergen_version.txt"); + string remote_version = web.ReadString(@"https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/txt/mxfiltergen_version.txt"); if (version != remote_version && deb == false) { Process.Start("PoE-MxFilterGen-Updater.exe"); @@ -207,7 +207,7 @@ namespace PoE_MxFilterGen // Download the sounds from the remote list msg.CMW($@"Downloading the latest sound...", true, 1); - var sl = web.ReadString("https://data.mxnet.xyz/poe/json/mxfiltergen_sound.json"); + var sl = web.ReadString("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/json/mxfiltergen_sound.json"); REMSND slj = JsonConvert.DeserializeObject(sl); stotal = slj.sound.Count; foreach (string s in slj.sound) @@ -215,7 +215,7 @@ namespace PoE_MxFilterGen sprog = sprog + 1; msg.drawProgress(sprog, stotal); if (File.Exists($@"{path}\My Games\Path of Exile\{s}")) { File.Delete($@"{path}\My Games\Path of Exile\{s}"); } - web.DownloadFile($"https://data.mxnet.xyz/poe/mp3/{s}",$@"{path}\My Games\Path of Exile\{s}"); + web.DownloadFile($"https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/mp3/{s}",$@"{path}\My Games\Path of Exile\{s}"); } // Clean all generated data diff --git a/PoE-MxFilterGen/obj/Debug/mxfiltergen.exe b/PoE-MxFilterGen/obj/Debug/mxfiltergen.exe index 024365e859b104edda61b8bc73f064db7ba934d0..61c730beaea44953a4bc20caff7d27748ddefe42 100644 GIT binary patch delta 2890 zcmcgudu$X%82@&5xX148UiYr|>h*CgUc1*8S`ZXSs0Eq`*gzklK_kdp1lu0dqDZhk zUx75?(M7 zo+~&&d0-)h!t~W*TFoDpDwOVGw2UDh<9$+ugf7HyDK-Mr;G~nn z@LT{HB?92s#7oJ}@LCCyEJ`40Rw4#wxp=Zx!jF?^_+x=DM8uQZBqH-#xtJ`Hc@uU!WuCbt8&q?>O(>6Zww>Z_z!N3}x4aEQ-MD z+&IeZlLk!AuN!)GA%yp1O{I8{bs#+$53xO>_dB7=2cZcZVqiG^-k?8^U!JB1`cTpD z%S9Q$v0<=FZZ0{(WZ2E4j)U_AI2aEb#$Y_cmMcOiFoK;r1|N(^*$RP}K9QPOTbn_c zUvu0~Rx3Q}-1}cXHjMdTI2`e@LE+yyXOMjgce|FCpSMDX4WG#4rX>`Jq@rw``ECA; ztEzS~s%9ys9G~GRXF-*(Q6hJ5ROF6TOePWwt9+BY=I#SvR+9^GpUQW;D*so2yEl4U zY4omB$4)6bqH;-Hw?ve}h?(N-nAZ6#HA<@^_W2u6+9z<0$I=&@I(MeeEBvVXmg^_P ziP%3YJ=4SDy6H-wielX?)= zEL5zrq|YKj^~4-KAQ4mJ4|$&>wHp828`g!If+~kb6(IPsp&+2OO=aUs0 zzm?ZSwrG5*QAl=ce2ZaD);O>NlXE#8<}93!#-2xsp`#CdYlT0N!8h_Pf{pC&c zcU0rM^5>G18h<}ON=|D$n_ocAX?!?;@e(mHa~XyOmc_94@Mj$Mh+q>^VN9}uSVo`RdCPe0KeeN~Dcz<}&^e01(Ym7X%OY?lOfM}Hwvv^P;C zVI!GDk^D)vpwSC3eN`)DYXI`_)iwRWRm<=~giAFU$B%N>*?ZxBl%OB3J1@v__|}%L z={MwZsK=}X*QHQe0o}HA#Rt>Ko`#jVhd|0HywdJX;=tcRyzCOi&LAifoL!Uk+zuo;<+ z&o>7-&E*-Pi=T9<7B9OB)^gf^+Ev*f$(gRIe+fZsrpX|P{t@h8?(sPPwqh4=+ so{DX}wl003m=>rbpR5RF-YupZrSvbwbX`V|(LY`y$-2yr0eVaN8=8nnu>b%7 delta 2353 zcmcgueQXp(6n`^2y^r0!yY6j!AH9~|6|dcEue7Hv6aq+vL@GpE5P}F|g%}7{$~HuZ z^aF*IkQmxb@S+xD%0~#whiTwa{J?||V^WbAhz1fwG+>Mg!5~CU)Hi!udL<^7f4pRO z-uwODy!V@#ow@0`;O{x_@7q~6K;Byc_U|fCqL5mENep0T7Cbkz|L{_8&rAjj1Tcqz zy1hT9t5?xLpCM74-WFv^{tT&*FBD_XDB_d&E>cCJ{3NL$2l*9J7CVlS;x`{33VCqI z$zVktfP@|ea4h37x+&x%&~A3(%cw*QjB@cdPY`~TMna_&@mYu%5`Y{G8V^})ihoZ7 zp}9zQ<)NbS|lA!5i_(NOROS@4s810#8(kpv@kkLF1R?f5auN&@D3jO`vBsWBUCn_nT6 zolIP0+4MOun;}GH=~?LK(4F_u?~kW%-ABir<9e?`*XYj4-aDTEQt%etg<_a_SNLKQ z%oZ0~+3#c?iqpNCH(3m!H*ii#JYa4^dN3X|cZ*hcLX{ta<2b}XbLzf;p3kr3c?v`U9GztG{7vpP^z#LVfg z@GY*Y+KGf3F_avyc9fe5nXi$=>loJdi)pcB*xr7*q`d)SiWM)u>Fk!i=;r&CeXdr-srY=J zQYVMRY15Iw5ZO9dEK|YnjPFthJmRRaNkks;Y*n{l-yS?ynYlyZA9-e|2^89c2MZI6 zOuQ+YkcaBLg@o=^_yXTHdO+dld?Bw0lQ9I^6%ja~mC#{Kpe+)O&u=v~1=Hynh2P0< zrk52yUn{0J75<`TOtf?185HMoI*b$!$79|_&%{I@`kxc|G`$$L@fy8qqWSX2=L@TR zb3r{#sQg$#gjTD3q@akVRQ^-JV{^s8j3z7#W}|w~T#aUzm@MnR!{&R(_yc1mDr+lz znO;_TX)wVZfhM7~B~Xz?3_ciW5y)==1CgQ9phn4SJQaS49}bs!MDJUA6PzBX*en65IhTrC3I=y|=qq_@6=;6pR@CDNIZqR%`4 zlb0-pIa2`g@gHmQ<4c zDqyYc4ZCKr1pIQ(Tgoayot}+6>S|+2sI$GOx`$Q6ZOeNTzV_Z=wQymE6&X6I=D!l;f(#;Ah$uy{JAFg)&MIck6PjB zV33uQRAzRNHPZaIK2D!~y7ttQC$|1@<;VxyU75Zx%XcIP?0XEZBCNtEir0-O-eVRm zp11hO?`xLtKc+SIc5b|Mdfn8s>5)>l(0|CjkOzp>yLLWNI zNGn}(mXkKT?x2TVCeltFuJY^-tjOj=mxj!A(p5@2>06hTh&0z-MuPOD+l;9^ZX2c= zb&q4J3Xcm@jd~U^mB($Sz21G8YRYRP9nz{-Af!|JdD%=bgR!=X1f|;Aiac!ua>0O~ zD4q6|lOgG=?=>O)RPrAsA?b&Iw@J6C!AZdK$3=}~xm|4#OgHS*8ZM@HLnnl_9@gJU z*FvWSQ!ne+2`>}8guVz@3M6^b#0HrtB$Kni3i@QCnzeAe zAjj)ddg4Y&R&bCb4l6~47v*>{jyI*p`l&5duFwIqGBHzeOb(cn6;!i%WFL~#%Tjm% z;hfFmP5cN_>u0MUL%1y|CSbBp;EZMlS%^J^E%p6iea6li0G_8|hCG0|H0+fTAjiwH zU}H&X{+L(v!=3G$HMDR&f!T$CABK^oHcZVPaJ(4Ddm{HlRl!+~_)IRUym^lIhU1Bg z9PtxJ{KE0RalBQfcSNz>zd0i0D~^KhomjRxjY}7O-|LIvWJ-ok`N=l$n6X38G v4r}GGHaQbj1>5CN#Zs@N|4p=$TGsys&z=ZO delta 1972 zcmaKtTSyd97=Zud=y+eLc zWFn*~!1*j`~Oo7F(C*mq*8QM-w>%1d^E5SP4s%0MuKzP^UI<@)-{%;XM8 z2Oa*-(=k^mamov>H-wy}vU@+a`03u7d#5_3`%;p;?MAImX!T3f=*y>fd&`CX(EVom zyZ4aL>SOf{!qh`n7SI`Am5_<|8GcFV3borv|N3=w(0@QU9eJ)5`q8WDvkA4m5*@>` zoH>C8!He}7fdYCjP$f*=l<1ehZjU&NYXKd}?8>6sv|6%75@%U`kx~)GhLDZKV24ux z95L89vIh$DXp$C}9Z3a93_}7^lhTeraakR*r2jGii^_`wzoLb9`i#ocGNXtnN)Qc z&8Crk47X2!Wl>QHI7MID+V+aDA_Ddw3I+!et_wehV1zluab&&h*kUAtLzUDaR_g$! zVlZ7Mz+?>eS`UzBU(FdxO0x#-IH0ceYlDoO3v9;H^dM8-!D#k~;{`e1GqtBI2pbmb zaDpSgP>W0m2lJ*m-dm36`M?opIpSB2_nqS{X}x{QBto-a;fRo>*$TR2cnLofuHg+H zNBA$ErNWmn5^P->Ijo7pnmMdR%htA#b?DSW&0v&o5vz