From 59e02df4c3af5517865679dbbdccaee52c95d7b4 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Thu, 28 Apr 2016 02:02:38 +0100 Subject: [PATCH] [BUGFIX] Solved issue with non-loading tff files --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 3 ++- pom.xml | 11 +++++++++++ src/main/resources/.DS_Store | Bin 6148 -> 0 bytes src/main/resources/storage/.DS_Store | Bin 6148 -> 0 bytes src/main/resources/storage/images/.DS_Store | Bin 6148 -> 0 bytes 6 files changed, 13 insertions(+), 1 deletion(-) delete mode 100644 .DS_Store mode change 100644 => 100755 pom.xml delete mode 100644 src/main/resources/.DS_Store delete mode 100644 src/main/resources/storage/.DS_Store delete mode 100644 src/main/resources/storage/images/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 94ef28e5a319f22db56e50ef555b9b6e2fb10d95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-lnY5Pf5d7K+fL#~eKg{)14e(3>dUb*qT5WyMzTxIfSz;J?u~nNi$zFJ44s z1}1Nkyh%0>HXi_F{&aH;%m7U2ilV`QY4c#$j+4hkDPvSpZgvURX1PXMA` zql+=ti?Ze<$L!b|vWF&?O0-n*Cx%!$+mrLMV{2&X5Py7#&;0Rtkup2SPlXQ2hEawB zp+HxGkyU4U{-5xd8GPh-Q=%3MgaZFe0U0kY7IQAj&(?3t)3Y|wujp#ZYc-%T?py*` h(S78gbXtGXn7r)R8tN$8Uebwi5h#L05eoc*0`DMgKa~Ig diff --git a/.gitignore b/.gitignore index a032d03..b8bd070 100644 --- a/.gitignore +++ b/.gitignore @@ -121,4 +121,5 @@ parabotv2 releases ._* -Test.java \ No newline at end of file +Test.java +.DS_Store \ No newline at end of file diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index bc75f96..8d585f9 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,17 @@ + + maven-resources-plugin + 2.5 + + UTF-8 + + ttf + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store deleted file mode 100644 index 2323c7f9efb37256d06bb34afe785d9f77c9307f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&1%~~5Z-m%Myg`aA%#F%*n53&>r&?^+~iUUH7GcTrnoD##0x?jB-thygHCyY zJVXzDfIL7-)4oE_{dtYf?5;~vx7T9I4$OX|*_m1CTd_Zc5Za%lj|mA0As#4V!-wV% zg8ir~(y$&xs%vm^LPRnvPm^pV+Bw#d0i3%{Qj&@&Qji<-rxKXd-Q+ZrW!33?p^c5^ zox7W!e=pc-1+8!^Xa#TLv6{sduO?-m7o+e&EK`y2;z*{|_)z2rnV5?FRq>KnqIiwL zhe~A-U~HZYrI?Mv?dK}5xXeYN>zNwIM>0>sC8uf{N#7ryg7e-!S_=e=&X&7SP_7Hu}~^*U|#wEJwa@O;mE_~^wjIXl02 ze|h!cp%fq^1M7Hflg>3{~0kJ#TtL;)M`5{S%VWU)2~Js{Mi0-986uNc&% zgP+;B$YO2Kq!X$~hB|g+YHui1j}CsO!wHQHy4Eq^7`V;AhItHe|3CQq{r`57dvXjo z2L3AsXmdZ_@53kAy>;c|aIa;cZ$VKot~U591q{6vLo9B^JD^&?&(HvjEY=3W1L6(> Nng-W62L34nKLKXRbD97E diff --git a/src/main/resources/storage/.DS_Store b/src/main/resources/storage/.DS_Store deleted file mode 100644 index 5a456ba5412d35802e620d46e8006b7c1c1a1cf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK-HOvd6h70fYht#Nixn1B$faPBO2y(`sJnt9Sjf`7aHS?@*bc-@NTw}IS;&Ge1?!uCP~vItR{tCzJ1-A>Xv~0|2ByNv{L=0N|iYY`EB* zVDi26W7aS|O+=z<6i@<(0w|)jzd->xcjqC-IV<2A`p@|jz;GU`yBU9yWIREh{E^&2 zzp_w<5x_dKo?`yN3EYp8i%u2`NnPb8v#QW_$;G6|SS320Po%NdJhOh*anE@hEwANo zcrEWyH0HBN#9~tQ<8tI*idagMxZGo@81K@2C!SIB4#-)RXtr}e~;xUpY{19Ppkc33y=H@gOW}$br9!t$SRhwjEO^4)DTrXh{YHO zbNm;s4xc@L`RetXx9{G6`26Lo z5(WtVeUxn)T*5aDRwSNAWuEc;0Q;9YORhz$fK|XMaB2n20^)e5&agzQfK}jsQ9!N_ z0lLJ{V69Ot9oVQV0HQobD#KVF6J<_dFf>?e#5ZU}ry}Z9Vy+lOr(=I$c%i{sqfQ56 zE+520py)tCjkdK4SOr!USksTb-2ZoefB#=ivQJh4tH3{{0BLSV+kN~b zv$r1mIJwsb=#SB*NnWk-M+ydND@Lx|inq{}VSgY4#L!@^5qr?=K|sl18>_${Rp2{q C{E3YK diff --git a/src/main/resources/storage/images/.DS_Store b/src/main/resources/storage/images/.DS_Store deleted file mode 100644 index c23a33987577e62edbc8e540717acbffb4de0fe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHKko5Uo-Y1_i^?VuT!CX#K)&534QPztHI=^Ke25m=7Vh9z8#O!;UCptbxMpUWSGRp#y^!@3B7=uV>b1fWG>}Q zEgjhutO!GAvj(fP*`Sn7ROTWxug$<;i1~!KxAAkRwSd>g%gV59%uS1LVf_YJkGNWx z11BZ5n&@5DueN^~|4wv*o|hQ?JQ5E@cj7TLwwhGApkirEs z!y=$=9Vqk)0BoRI4bSqYK{%;lW>^G73ycF57^rMl3=VYErxuqP76AjD*e)Mzne`w< z1Z#F+iWeAX3SPJZu0TbB)9~Jv^Zzz}|F5w8)fI3B{*waS=s)&*n30{WdvlYsHibXK p#U!o>s1y`-9P5MJNiX4QXiMb*m>CuUQ3LZo0xE+SuE0SR_yx8Gr9S`w