From 226ad16242e8364bd18e5c255f55566a6b25c78e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 4 Jan 2018 14:36:41 -0500
Subject: [PATCH] Added underscore to font

---
 core/assets/ui/square.fnt                     |   3 ++-
 core/assets/ui/square.png                     | Bin 3950 -> 3959 bytes
 .../anuke/mindustry/input/DesktopInput.java   |   2 +-
 .../io/anuke/mindustry/ui/FileChooser.java    |   4 ----
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/assets/ui/square.fnt b/core/assets/ui/square.fnt
index 6749561308..85e2b5833c 100644
--- a/core/assets/ui/square.fnt
+++ b/core/assets/ui/square.fnt
@@ -1,7 +1,7 @@
 info face="5squared pixel Regular" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=-2,-2
 common lineHeight=44 base=36 scaleW=512 scaleH=512 pages=1 packed=0
 page id=0 file="square.png"
-chars count=296
+chars count=297
 char id=0       x=238  y=72   width=22   height=22   xoffset=-1   yoffset=15   xadvance=16   page=0    chnl=0 
 char id=32      x=0    y=0    width=0    height=0    xoffset=-1   yoffset=35   xadvance=8    page=0    chnl=0 
 char id=33      x=498  y=38   width=6    height=22   xoffset=-1   yoffset=15   xadvance=8    page=0    chnl=0 
@@ -298,4 +298,5 @@ char id=1102       x=146  y=233   width=20   height=20   xoffset=0   yoffset=16
 char id=1070       x=146  y=233   width=20   height=20   xoffset=0   yoffset=16   xadvance=24   page=0    chnl=0 
 char id=1103       x=178  y=233   width=16   height=20   xoffset=0   yoffset=16   xadvance=20   page=0    chnl=0 
 char id=1071       x=178  y=233   width=16   height=20   xoffset=0   yoffset=16   xadvance=20   page=0    chnl=0 
+char id=95       x=343  y=153   width=16   height=4   xoffset=0   yoffset=36   xadvance=20   page=0    chnl=0 
 kernings count=0
diff --git a/core/assets/ui/square.png b/core/assets/ui/square.png
index 8ccb05eac755db303032076ebc76f8e0ee142b9d..5d7842519338de8b9c0daf807408fcd9831145ad 100644
GIT binary patch
delta 2242
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
a!XnD(KSxTOTi8ex6gr-+elF{r5}E*~<!1;0

delta 2233
zcmew^_fBp?NWBo3b)n3SItB*5-<~dxAr-gY-o0J+SWAc@V8+z{|5Kkm^hx{bd3>A7
zDu&Lz_pSN_6_$h)>#{Q3@Y7v7<=U;~_p|rczE55Bb$&nlvTCileShZdddK@};a`vK
ztM1n?wO(>Jer@^N1I6Di{OUcGA6`3eM}Fkj-<toYzk0Y^X6ckq@*6L&XRM#cd*=Ph
z62CQl+$Yb=U;q8}`O+E83=Gji3=9nn3=B68UcAh(*iZ4a*LIzG_t$N_(f8+l)%~cT
zf2+%;MeWZGs9parX3M$r*#W!4=XV>e_#5}PE~GBp`}vpeUl|w<w6QQSC@?TElzk}u
z@O@L?!`rHNtu+7dzPEi>=HF|s>w@oY53UcJ8(jEh*W0wO_nX!UhrWCBtGZGiRj)0(
zLYB{y$!lJ3as8xyw|ZOq#h2S2JpU28D=@h=GWq1<PrIvjuToz>c`N_%t5qkW*2lAL
zy}#mD=H%D!OLl%ic16J#od$om{=HjVKSRyA=2?IJuB-2^_oV^Vr=r%+pL%~<$^Ca`
z%QLsdzYkw~H4+jCEDQ_>;`Xt{zh9ZGzdEA!%o?xh2Y%I_D!yoS+PJ#DaaM`_re{_*
zpLW)mUt7=4z#st8b>q|vONL`E$FJpIn{ji^#vQAZ=dWJw?ejP7`tQ5nTUVH8&tH71
z*0g@_>SC>FGozQVGccH`FfcGMGB9jt4lia1i*&F3Vzqj<>9gW*yG$+b?w)(OZu_@g
zr|LLzi~gqVEf2b6yP@WHkhPc3_Ov_O<0tV})(Kr+tNqlS9}?y)3}CQfVw9KW+P|hV
zzh2h4w|##7`Jy>9-YqQJ|L4Qk(sR?&%j$Q<Zl1C~eW%*9?XhS4U#u)-J|%f8ZvC}*
zcUu?R?R%|vZ|(l6EBXDcZ}pz2f5G$pGqy*5f1FXR@A!6|&Zj@TwSINUd<+aZ9t;c&
zObiSO?CZ;z{+K+QQ2Oik#S-V^9;bF(ezWQF+|pgwUtB)<YDv|M(s;M~*Tw!+`s$T?
zXUT`(u1^m6d3wq7%5Q%wzWy~^d2iFZ=U*;MU?hO-o}w!^(xpS<BbWbJTQuwLn?L8a
zz0RCE|J23Zb+*4M?PuR#^Ez$&`Zd93x1W^V(Yv>Q_4mpv#dq0k>#HDP3QC6eepY!{
zRy`M!`MWptnOn+L?=V}N`mM6AS1)IMoxPRcA#CU7Z;TRm_bqznu;!Xxc=r9(d-88T
zDFHdA50;WA*s>?ws5<7Fx>kN|^DArX|AEOTBh&6qzxnjsEp~-$Ki_M14DP2bcmG+v
z|NE_zzl%%bCkOsMcI83I7f1*>FfcH<NbTi!xKed&_ZsK^daL_(tM@HFCX#)jHYWE>
z{nf9BwoVDkTC4f<x9Ux)z<CXSt}Xb}cJ1)RBH15%r9%Eq__d>IztH>R7m9p*%5VI3
z<wp+u`^5}Z*Dt26-`-PJ^2Ty?+$*K8CcEX<JzF00XYak&@m~2)X2><jF))A}!2wPl
z4D}BlW@#?na?Q#A<?nlnFQ=zO2kct?Z2Lct?L2<p-<ICH68|^AUUkL2^y~g1yUJI$
zhkmyHwb$@f?Uk*UA7A}`XLeE9)M_Wo?B}&RUstD|`27DlU)wX}Jon+1$$=Gfk8kn|
zUw!ar*Qxib-={CF{`x)Z!uL~;z8bH(SO4_8-22{}%YDD?d!9D`Ugh>*d2_%1obo;N
zDl-EE2gIp4Pp`@}thsz|(<R&LyK91fxy}7ozAYyGb8YFlgDc8{nqRF}x!WH2wkl-T
z=GTcKf7capy^7s(^tQ76z2{X73<=Im;5^A-{bL^UgsuB_%lxU#-?e$a`7XJ*rN;HU
z?kqmGDLQCZ`0LuR-SejAMXs?ubE<y!opWK??4=*Sbs&N(!To+QgVTBL`p=&OU$<<&
zb~yfQe%Rl6XY0Snz1#e%c5CUix6jU>Uh`+#f^WvZf6lwQuJ7GnyVY|_1M1T6FTcIb
z-<E-4gCZl?SD>(ONMEsZ%BA{S@soLXr^#RYb>3dwZ~GsQ@4Mxk(x>nD+@8IB1M4N*
zuRoh#Eo9kxf7-=7y(RWb_T9JH9((>{!|!^t{iUt1_hho0zO-7pe4qQ@zZ`$81%G{i
zex!O)*|Y!a=g(wjV2~Dq7DWeF&t+KbXC7^OH+)W>>yy84ZDlvHExkVJvvvLJFK6$4
zN_+nO#ry5&%D%3$Nq-;gyURW`==Y4T`_7$8uh@MJ#h~lm^X>nN7$tu%zT$e@S@KR@
zxZ$dKuMWQ6y5!fHdBTNXzi+;58_geB%oO(X_r$5|&0f@f-S)r#=LHl)R$DSeCQpxi
z?el(9y<JIJ?K!>gD@yn7eYx(I-=g>F*Y0#${rI`Rs($h7>Z#wOuY4{qJyU<>et+cq
zpS!mt|3>7a>R+>J{%%g5;C@|r{@!<4Pxs8azhdLc%|Byv^BhB}S2V8^j;+6$d@r#2
z|MUgVldj#Fw8E0{;%~#4wbKLNcSpW|9{5x0Ykl2yNJ0Y@yr5`#vuaw9S9ZN`)SFpH
zBVOD8x0#T4ea%<l>y}ghU$Tte@=rgR@n_Z4JnK)N-yQpCb$9#MtzLHf>-i4cKf?$v
zyg>zx+{<e91A*3=uC@ABbJxs$<2Kh#bZ*_MH5)6F|1nfCFf=gRGV~OFS;Ne5p`Mw6
z;mk|M6TjxaUiJTR>|c}R3zv7vN<{zvTAcg|q!#2ZkeO{(R_qThN4#5M_%d+Qv31VR
zg7!#7n?K_N<>v*v*&8JOwS(CSZ{-?RCtu%ce0TBx#p~w2yyp73bekQc18TMKA?5%4
z(0ftZX2O#muZzn5AC>sAIQ)qJ{Kx+e=Kb5;$9088l$E_xOwf6?{VGtXc)I$ztaD0e
F0sw%JXT<;j

diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index fcba93111f..493f4c49de 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -27,7 +27,7 @@ public class DesktopInput extends InputHandler{
 	@Override public float getCursorX(){ return (int)(Graphics.screen(mousex, mousey).x + 2); }
 	@Override public float getCursorY(){ return (int)(Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y); }
 	@Override public boolean drawPlace(){ return !beganBreak; }
-	
+
 	@Override
 	public void update(){
 		if(player.isDead()) return;
diff --git a/core/src/io/anuke/mindustry/ui/FileChooser.java b/core/src/io/anuke/mindustry/ui/FileChooser.java
index f968c7d89b..76a5ec0570 100644
--- a/core/src/io/anuke/mindustry/ui/FileChooser.java
+++ b/core/src/io/anuke/mindustry/ui/FileChooser.java
@@ -132,9 +132,6 @@ public class FileChooser extends FloatingDialog{
 		content.top().left();
 		content.add(icontable).expandX().fillX();
 		content.row();
-		
-		//content.add(navigation).colspan(3).left().marginBottom(10f).expandX().fillX().height(40f);
-		//content.row();
 
 		content.center().add(pane).width(Gdx.graphics.getWidth()/Unit.dp.scl(2)).colspan(3).grow();
 		content.row();
@@ -147,7 +144,6 @@ public class FileChooser extends FloatingDialog{
 		content.add(buttons).growX();
 		
 		content().add(content);
-		//content().add(icontable).expandY().top();
 	}
 	
 	private void updateFileFieldStatus(){