From 208ea68c32d3723dbd6d0bfb0fef81c2ab4c2fe9 Mon Sep 17 00:00:00 2001 From: Michael-Jouanneau Date: Thu, 23 Feb 2017 17:29:47 +0100 Subject: [PATCH 1/6] Getting ready for big update. --- src/Launcher/Main.java | 6 +++--- src/assets/icons/settings.png | Bin 0 -> 6184 bytes src/assets/layout/main.fxml | 23 +++++++++++++++-------- 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 src/assets/icons/settings.png diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index bf8446b..0f5a469 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -52,10 +52,10 @@ Beware the crocodiles on line 100! public class Main extends Application { // Semantic versioning system data - public static final String semVerDevState = "PreDev"; // Development stage + public static final String semVerDevState = "alpha-Dev"; // Development stage public static final int semVerMajor = 0; // Major version - public static final int semVerMinor = 2; // Minor version - public static final int semVerPatch = 6; // Patch version + public static final int semVerMinor = 3; // Minor version + public static final int semVerPatch = 0; // Patch version double xOffset = 0, yOffset = 0; // Offsets for dragging diff --git a/src/assets/icons/settings.png b/src/assets/icons/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..38f333e0ce9126b12a053ac22ce71b319c50940e GIT binary patch literal 6184 zcma)Ac{o(>+o!^y$;^;t>|@E25DFp7Y?d&{cPy#wTlTVNX=v<58dTO9SqdRr*<(nS zj8GDyvSi<~#d~~z*YCRC_rLd#GiUDYbKlQ>&UK#q`NWwTW58^1HU& z0!qFB6h6S*+c_Zcwx1J&&uurafD2wu0V2v56fP(#DW9|fV0kk2kvbMZc1zjcKFDD# zAI^GjSa$HQ>2l#t_nz)2iWrD@q_Ez1?9KC)6lg(Rv`>5g>=bjs=`#ksCcJn0&p%X_)TeW}8KqH$>6zmCSO1S=^1#8mch3Et-2q|p z{F_8x4~o*VPZ8`p|6@ zoHHVmUFP9cgmil|)?qruZ(D3*{RPL$1)DmFwPPzfivvCozQ(cqU(HRa{S--Esjs9C zk)$|z>b;)#DMtP5`=Wp#cGfA8>o!p08cJ;!UxJXYRz>}#*R`@=5U7Cq-ExH&3x-J;)ZR=%QyFpxeudD3n1 zz2)q$4eiZDW2*)o&!*-d`g1LF{6$ITOZdlKzmt@=qd^pPC%KU|5ZynodTu&l%jwI2 z+<1n&SJX;I*D~P1Fc_r%1`G=9Y^sz!tdVy@=FZ;701d*gk3Zm_|eT-K|S3l>SiD897B(nP|z-yxf9?e!cjg14tzTz1n#^0d_ zQHoJN56Wljeah)3p`uBHn~UQlsh9_P%{xD@s{I`wolp<|{`ZfueArC(#^gVThu$U; zo5GX#qgjp)0$ujk{liuoMkh5U!#=G&Dv}PbVWIQtdnh_fk_&d;%m1C2e;n9+fA25H z;jhiTmayNO!z*C{dkgasIn%O5NB28^7afIl(CzN$v{W3fv;eQnw4;Dos!7#9%IP$z z#soz%`{bj=1P&Dz9>%Ubo9MD9x5 zkw7(f&V9ZDH*h#r$Hmm=E4Ps4FWYrh=3W!^C9=zg6JcdI{|<+xTrMRkMN=*Yap9AN zwnlXMUD*c*JA&Aw7x}=2gO6;aXdksk1oXe76GJ?758=_2TzYy z%c>vA%x1H`eQ(-PsYY4Iu$seBNoaZJ3p5cevw=U&yKVCiA`Xg_R*rtx70&b%<48%2 zN|;WeK~s2BrV1PV0^O5yGVSV7MGAGOKfbUSu+1Toltc31O6tUvGRF^dMfEYS16ZM? zOG@W*aKu3%P%~4GjV?s@ka&}3V_=veg8UUP-Ejx&Agjc-YPJ^~7kKnnZ@#!%&%#m7 zfwrk!iWN(e>%}Jq?&3GduP z`IsOMI{w}H6Pxjo5?r$B4<;V=l@TQ)l{Nz1%#UgZvaSify==>_doY;08{;qhqFI>L zt`p~;$L%)WbH0;z1%xkn=Kr1(vDc58Mfv1(v<6H2g>APzP|Drg%E;Zj9I-SRw(T+* zw$%7EM&e|$L)SO+bR`sWz*Q>A2B@W$`*wLgS&rO3Gt8|Ky3<>6FgCvrblzlgUo1B` zer2~Zx1ML;Xg6CpYb}MMIXTB$`~WY2tTDv$v-!&)U?s@#1!>AW(BXU=gGsIBkvBGvMLfp+qUePbC zzcU!KEmq!C13V`Wz8i$|jWU%;?bn@O{=|oPOpP_~vuFi#Q_lLQM>bCFG%hWL^+$;z z)TL@FncQqoF8srz%obo9Aj*8WSTS)me6NA$j9fD;A<^Pu9G--OikcPksUemnbqk1Z z@}PM`A-yLXaDtk9-&opjO*l)J!bmK=B>h3PSt8W;GBmmI5*GDO9PQD-{pG^jo&QAh z>hoKTm?GSnqBab$bhG};*2wW|1O;ms#!-Q+SU=C@g=)}8Z4qh`u0;BT3xzRyHjJ`s zS&}4&ov}tYI-s8C_a32*uU1595FnPP&4x|_tAwpevV0@h2*mha$v>_g7+*D zF<9%Ky%LmOYfEzD=%<-MNw@L%H}#aZTg}@=5u!|=ddff_iCl;-D(`Cz;it{Rnaiw) zKejycl}CIwmppKtyoNd%#{TR`*1?f88H12yapbAF-BNb9mp_Yj6BDC9s2Oqi^m`Pq zpjsR7hMVP2N?k!12%`CuI?H(yjTf=Wp9 z|157Ttuq`6x^wPYaI>Iza`ew^`Fm2jiSg03keljpEZl>iwJf*q zfQe}{s2lQKPEVh@xW^Y?S0*$e5Ha0V-kPas4j(!NH24+)SK)YFe0{r+2l*bPI0k-a zP7rwUGX26lA2iGPark_ka){2{gbnckp8zvsUu3$TjAJio{nB%oaH6f)qJpVBmy50> z=k#qg4V3>7LSX{Y=icXd#68O>E+kkaXoB;f6)-0toLaUb{X;RR71!b3L=$BI;9tR@dgs_^Qv7a3A z6<`wbz#&I~!)BIUnxB2bpMWkHWhMt!?l_aDq4x6a+iHP&i9rrkcMF8W`pO$94r{Z> z>I`f9V!%JRdoCqo%Vs!h@awBVb3CFO31(%8A5TKO^lcs}FUMe_Xw_0f>)mN;x4zJz zZoXlNk_=FA&}Th@=hgFH>(9~adCCyt*;}?$?_m3Aix8KCQb?`ZVH@OBt z@ae$fL;uKsy>zk<5g>x%HHu&TOa(cl(wZ_Q1hajOKd+A^aDD&#pH)|@KZ(iedaZ%} zA>BSwms|920YdH9qf13mJDFsZAMHA8X)GD@K?D`V!~qSFA9)egNCS#biVjOTXOo`i zUi?k@)^S#4=!loi%oVD)(?0t7y%nkOwvA8&Qx!+?)4yC1z2NZ_H)wv@T5u{!ffvBh z>LF}=iuZXw%W6{>9~^Hg7{Ly7^L0D~8xCN)1`mxHZM2i;-UU9+bid^}tX7+fXpDXc zQj3LIfM2TBA|tKL=wn+tx6WYh6(DQQvT4Z8Fos>d>FvuwePn>QSqt0WE^E0{CUN#> z=s@$1Hd`rk^018Vt@#qq*&OVQkWbwvM6_$w`qk{?hjLexeRy-Uq`s=dkP>xrxZkNyTO(6~Oj$Oi8$s=#{k}QnZfe8D<|VZI zXLcjygZd1UrI2^CRi=7#nD|`f63d+AMS*!V=L5uJ%~;Qlz9^Q-0g7CKF5N;Pqd~ zf6vA!hg20Ys8zT;=4zBFG=%7`Y^D=`;+SseHr!+_i75vBLV%IA>6X{43ap?@|kRUT2syBl68 zXp>#XlstbUk+A~&wd`YacMa0b(`jYypLW6PtR+l@GUi@(=80b(H696|6bB?qYf2r; z{v`@#rqbr|z~;Mk!3eCdGKRtmDJaNysoB)>VIaItbnJZ$;al~7dgaS3BBqY8VE|R} zOP8we@KP-ts6!;x2;d^oNM!=$TV?2sCdVn7LH2Ku!pL}#!KAkiysoMXK4n?2wbB_% z*{WN@FjY!HYy3K-@a;hv>cuE{U8}ahjYzbGGQoz^KAj;&fXT3ttU&dZ!{DPo>pChE z#xj^v(CG~MqueU;8o+78gHJy)_Rq-{31o**=aVKPm&oOO3@CmW)sMj8Jn~Jv1cW0Ua;m! zuCNS1Yf&)@Hf6DllP9o2gYQ=hA#^S)YQpB z88`_}X`<5WnYPc!bP0h4aI6w(bZIEH@WsR#_pYzzLCmukD!h?%LuMQ**cr=o^Au*N zAPdeuF0#S3VK=MW)i_=Xn!w7LE@m4&uyG?u{7q!v$kT?mv1NDE5TK90`Sjez*-V56 zQpwv~)8_pRu~%5oMl>r6;SIvI@INBGBHENsI&yUUgD#FRp{Q!eihvbsSAstm*BNz{ zz;N{hhPddQipEr$wKFjm!UvUR(EOQKtwdsIqwrQE;U1!bX2zNb92D2bROEb-G32ZR z8SB8_laFB%H4|C0ZmzG9>b@3yi4onnst+7?3bEA$HcD6Ypln9ETRE-pt88CyMGxKtxSqVE;6a)Ggj=1N!$hR_ zUpe_&c75rqNRnMIo?4l^Bg>)hsD{7 z8L2dE`b>X^(m+LMFiGtS6vmjkw^dqzP&ZV`7){%h1sX}i`Y`-#RMHtMW8Tp+0wF1d z3Io#Tr)}3OGl>N>G1A%GpS%L>s^xt*%!5qya*@l44FrJg7#&aDAQuk=w^j~o*F_VJ ziY2y>7OTZTNgj=ay)dq4Dg4*xUjW;IYrQ{)t@V{Z05Kc{CaxUfj1?`o(Rz_Q5DGc&R8cs~L>%TzUVG+j3gmZ0h}q@~s6$4JsL zNEN8=>d!O;_L20V5mQ+WCeq*)nQ3kJRc}^-?Cz0^T9Vj=)CCO{1+9Nso2FGMdJxE@ z&9|weyZ?y|PeCA6n#oGmptGm_}IxSPDDeXCr}xhh|>-=mz;hcW&BG#C9(QSqYs;kR=I>WIxixs&W}F+uNlMr8LZ(NQ@3Fay6XA186wzK49tUu(uZPs-ZL8`a=7dUs z7}fjjydn|GwuXJ0?Sh1J3O6FL`LQjbAd*z3A?Lpi9alWkO%d;z_Kr!({4MDOL#aw6 zX`}5}6kQlj7BFX(jIX*8cg(;-MRoD}Z~j_VNpYqqOWv1a42B9q^-&vH|9XoRs8)+# zL^$LA + @@ -18,30 +19,36 @@ - - - - - - -