From ec530458936441640e2ffe801f525eb6ba1f285b Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sat, 7 Mar 2020 13:26:46 -0500
Subject: [PATCH 01/41] eagle adjustments

---
 assets/common/npc_names.json                  |   4 ++
 .../voxel/bird_medium_center_manifest.ron     |  28 ++++++++++++++
 .../voxel/bird_medium_lateral_manifest.ron    |  36 ++++++++++++++++++
 .../voxygen/voxel/npc/eagle/female/head.vox   | Bin 0 -> 1608 bytes
 .../voxygen/voxel/npc/eagle/female/leg_l.vox  | Bin 0 -> 55651 bytes
 .../voxygen/voxel/npc/eagle/female/leg_r.vox  | Bin 0 -> 55651 bytes
 .../voxygen/voxel/npc/eagle/female/tail.vox   | Bin 0 -> 55651 bytes
 .../voxygen/voxel/npc/eagle/female/torso.vox  | Bin 0 -> 2168 bytes
 .../voxygen/voxel/npc/eagle/female/wing_l.vox | Bin 0 -> 56027 bytes
 .../voxygen/voxel/npc/eagle/female/wing_r.vox | Bin 0 -> 56027 bytes
 assets/voxygen/voxel/npc/eagle/male/head.vox  | Bin 0 -> 1608 bytes
 assets/voxygen/voxel/npc/eagle/male/leg_l.vox | Bin 0 -> 55651 bytes
 assets/voxygen/voxel/npc/eagle/male/leg_r.vox | Bin 0 -> 55651 bytes
 assets/voxygen/voxel/npc/eagle/male/tail.vox  | Bin 0 -> 55651 bytes
 assets/voxygen/voxel/npc/eagle/male/torso.vox | Bin 0 -> 2168 bytes
 .../voxygen/voxel/npc/eagle/male/wing_l.vox   | Bin 0 -> 56027 bytes
 .../voxygen/voxel/npc/eagle/male/wing_r.vox   | Bin 0 -> 56027 bytes
 .../quadruped_medium_central_manifest.ron     |   4 +-
 common/src/comp/body/bird_medium.rs           |   6 ++-
 voxygen/src/anim/bird_medium/mod.rs           |   5 +++
 20 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/head.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/leg_l.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/leg_r.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/tail.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/torso.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/wing_l.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/female/wing_r.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/head.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/leg_l.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/leg_r.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/tail.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/torso.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/wing_l.vox
 create mode 100644 assets/voxygen/voxel/npc/eagle/male/wing_r.vox

diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index f3fb272e08..d8bb02f0a7 100644
--- a/assets/common/npc_names.json
+++ b/assets/common/npc_names.json
@@ -459,6 +459,10 @@
             "peacock": {
                 "keyword": "peacock",
                 "generic": "Peacock"
+            },
+            "eagle": {
+                "keyword": "eagle",
+                "generic": "Eagle"
             }
         }
     },
diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron
index 8dde25c342..10451e3827 100644
--- a/assets/voxygen/voxel/bird_medium_center_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_center_manifest.ron
@@ -111,4 +111,32 @@
             center: ("npc.peacock.female.tail"),
         )
     ),
+    (Eagle, Male): (
+        head: (
+            offset: (-2.0, -2.0, -3.5),
+            center: ("npc.eagle.female.head"),
+        ),
+        torso: (
+            offset: (-3.0, -5.0, -4.5),
+            center: ("npc.eagle.female.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -2.5, -2.5),
+            center: ("npc.eagle.female.tail"),
+        )
+    ),
+    (Eagle, Female): (
+        head: (
+            offset: (-2.0, -2.0, -3.5),
+            center: ("npc.eagle.female.head"),
+        ),
+        torso: (
+            offset: (-3.0, -5.0, -4.5),
+            center: ("npc.eagle.female.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -2.5, -2.5),
+            center: ("npc.eagle.female.tail"),
+        )
+    ),
 })
\ No newline at end of file
diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
index 3fef62853c..a934c5695e 100644
--- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
@@ -143,4 +143,40 @@
             lateral: ("npc.peacock.female.leg_r"),
         )
     ),
+    (Eagle, Male): (
+        wing_l: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.male.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.male.leg_r"),
+        )
+    ),
+    (Eagle, Female): (
+        wing_l: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.female.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.female.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.female.leg_r"),
+        )
+    ),
 })
\ No newline at end of file
diff --git a/assets/voxygen/voxel/npc/eagle/female/head.vox b/assets/voxygen/voxel/npc/eagle/female/head.vox
new file mode 100644
index 0000000000000000000000000000000000000000..8f4195e5cead05b46a1faffcd78e87b46c0fdaad
GIT binary patch
literal 1608
zcmW;KF^(iP6vpvqyQ+poBy$5a;sz!_L@a8wtPmiv3|clJb51lV;hX@;M_{hdSMU`^
z;sg_|=+26ttE<2Ed*5@}|9<vwKfnL{?}+&E_1m8e@#Plr?(K)~KAVZpLZ8wNz5o5g
z+a(Kp{-XRUZ~123VkujpB#%{0=~dZcD_b_sCw(%#WlQ4NmMzP(JRep5&73pqJaHCh
zak`n_%A5Hrr)~Q$Q(4v$RMvG5N~v5^q)X0miBv8*#igWlNfen<=BY=%6nUEBMdpjM
zxQNrt%UnlXW?n8)tS2sWlqX}#3xDCy`ld$PdI?Htxkg^?Z~nSn66J+fHDfa7h1NyR
zGv+eA<x*z6&OPQ_d(1iVY`tv1!pqC7tBI31V<|_zUCTo2c8#)L!>B>}lCMcWQs(95
znu~f$*Bqp8k;}EH6=M{0)k`w!WjXRNZ@w35$-L$I%bRas9~Z=3*pJWHKmPlVs8QWN
zjz9N(2#251i9aftF5Nr73p&5^JAb~~_>JErjo<i&z49x+@++hAefQu8Kls6i!=d?f
zYE+4@F#HTW1JA%S@Emw}2A+Xu;2C%hWIO}Uz%%d+JjdU_Gw=*N1JA%S|JuMa@C-Zy
z&%lH3AnATPo{p#EIa+|H1L!vE7VZ`~+M?J69Z$#8@f@wf)A4jX9nbe)@cr$Mr{n2(
zI-ZVawzT8vcsibrr{g)=d~{~g%%>7xe;S^Kr{QUM8lK}g@H9LPM6+SD_;EyDY9=&E
z!_)NVI5s>DPs7vj{QBnW{fBS9+W&ZWa-@7b4Nt>!9Pe>Tvon)sK72eCPsLO5R6G^W
zaSiZPJQYvHQ}G;E15d?M@l+rc&v9KWR=rqFs*I{X^9oh{sdy@$il^c^uGMj4<|)n2
zOd1cKz!P`^Pv8kWUMD`Dz!P`^k0ptZC-4NGz+)TY;|V;0C&1X6_!bN=hlwxDXFAgp
zJ<<c+(~0irmg0q;=}b@bNDp*RC%U6siWhpOGd<BGJ<vU!=#FmpmzS6Q`T2Q2pU?Z#
f)6@R=__#kjJnZ-P_xtH|+VAe}_S@TAb0hu-R(r<n

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
new file mode 100644
index 0000000000000000000000000000000000000000..81faf4602562f8c5ec38cbf245d784484474dab9
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
new file mode 100644
index 0000000000000000000000000000000000000000..91a74bd020a174442ce3f488b62254d35a6bdd4a
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox
new file mode 100644
index 0000000000000000000000000000000000000000..4267a74e1a6f46a010db97a2284bdc23688ef564
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox
new file mode 100644
index 0000000000000000000000000000000000000000..013c0a0a70802054a19ddd5ba799031e8857dc01
GIT binary patch
literal 2168
zcmXYxL9UxM5XZ;%%=djk-Q)%+;s)*lv7#ubJRzvmlBz8WHkB9bSfE@XO5PgDM<7?o
z6?}zAoFILRO7HE=ZwyKQ8GAgQ`FZTux3AuP`Im_N^y2PkjC@=~-rRlo{+UnsOy~==
zLhs&xxO=V)_&f_DA%<g8G}$q&?7@QGr#T(N%8okQF(f^vsK>}!T8LpDk>WFB9<c0<
z*vPv2I%`2A`xEiuC`pcnB6Te3Nuu3{$X@a*dx8>AtS;$j%6dQ(W27rPi7_@fmUN25
z1guS-M^84h*ZHUuh!gf3{z(4FJo(;*Sn4K=<OwIGp89#+vaaMdBe&6qWW*bJe6OD!
zMr6@W0p2JP-b8NJ;ETa~0ONuZF%nM!7UQf!Ex|_WNTRO$u|m%k8IpiSiQ0kM0&DO-
zhX_MtFMM8y+9ojK557k40}O(6f}h$J61`&&dE!j}V}u{;b8JB3KH@bIhmC%B^hMd5
z+=l}GFs#1;&&?jJc>iWQMIYl6_L_2DkMX?J46vq&e6S0CUHsm#aGA5QCQ6@_y7+^y
z(^I8y$@|JXu*m%qqnuG-Nh^B7IIbAGPttt~-urY4Six$fE{dKP8<5a5@mz2x{F?Cl
zSv`h4>b><dVH0c7`;E0kFMP~d0(0?sn#eJKl4W{`*kto#M8W1yVVO7!>qv)XZDDPi
zpJbXJWS)56#GvFhPNy`_^wxbdXJj2kWFCW6A5+V0qQB%?QFk>x3Uiw#{tlL>U|thT
zt>|N<$aK0-#43A~HDMl<JxUBx@}=lC<|l(sSyRptIioobN~`%Py5{9Ep*XPzy?*)K
z3;F;5k3K%FfBxrhMg`^mx&6_5W7zm<72$6gN$*U1#a|gz{1t!2?^_H0g1;~+_zQka
z&-gR`j6dVZ`1#ibzu*`Af?wpnvivp*HIg<GG=c{TKMkG+PlKnyGw|SP@HBWDJPn?K
z3{Qin!PDSr@Qh=?)8J|FG<X_3ezXQpgQvmM;A!wcH%KbK6`l%Dg=e$?o(e#vSS4{K
z$!H6Ul|hB4!c*ZHt%9e*Q{k!b{O}cij$PrY@KkszJQW^qX@#f4Q{k!bRCq?4M`xVI
zzZv28*27caDex3{3OwUF;3@DFAPNNw$;TD3sSr?@6nF~#8P^6+fv3Pz;Q8g{H~q(N
zzwW=i*>a`$;VJMGc*gaPTk_60jeqg`mBW+a$?#-&GCboMz?0$0@ML&0JmYD=li|tm
zWI!@J<GGM5voRBtab)`APbkx$3{Qq9!;|3|&uY9Fza{UC)A04D29Lla@CZBt58Dxb
zcmy7SN8lkP!VizYBk%}3ltK965qJb10fy2DKM94+Lf{SO6<yF79nc=_&=zgb8p#b^
z(FL8+0qxNaZP5m;k=)P~UHYHDzwIA?eZ_c>c4&(>Xx(qOTfbhf{c^eV^ZDElheO}*
V_kFk9_3d`sH=9jguh+zi{0pPK5AXm0

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
new file mode 100644
index 0000000000000000000000000000000000000000..09c09530da78a2295daf17773d619f5edafc9735
GIT binary patch
literal 56027
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
bXisct<+Y`HbSGs@wigc_JmHkf5|I5bl#+^9

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
new file mode 100644
index 0000000000000000000000000000000000000000..99bb2d4a4b04cfac9e616f8abe87844eb7e5395c
GIT binary patch
literal 56027
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
aZ5rkDNbAujDQhw*JoMrzyHt{Z%zptVONyib

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/head.vox b/assets/voxygen/voxel/npc/eagle/male/head.vox
new file mode 100644
index 0000000000000000000000000000000000000000..8f4195e5cead05b46a1faffcd78e87b46c0fdaad
GIT binary patch
literal 1608
zcmW;KF^(iP6vpvqyQ+poBy$5a;sz!_L@a8wtPmiv3|clJb51lV;hX@;M_{hdSMU`^
z;sg_|=+26ttE<2Ed*5@}|9<vwKfnL{?}+&E_1m8e@#Plr?(K)~KAVZpLZ8wNz5o5g
z+a(Kp{-XRUZ~123VkujpB#%{0=~dZcD_b_sCw(%#WlQ4NmMzP(JRep5&73pqJaHCh
zak`n_%A5Hrr)~Q$Q(4v$RMvG5N~v5^q)X0miBv8*#igWlNfen<=BY=%6nUEBMdpjM
zxQNrt%UnlXW?n8)tS2sWlqX}#3xDCy`ld$PdI?Htxkg^?Z~nSn66J+fHDfa7h1NyR
zGv+eA<x*z6&OPQ_d(1iVY`tv1!pqC7tBI31V<|_zUCTo2c8#)L!>B>}lCMcWQs(95
znu~f$*Bqp8k;}EH6=M{0)k`w!WjXRNZ@w35$-L$I%bRas9~Z=3*pJWHKmPlVs8QWN
zjz9N(2#251i9aftF5Nr73p&5^JAb~~_>JErjo<i&z49x+@++hAefQu8Kls6i!=d?f
zYE+4@F#HTW1JA%S@Emw}2A+Xu;2C%hWIO}Uz%%d+JjdU_Gw=*N1JA%S|JuMa@C-Zy
z&%lH3AnATPo{p#EIa+|H1L!vE7VZ`~+M?J69Z$#8@f@wf)A4jX9nbe)@cr$Mr{n2(
zI-ZVawzT8vcsibrr{g)=d~{~g%%>7xe;S^Kr{QUM8lK}g@H9LPM6+SD_;EyDY9=&E
z!_)NVI5s>DPs7vj{QBnW{fBS9+W&ZWa-@7b4Nt>!9Pe>Tvon)sK72eCPsLO5R6G^W
zaSiZPJQYvHQ}G;E15d?M@l+rc&v9KWR=rqFs*I{X^9oh{sdy@$il^c^uGMj4<|)n2
zOd1cKz!P`^Pv8kWUMD`Dz!P`^k0ptZC-4NGz+)TY;|V;0C&1X6_!bN=hlwxDXFAgp
zJ<<c+(~0irmg0q;=}b@bNDp*RC%U6siWhpOGd<BGJ<vU!=#FmpmzS6Q`T2Q2pU?Z#
f)6@R=__#kjJnZ-P_xtH|+VAe}_S@TAb0hu-R(r<n

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox
new file mode 100644
index 0000000000000000000000000000000000000000..81faf4602562f8c5ec38cbf245d784484474dab9
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox
new file mode 100644
index 0000000000000000000000000000000000000000..91a74bd020a174442ce3f488b62254d35a6bdd4a
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox
new file mode 100644
index 0000000000000000000000000000000000000000..4267a74e1a6f46a010db97a2284bdc23688ef564
GIT binary patch
literal 55651
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

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox
new file mode 100644
index 0000000000000000000000000000000000000000..013c0a0a70802054a19ddd5ba799031e8857dc01
GIT binary patch
literal 2168
zcmXYxL9UxM5XZ;%%=djk-Q)%+;s)*lv7#ubJRzvmlBz8WHkB9bSfE@XO5PgDM<7?o
z6?}zAoFILRO7HE=ZwyKQ8GAgQ`FZTux3AuP`Im_N^y2PkjC@=~-rRlo{+UnsOy~==
zLhs&xxO=V)_&f_DA%<g8G}$q&?7@QGr#T(N%8okQF(f^vsK>}!T8LpDk>WFB9<c0<
z*vPv2I%`2A`xEiuC`pcnB6Te3Nuu3{$X@a*dx8>AtS;$j%6dQ(W27rPi7_@fmUN25
z1guS-M^84h*ZHUuh!gf3{z(4FJo(;*Sn4K=<OwIGp89#+vaaMdBe&6qWW*bJe6OD!
zMr6@W0p2JP-b8NJ;ETa~0ONuZF%nM!7UQf!Ex|_WNTRO$u|m%k8IpiSiQ0kM0&DO-
zhX_MtFMM8y+9ojK557k40}O(6f}h$J61`&&dE!j}V}u{;b8JB3KH@bIhmC%B^hMd5
z+=l}GFs#1;&&?jJc>iWQMIYl6_L_2DkMX?J46vq&e6S0CUHsm#aGA5QCQ6@_y7+^y
z(^I8y$@|JXu*m%qqnuG-Nh^B7IIbAGPttt~-urY4Six$fE{dKP8<5a5@mz2x{F?Cl
zSv`h4>b><dVH0c7`;E0kFMP~d0(0?sn#eJKl4W{`*kto#M8W1yVVO7!>qv)XZDDPi
zpJbXJWS)56#GvFhPNy`_^wxbdXJj2kWFCW6A5+V0qQB%?QFk>x3Uiw#{tlL>U|thT
zt>|N<$aK0-#43A~HDMl<JxUBx@}=lC<|l(sSyRptIioobN~`%Py5{9Ep*XPzy?*)K
z3;F;5k3K%FfBxrhMg`^mx&6_5W7zm<72$6gN$*U1#a|gz{1t!2?^_H0g1;~+_zQka
z&-gR`j6dVZ`1#ibzu*`Af?wpnvivp*HIg<GG=c{TKMkG+PlKnyGw|SP@HBWDJPn?K
z3{Qin!PDSr@Qh=?)8J|FG<X_3ezXQpgQvmM;A!wcH%KbK6`l%Dg=e$?o(e#vSS4{K
z$!H6Ul|hB4!c*ZHt%9e*Q{k!b{O}cij$PrY@KkszJQW^qX@#f4Q{k!bRCq?4M`xVI
zzZv28*27caDex3{3OwUF;3@DFAPNNw$;TD3sSr?@6nF~#8P^6+fv3Pz;Q8g{H~q(N
zzwW=i*>a`$;VJMGc*gaPTk_60jeqg`mBW+a$?#-&GCboMz?0$0@ML&0JmYD=li|tm
zWI!@J<GGM5voRBtab)`APbkx$3{Qq9!;|3|&uY9Fza{UC)A04D29Lla@CZBt58Dxb
zcmy7SN8lkP!VizYBk%}3ltK965qJb10fy2DKM94+Lf{SO6<yF79nc=_&=zgb8p#b^
z(FL8+0qxNaZP5m;k=)P~UHYHDzwIA?eZ_c>c4&(>Xx(qOTfbhf{c^eV^ZDElheO}*
V_kFk9_3d`sH=9jguh+zi{0pPK5AXm0

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox
new file mode 100644
index 0000000000000000000000000000000000000000..09c09530da78a2295daf17773d619f5edafc9735
GIT binary patch
literal 56027
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
bXisct<+Y`HbSGs@wigc_JmHkf5|I5bl#+^9

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox
new file mode 100644
index 0000000000000000000000000000000000000000..99bb2d4a4b04cfac9e616f8abe87844eb7e5395c
GIT binary patch
literal 56027
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
aZ5rkDNbAujDQhw*JoMrzyHt{Z%zptVONyib

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
index 6afce36256..8e3d3b12d6 100644
--- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
@@ -386,7 +386,7 @@
             central: ("npc.lion.male.ears"),
         ),
         tail: (
-            offset: (-0.5, -1.0, -8.0),
+            offset: (-0.5, -1.0, -1.0),
             central: ("npc.lion.male.tail"),
         ),
     ),
@@ -417,7 +417,7 @@
         ),
         tail: (
             offset: (-0.5, -1.0, -1.0),
-            central: ("npc.lion.male.tail"),
+            central: ("npc.lion.female.tail"),
         ),
     ),
     (Tarasque, Male): (
diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs
index 477250c767..6447925f3a 100644
--- a/common/src/comp/body/bird_medium.rs
+++ b/common/src/comp/body/bird_medium.rs
@@ -31,6 +31,7 @@ pub enum Species {
     Chicken = 1,
     Goose = 2,
     Peacock = 3,
+    Eagle = 4,
 }
 
 /// Data representing per-species generic data.
@@ -42,6 +43,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub chicken: SpeciesMeta,
     pub goose: SpeciesMeta,
     pub peacock: SpeciesMeta,
+    pub eagle: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -54,15 +56,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Chicken => &self.chicken,
             Species::Goose => &self.goose,
             Species::Peacock => &self.peacock,
+            Species::Eagle => &self.eagle,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 4] = [
+pub const ALL_SPECIES: [Species; 5] = [
     Species::Duck,
     Species::Chicken,
     Species::Goose,
     Species::Peacock,
+    Species::Eagle,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
diff --git a/voxygen/src/anim/bird_medium/mod.rs b/voxygen/src/anim/bird_medium/mod.rs
index d5e7832e74..a3ac5dc4a7 100644
--- a/voxygen/src/anim/bird_medium/mod.rs
+++ b/voxygen/src/anim/bird_medium/mod.rs
@@ -103,30 +103,35 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Chicken, _) => (4.0, 3.0),
                 (Goose, _) => (5.0, 5.0),
                 (Peacock, _) => (4.0, 7.0),
+                (Eagle, _) => (3.5, 5.0),
             },
             chest: match (body.species, body.body_type) {
                 (Duck, _) => (0.0, 5.0),
                 (Chicken, _) => (0.0, 5.0),
                 (Goose, _) => (0.0, 8.0),
                 (Peacock, _) => (0.0, 10.0),
+                (Eagle, _) => (0.0, 8.0),
             },
             tail: match (body.species, body.body_type) {
                 (Duck, _) => (-3.0, 1.5),
                 (Chicken, _) => (-3.0, 1.5),
                 (Goose, _) => (-5.0, 3.0),
                 (Peacock, _) => (-5.5, 2.0),
+                (Eagle, _) => (-4.5, -5.0),
             },
             wing: match (body.species, body.body_type) {
                 (Duck, _) => (2.75, 0.0, 6.0),
                 (Chicken, _) => (2.75, 0.0, 6.0),
                 (Goose, _) => (3.75, -1.0, 9.0),
                 (Peacock, _) => (3.0, 0.0, 9.0),
+                (Eagle, _) => (3.0, -8.0, 4.0),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.0, -1.5, 4.0),
                 (Chicken, _) => (2.0, -1.5, 4.0),
                 (Goose, _) => (2.0, -1.5, 7.0),
                 (Peacock, _) => (2.0, -2.5, 8.0),
+                (Eagle, _) => (2.0, -2.0, 8.0),
             },
         }
     }

From e7d2f2c465b3baf4b5d118e56fd34622b9e87a3e Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sat, 7 Mar 2020 22:14:21 +0000
Subject: [PATCH 02/41] Janky fix of the logout timeout problem

---
 client/src/lib.rs         |  3 ++-
 common/src/msg/mod.rs     |  1 +
 server/src/sys/message.rs |  7 +++++++
 voxygen/src/session.rs    | 31 +++++++++++++++++++++++--------
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 5bb2068dc6..6a7239e606 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -197,7 +197,7 @@ impl Client {
     /// Send disconnect message to the server
     pub fn request_logout(&mut self) {
         self.postbox.send_message(ClientMsg::Disconnect);
-        self.client_state = ClientState::Pending;
+        self.client_state = ClientState::Disconnected;
     }
 
     /// Request a state transition to `ClientState::Registered` from an ingame
@@ -703,6 +703,7 @@ impl Client {
                     },
                     ServerMsg::Disconnect => {
                         frontend_events.push(Event::Disconnect);
+                        self.client_state = ClientState::Disconnected;
                     },
                 }
             }
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index 1baee67e15..411763607f 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -16,6 +16,7 @@ pub enum ClientState {
     Registered,
     Spectator,
     Character,
+    Disconnected,
 }
 
 pub const MAX_BYTES_CHAT_MSG: usize = 256;
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index f68d32f9e6..6fbf50e840 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -111,6 +111,7 @@ impl<'a> System<'a> for Sys {
                             server_emitter.emit(ServerEvent::ExitIngame { entity });
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request spectator state
                     ClientMsg::Spectate => match client.client_state {
@@ -121,6 +122,7 @@ impl<'a> System<'a> for Sys {
                             client.allow_state(ClientState::Spectator)
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Valid player
                     ClientMsg::Register { player, password } if player.is_valid() => {
@@ -187,6 +189,7 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Character => client.error_state(RequestStateError::Already),
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControllerInputs(inputs) => match client.client_state {
                         ClientState::Connected
@@ -200,6 +203,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControlEvent(event) => match client.client_state {
                         ClientState::Connected
@@ -213,6 +217,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ChatMsg { message } => match client.client_state {
                         ClientState::Connected => client.error_state(RequestStateError::Impossible),
@@ -227,6 +232,7 @@ impl<'a> System<'a> for Sys {
                             ),
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::PlayerPhysics { pos, vel, ori } => match client.client_state {
                         ClientState::Character => {
@@ -267,6 +273,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Always possible.
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index cf47210669..234db82d4f 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -33,6 +33,14 @@ pub struct SessionState {
     selected_block: Block,
 }
 
+/// The action to perform after a tick
+enum TickAction {
+    // Continue executing
+    Continue,
+    // Disconnected (i.e. go to main menu)
+    Disconnect,
+}
+
 /// Represents an active game session (i.e., the one being played).
 impl SessionState {
     /// Create a new `SessionState`.
@@ -65,7 +73,7 @@ impl SessionState {
 
 impl SessionState {
     /// Tick the session (and the client attached to it).
-    fn tick(&mut self, dt: Duration) -> Result<(), Error> {
+    fn tick(&mut self, dt: Duration) -> Result<TickAction, Error> {
         self.inputs.tick(dt);
         for event in self.client.borrow_mut().tick(
             self.inputs.clone(),
@@ -79,7 +87,10 @@ impl SessionState {
                 } => {
                     self.hud.new_message(event);
                 },
-                client::Event::Disconnect => {}, // TODO
+                client::Event::Disconnect => {
+                    log::warn!("disconnect");
+                    return Ok(TickAction::Disconnect);
+                },
                 client::Event::DisconnectionNotification(time) => {
                     let message = match time {
                         0 => String::from("Goodbye!"),
@@ -94,7 +105,7 @@ impl SessionState {
             }
         }
 
-        Ok(())
+        Ok(TickAction::Continue)
     }
 
     /// Clean up the session (and the client attached to it) after a tick.
@@ -390,12 +401,16 @@ impl PlayState for SessionState {
                 || !global_state.singleplayer.as_ref().unwrap().is_paused()
             {
                 // Perform an in-game tick.
-                if let Err(err) = self.tick(clock.get_avg_delta()) {
-                    global_state.info_message =
-                        Some(localized_strings.get("common.connection_lost").to_owned());
-                    error!("[session] Failed to tick the scene: {:?}", err);
+                match self.tick(clock.get_avg_delta()) {
+                    Ok(TickAction::Continue) => {}, // Do nothing
+                    Ok(TickAction::Disconnect) => return PlayStateResult::Pop, // Go to main menu
+                    Err(err) => {
+                        global_state.info_message =
+                            Some(localized_strings.get("common.connection_lost").to_owned());
+                        error!("[session] Failed to tick the scene: {:?}", err);
 
-                    return PlayStateResult::Pop;
+                        return PlayStateResult::Pop;
+                    },
                 }
             }
 

From dcf049ed1394e5648159fc745fb2e12ee4bc83ca Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 08:06:22 +0000
Subject: [PATCH 03/41] Proper fix to the logout timeout problem using
 Disconnect ACK

---
 client/src/lib.rs                      | 10 +++++++++-
 common/src/msg/client.rs               |  1 +
 server/src/sys/message.rs              |  4 +++-
 voxygen/src/menu/char_selection/mod.rs |  7 ++++++-
 voxygen/src/session.rs                 | 21 +++++++++------------
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 6a7239e606..c44c787e6b 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -77,6 +77,8 @@ pub struct Client {
     loaded_distance: f32,
 
     pending_chunks: HashMap<Vec2<i32>, Instant>,
+
+    disconnected: bool,
 }
 
 impl Client {
@@ -163,6 +165,8 @@ impl Client {
             loaded_distance: 0.0,
 
             pending_chunks: HashMap::new(),
+
+            disconnected: false,
         })
     }
 
@@ -702,8 +706,9 @@ impl Client {
                         );
                     },
                     ServerMsg::Disconnect => {
+                        self.disconnected = true;
                         frontend_events.push(Event::Disconnect);
-                        self.client_state = ClientState::Disconnected;
+                        self.postbox.send_message(ClientMsg::Terminate);
                     },
                 }
             }
@@ -716,6 +721,9 @@ impl Client {
         Ok(frontend_events)
     }
 
+    // Get's whether or not the client just disconnected
+    pub fn disconnected(&self) -> bool { self.disconnected }
+
     /// Get the player's entity.
     pub fn entity(&self) -> EcsEntity { self.entity }
 
diff --git a/common/src/msg/client.rs b/common/src/msg/client.rs
index b4022483ad..4ef051ef60 100644
--- a/common/src/msg/client.rs
+++ b/common/src/msg/client.rs
@@ -35,4 +35,5 @@ pub enum ClientMsg {
         key: Vec2<i32>,
     },
     Disconnect,
+    Terminate,
 }
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 6fbf50e840..b040b20a2d 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -281,6 +281,9 @@ impl<'a> System<'a> for Sys {
                     ClientMsg::Disconnect => {
                         disconnect = true;
                     },
+                    ClientMsg::Terminate => {
+                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
+                    },
                 }
             }
 
@@ -295,7 +298,6 @@ impl<'a> System<'a> for Sys {
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
                     ));
                 }
-                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                 client.postbox.send_message(ServerMsg::Disconnect);
             }
         }
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index f7eaae27c2..0931126e37 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -39,6 +39,11 @@ impl PlayState for CharSelectionState {
         // Set up an fps clock.
         let mut clock = Clock::start();
 
+        // Check if we just disconnected, if so go to main menu
+        if self.client.borrow().disconnected() {
+            return PlayStateResult::Pop;
+        }
+
         let mut current_client_state = self.client.borrow().get_client_state();
         while let ClientState::Pending | ClientState::Registered = current_client_state {
             // Handle window events
@@ -141,7 +146,7 @@ impl PlayState for CharSelectionState {
             ) {
                 global_state.info_message =
                     Some(localized_strings.get("common.connection_lost").to_owned());
-                error!("[session] Failed to tick the scene: {:?}", err);
+                error!("[char_selection] Failed to tick the scene: {:?}", err);
 
                 return PlayStateResult::Pop;
             }
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 234db82d4f..7e36d44543 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -24,6 +24,14 @@ use specs::{Join, WorldExt};
 use std::{cell::RefCell, rc::Rc, time::Duration};
 use vek::*;
 
+/// The action to perform after a tick
+enum TickAction {
+    // Continue executing
+    Continue,
+    // Disconnected (i.e. go to main menu)
+    Disconnect,
+}
+
 pub struct SessionState {
     scene: Scene,
     client: Rc<RefCell<Client>>,
@@ -33,14 +41,6 @@ pub struct SessionState {
     selected_block: Block,
 }
 
-/// The action to perform after a tick
-enum TickAction {
-    // Continue executing
-    Continue,
-    // Disconnected (i.e. go to main menu)
-    Disconnect,
-}
-
 /// Represents an active game session (i.e., the one being played).
 impl SessionState {
     /// Create a new `SessionState`.
@@ -87,10 +87,7 @@ impl SessionState {
                 } => {
                     self.hud.new_message(event);
                 },
-                client::Event::Disconnect => {
-                    log::warn!("disconnect");
-                    return Ok(TickAction::Disconnect);
-                },
+                client::Event::Disconnect => return Ok(TickAction::Disconnect),
                 client::Event::DisconnectionNotification(time) => {
                     let message = match time {
                         0 => String::from("Goodbye!"),

From db3b1ac9045cdbe7e94211282a08a2d2d7cf5936 Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 08:54:29 +0000
Subject: [PATCH 04/41] Fix the spam on disconnect

---
 client/src/lib.rs         | 5 +----
 common/src/msg/mod.rs     | 1 -
 server/src/sys/message.rs | 9 +--------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index c44c787e6b..aa2447ce30 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -199,10 +199,7 @@ impl Client {
     }
 
     /// Send disconnect message to the server
-    pub fn request_logout(&mut self) {
-        self.postbox.send_message(ClientMsg::Disconnect);
-        self.client_state = ClientState::Disconnected;
-    }
+    pub fn request_logout(&mut self) { self.postbox.send_message(ClientMsg::Disconnect); }
 
     /// Request a state transition to `ClientState::Registered` from an ingame
     /// state.
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index 411763607f..1baee67e15 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -16,7 +16,6 @@ pub enum ClientState {
     Registered,
     Spectator,
     Character,
-    Disconnected,
 }
 
 pub const MAX_BYTES_CHAT_MSG: usize = 256;
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index b040b20a2d..d86101687e 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -91,7 +91,7 @@ impl<'a> System<'a> for Sys {
                 || client.postbox.error().is_some()
             // Postbox error
             {
-                disconnect = true;
+                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
             } else if time - client.last_ping > CLIENT_TIMEOUT * 0.5 {
                 // Try pinging the client if the timeout is nearing.
                 client.postbox.send_message(ServerMsg::Ping);
@@ -111,7 +111,6 @@ impl<'a> System<'a> for Sys {
                             server_emitter.emit(ServerEvent::ExitIngame { entity });
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request spectator state
                     ClientMsg::Spectate => match client.client_state {
@@ -122,7 +121,6 @@ impl<'a> System<'a> for Sys {
                             client.allow_state(ClientState::Spectator)
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Valid player
                     ClientMsg::Register { player, password } if player.is_valid() => {
@@ -189,7 +187,6 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Character => client.error_state(RequestStateError::Already),
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControllerInputs(inputs) => match client.client_state {
                         ClientState::Connected
@@ -203,7 +200,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControlEvent(event) => match client.client_state {
                         ClientState::Connected
@@ -217,7 +213,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ChatMsg { message } => match client.client_state {
                         ClientState::Connected => client.error_state(RequestStateError::Impossible),
@@ -232,7 +227,6 @@ impl<'a> System<'a> for Sys {
                             ),
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::PlayerPhysics { pos, vel, ori } => match client.client_state {
                         ClientState::Character => {
@@ -273,7 +267,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Always possible.
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),

From a3ceac99c3f8f837fd8d6eec8014df3c6027ed4b Mon Sep 17 00:00:00 2001
From: Snow <robin.gilh@gmail.com>
Date: Sun, 8 Mar 2020 15:07:47 +0000
Subject: [PATCH 05/41] more eagle adjustements

---
 .../voxel/bird_medium_center_manifest.ron     |   8 ++++----
 .../voxygen/voxel/npc/eagle/female/tail.vox   | Bin 55651 -> 55675 bytes
 .../voxygen/voxel/npc/eagle/female/torso.vox  | Bin 2168 -> 56619 bytes
 assets/voxygen/voxel/npc/eagle/male/tail.vox  | Bin 55651 -> 55675 bytes
 assets/voxygen/voxel/npc/eagle/male/torso.vox | Bin 2168 -> 56619 bytes
 voxygen/src/anim/bird_medium/mod.rs           |   4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron
index 10451e3827..6951c0e7af 100644
--- a/assets/voxygen/voxel/bird_medium_center_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_center_manifest.ron
@@ -117,11 +117,11 @@
             center: ("npc.eagle.female.head"),
         ),
         torso: (
-            offset: (-3.0, -5.0, -4.5),
+            offset: (-3.0, -4.5, -4.5),
             center: ("npc.eagle.female.torso"),
         ),
         tail: (
-            offset: (-2.0, -2.5, -2.5),
+            offset: (-2.0, -3.5, -3.5),
             center: ("npc.eagle.female.tail"),
         )
     ),
@@ -131,11 +131,11 @@
             center: ("npc.eagle.female.head"),
         ),
         torso: (
-            offset: (-3.0, -5.0, -4.5),
+            offset: (-3.0, -4.5, -4.5),
             center: ("npc.eagle.female.torso"),
         ),
         tail: (
-            offset: (-2.0, -2.5, -2.5),
+            offset: (-2.0, -3.5, -3.5),
             center: ("npc.eagle.female.tail"),
         )
     ),
diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox
index 4267a74e1a6f46a010db97a2284bdc23688ef564..b6fd1e02c362221c818f7214b345b89d7ceb80d8 100644
GIT binary patch
delta 159
zcmWm5F$w}v420pC<h^IT*jQM26-x_O5Ruhdu=5J`NoC_b+|z9DF>IU-eEcDh@94kL
zyYpe#yaDXDyI#Tl)h(Y3EwkZr-QDJ^W+h&0TCHL3LHDFtm|3EfWGUgQ&43_~Mh3~G
b{-8g!mTWCdbrr1!#l+=tI`(VelhgDEpIaO7

delta 127
zcmWm3u?@md3<S_S-)De?1z3eL5|AzmH0<+TrAfmSWEx5&#-Pc4OHX&U|C@fBx@nwG
zD}d{HxH&K`-SK&FY3BQ5xU{RMw*V@EjEKsJR8bA1!6aoE<=v@L{4Yr-S|^j_`}O_o
Dn!gqS

diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox
index 013c0a0a70802054a19ddd5ba799031e8857dc01..778ac8b39be95d814419160cfc943ec3779dc73e 100644
GIT binary patch
literal 56619
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
bL(4`LKk|C~N!ps;Zod5Dp=!Nu0lohPzmMx`

literal 2168
zcmXYxL9UxM5XZ;%%=djk-Q)%+;s)*lv7#ubJRzvmlBz8WHkB9bSfE@XO5PgDM<7?o
z6?}zAoFILRO7HE=ZwyKQ8GAgQ`FZTux3AuP`Im_N^y2PkjC@=~-rRlo{+UnsOy~==
zLhs&xxO=V)_&f_DA%<g8G}$q&?7@QGr#T(N%8okQF(f^vsK>}!T8LpDk>WFB9<c0<
z*vPv2I%`2A`xEiuC`pcnB6Te3Nuu3{$X@a*dx8>AtS;$j%6dQ(W27rPi7_@fmUN25
z1guS-M^84h*ZHUuh!gf3{z(4FJo(;*Sn4K=<OwIGp89#+vaaMdBe&6qWW*bJe6OD!
zMr6@W0p2JP-b8NJ;ETa~0ONuZF%nM!7UQf!Ex|_WNTRO$u|m%k8IpiSiQ0kM0&DO-
zhX_MtFMM8y+9ojK557k40}O(6f}h$J61`&&dE!j}V}u{;b8JB3KH@bIhmC%B^hMd5
z+=l}GFs#1;&&?jJc>iWQMIYl6_L_2DkMX?J46vq&e6S0CUHsm#aGA5QCQ6@_y7+^y
z(^I8y$@|JXu*m%qqnuG-Nh^B7IIbAGPttt~-urY4Six$fE{dKP8<5a5@mz2x{F?Cl
zSv`h4>b><dVH0c7`;E0kFMP~d0(0?sn#eJKl4W{`*kto#M8W1yVVO7!>qv)XZDDPi
zpJbXJWS)56#GvFhPNy`_^wxbdXJj2kWFCW6A5+V0qQB%?QFk>x3Uiw#{tlL>U|thT
zt>|N<$aK0-#43A~HDMl<JxUBx@}=lC<|l(sSyRptIioobN~`%Py5{9Ep*XPzy?*)K
z3;F;5k3K%FfBxrhMg`^mx&6_5W7zm<72$6gN$*U1#a|gz{1t!2?^_H0g1;~+_zQka
z&-gR`j6dVZ`1#ibzu*`Af?wpnvivp*HIg<GG=c{TKMkG+PlKnyGw|SP@HBWDJPn?K
z3{Qin!PDSr@Qh=?)8J|FG<X_3ezXQpgQvmM;A!wcH%KbK6`l%Dg=e$?o(e#vSS4{K
z$!H6Ul|hB4!c*ZHt%9e*Q{k!b{O}cij$PrY@KkszJQW^qX@#f4Q{k!bRCq?4M`xVI
zzZv28*27caDex3{3OwUF;3@DFAPNNw$;TD3sSr?@6nF~#8P^6+fv3Pz;Q8g{H~q(N
zzwW=i*>a`$;VJMGc*gaPTk_60jeqg`mBW+a$?#-&GCboMz?0$0@ML&0JmYD=li|tm
zWI!@J<GGM5voRBtab)`APbkx$3{Qq9!;|3|&uY9Fza{UC)A04D29Lla@CZBt58Dxb
zcmy7SN8lkP!VizYBk%}3ltK965qJb10fy2DKM94+Lf{SO6<yF79nc=_&=zgb8p#b^
z(FL8+0qxNaZP5m;k=)P~UHYHDzwIA?eZ_c>c4&(>Xx(qOTfbhf{c^eV^ZDElheO}*
V_kFk9_3d`sH=9jguh+zi{0pPK5AXm0

diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox
index 4267a74e1a6f46a010db97a2284bdc23688ef564..b6fd1e02c362221c818f7214b345b89d7ceb80d8 100644
GIT binary patch
delta 159
zcmWm5F$w}v420pC<h^IT*jQM26-x_O5Ruhdu=5J`NoC_b+|z9DF>IU-eEcDh@94kL
zyYpe#yaDXDyI#Tl)h(Y3EwkZr-QDJ^W+h&0TCHL3LHDFtm|3EfWGUgQ&43_~Mh3~G
b{-8g!mTWCdbrr1!#l+=tI`(VelhgDEpIaO7

delta 127
zcmWm3u?@md3<S_S-)De?1z3eL5|AzmH0<+TrAfmSWEx5&#-Pc4OHX&U|C@fBx@nwG
zD}d{HxH&K`-SK&FY3BQ5xU{RMw*V@EjEKsJR8bA1!6aoE<=v@L{4Yr-S|^j_`}O_o
Dn!gqS

diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox
index 013c0a0a70802054a19ddd5ba799031e8857dc01..778ac8b39be95d814419160cfc943ec3779dc73e 100644
GIT binary patch
literal 56619
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
bL(4`LKk|C~N!ps;Zod5Dp=!Nu0lohPzmMx`

literal 2168
zcmXYxL9UxM5XZ;%%=djk-Q)%+;s)*lv7#ubJRzvmlBz8WHkB9bSfE@XO5PgDM<7?o
z6?}zAoFILRO7HE=ZwyKQ8GAgQ`FZTux3AuP`Im_N^y2PkjC@=~-rRlo{+UnsOy~==
zLhs&xxO=V)_&f_DA%<g8G}$q&?7@QGr#T(N%8okQF(f^vsK>}!T8LpDk>WFB9<c0<
z*vPv2I%`2A`xEiuC`pcnB6Te3Nuu3{$X@a*dx8>AtS;$j%6dQ(W27rPi7_@fmUN25
z1guS-M^84h*ZHUuh!gf3{z(4FJo(;*Sn4K=<OwIGp89#+vaaMdBe&6qWW*bJe6OD!
zMr6@W0p2JP-b8NJ;ETa~0ONuZF%nM!7UQf!Ex|_WNTRO$u|m%k8IpiSiQ0kM0&DO-
zhX_MtFMM8y+9ojK557k40}O(6f}h$J61`&&dE!j}V}u{;b8JB3KH@bIhmC%B^hMd5
z+=l}GFs#1;&&?jJc>iWQMIYl6_L_2DkMX?J46vq&e6S0CUHsm#aGA5QCQ6@_y7+^y
z(^I8y$@|JXu*m%qqnuG-Nh^B7IIbAGPttt~-urY4Six$fE{dKP8<5a5@mz2x{F?Cl
zSv`h4>b><dVH0c7`;E0kFMP~d0(0?sn#eJKl4W{`*kto#M8W1yVVO7!>qv)XZDDPi
zpJbXJWS)56#GvFhPNy`_^wxbdXJj2kWFCW6A5+V0qQB%?QFk>x3Uiw#{tlL>U|thT
zt>|N<$aK0-#43A~HDMl<JxUBx@}=lC<|l(sSyRptIioobN~`%Py5{9Ep*XPzy?*)K
z3;F;5k3K%FfBxrhMg`^mx&6_5W7zm<72$6gN$*U1#a|gz{1t!2?^_H0g1;~+_zQka
z&-gR`j6dVZ`1#ibzu*`Af?wpnvivp*HIg<GG=c{TKMkG+PlKnyGw|SP@HBWDJPn?K
z3{Qin!PDSr@Qh=?)8J|FG<X_3ezXQpgQvmM;A!wcH%KbK6`l%Dg=e$?o(e#vSS4{K
z$!H6Ul|hB4!c*ZHt%9e*Q{k!b{O}cij$PrY@KkszJQW^qX@#f4Q{k!bRCq?4M`xVI
zzZv28*27caDex3{3OwUF;3@DFAPNNw$;TD3sSr?@6nF~#8P^6+fv3Pz;Q8g{H~q(N
zzwW=i*>a`$;VJMGc*gaPTk_60jeqg`mBW+a$?#-&GCboMz?0$0@ML&0JmYD=li|tm
zWI!@J<GGM5voRBtab)`APbkx$3{Qq9!;|3|&uY9Fza{UC)A04D29Lla@CZBt58Dxb
zcmy7SN8lkP!VizYBk%}3ltK965qJb10fy2DKM94+Lf{SO6<yF79nc=_&=zgb8p#b^
z(FL8+0qxNaZP5m;k=)P~UHYHDzwIA?eZ_c>c4&(>Xx(qOTfbhf{c^eV^ZDElheO}*
V_kFk9_3d`sH=9jguh+zi{0pPK5AXm0

diff --git a/voxygen/src/anim/bird_medium/mod.rs b/voxygen/src/anim/bird_medium/mod.rs
index a3ac5dc4a7..8e15bdaef2 100644
--- a/voxygen/src/anim/bird_medium/mod.rs
+++ b/voxygen/src/anim/bird_medium/mod.rs
@@ -117,14 +117,14 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Chicken, _) => (-3.0, 1.5),
                 (Goose, _) => (-5.0, 3.0),
                 (Peacock, _) => (-5.5, 2.0),
-                (Eagle, _) => (-4.5, -5.0),
+                (Eagle, _) => (-8.0, -4.0),
             },
             wing: match (body.species, body.body_type) {
                 (Duck, _) => (2.75, 0.0, 6.0),
                 (Chicken, _) => (2.75, 0.0, 6.0),
                 (Goose, _) => (3.75, -1.0, 9.0),
                 (Peacock, _) => (3.0, 0.0, 9.0),
-                (Eagle, _) => (3.0, -8.0, 4.0),
+                (Eagle, _) => (3.0, -8.0, 5.0),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.0, -1.5, 4.0),

From 279fb486a3719e19f0b382cb0013d1129624c5db Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 20:31:27 +0000
Subject: [PATCH 06/41] Switch states instead of popping

---
 client/src/lib.rs                      | 8 --------
 voxygen/src/menu/char_selection/mod.rs | 7 +------
 voxygen/src/session.rs                 | 8 ++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index aa2447ce30..e071c566e5 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -77,8 +77,6 @@ pub struct Client {
     loaded_distance: f32,
 
     pending_chunks: HashMap<Vec2<i32>, Instant>,
-
-    disconnected: bool,
 }
 
 impl Client {
@@ -165,8 +163,6 @@ impl Client {
             loaded_distance: 0.0,
 
             pending_chunks: HashMap::new(),
-
-            disconnected: false,
         })
     }
 
@@ -703,7 +699,6 @@ impl Client {
                         );
                     },
                     ServerMsg::Disconnect => {
-                        self.disconnected = true;
                         frontend_events.push(Event::Disconnect);
                         self.postbox.send_message(ClientMsg::Terminate);
                     },
@@ -718,9 +713,6 @@ impl Client {
         Ok(frontend_events)
     }
 
-    // Get's whether or not the client just disconnected
-    pub fn disconnected(&self) -> bool { self.disconnected }
-
     /// Get the player's entity.
     pub fn entity(&self) -> EcsEntity { self.entity }
 
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index 0931126e37..23b43d7eb9 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -39,11 +39,6 @@ impl PlayState for CharSelectionState {
         // Set up an fps clock.
         let mut clock = Clock::start();
 
-        // Check if we just disconnected, if so go to main menu
-        if self.client.borrow().disconnected() {
-            return PlayStateResult::Pop;
-        }
-
         let mut current_client_state = self.client.borrow().get_client_state();
         while let ClientState::Pending | ClientState::Registered = current_client_state {
             // Handle window events
@@ -83,7 +78,7 @@ impl PlayState for CharSelectionState {
                             char_data.body,
                             char_data.tool,
                         );
-                        return PlayStateResult::Push(Box::new(SessionState::new(
+                        return PlayStateResult::Switch(Box::new(SessionState::new(
                             global_state,
                             self.client.clone(),
                         )));
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 7e36d44543..c6de6e40e0 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -3,6 +3,7 @@ use crate::{
     hud::{DebugInfo, Event as HudEvent, Hud},
     i18n::{i18n_asset_key, VoxygenLocalization},
     key_state::KeyState,
+    menu::char_selection::CharSelectionState,
     render::Renderer,
     scene::{camera, Scene, SceneData},
     window::{Event, GameInput},
@@ -680,6 +681,13 @@ impl PlayState for SessionState {
             current_client_state = self.client.borrow().get_client_state();
         }
 
+        if let ClientState::Registered = current_client_state {
+            return PlayStateResult::Switch(Box::new(CharSelectionState::new(
+                global_state,
+                self.client.clone(),
+            )));
+        }
+
         PlayStateResult::Pop
     }
 

From 0997620381037fbe651adc690bd7882c58362dec Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Sat, 21 Dec 2019 18:02:39 +0100
Subject: [PATCH 07/41] :/ and reactivated the password field

---
 Cargo.lock                           | 652 +++++++++++++++++++++++++++
 client/src/error.rs                  |   1 +
 client/src/lib.rs                    |   3 +
 common/src/msg/server.rs             |   2 +
 server/Cargo.toml                    |   1 +
 server/src/auth_provider.rs          |  61 ++-
 server/src/lib.rs                    |   5 +-
 server/src/settings.rs               |   4 +-
 server/src/sys/message.rs            |   7 +-
 voxygen/Cargo.toml                   |   1 +
 voxygen/src/menu/main/client_init.rs |  31 +-
 voxygen/src/menu/main/mod.rs         |   6 +-
 voxygen/src/menu/main/ui.rs          |  18 +-
 13 files changed, 759 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 083ae3808f..365119f7ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,6 +134,30 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "auth-common"
+version = "0.1.0"
+source = "git+https://gitlab.com/veloren/auth.git#65571ade0d954a0e0bd995fdb314854ff146ab97"
+dependencies = [
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "authc"
+version = "1.0.0"
+source = "git+https://gitlab.com/veloren/auth.git#65571ade0d954a0e0bd995fdb314854ff146ab97"
+dependencies = [
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git)",
+ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -181,6 +205,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bincode"
 version = "1.2.0"
@@ -272,6 +301,11 @@ dependencies = [
  "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -282,6 +316,11 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bytes"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "c2-chacha"
 version = "0.2.3"
@@ -535,11 +574,25 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
@@ -744,6 +797,14 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ct-logs"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "daggy"
 version = "0.5.0"
@@ -844,11 +905,24 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dtoa"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.6.2"
@@ -993,6 +1067,69 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-channel"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-io"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-task"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-util"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gdk"
 version = "0.8.0"
@@ -1361,6 +1498,24 @@ dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "h2"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -1380,6 +1535,11 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "hibitset"
 version = "0.6.2"
@@ -1394,6 +1554,25 @@ name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "http"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "http-body"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -1407,6 +1586,46 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -1520,6 +1739,14 @@ dependencies = [
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1707,6 +1934,11 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "mime_guess"
 version = "1.8.7"
@@ -1718,6 +1950,15 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mime_guess"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "minifb"
 version = "0.13.0"
@@ -2194,6 +2435,34 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "pin-project"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "piston-float"
 version = "0.3.0"
@@ -2267,6 +2536,11 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "0.3.8"
@@ -2618,6 +2892,55 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rodio"
 version = "0.10.0"
@@ -2678,6 +3001,17 @@ dependencies = [
  "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rust-argon2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
@@ -2699,6 +3033,29 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rusttype"
 version = "0.7.9"
@@ -2749,6 +3106,15 @@ dependencies = [
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@@ -2759,6 +3125,15 @@ name = "scopeguard"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sct"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sdl2"
 version = "0.32.2"
@@ -2781,6 +3156,26 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "security-framework"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -2822,6 +3217,17 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -3129,6 +3535,46 @@ dependencies = [
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.5"
@@ -3137,6 +3583,11 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "treeculler"
 version = "0.1.0"
@@ -3145,6 +3596,11 @@ dependencies = [
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -3166,6 +3622,14 @@ dependencies = [
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -3197,6 +3661,11 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "untrusted"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "url"
 version = "1.7.2"
@@ -3217,6 +3686,15 @@ dependencies = [
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "uuid"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "uvth"
 version = "3.1.1"
@@ -3305,6 +3783,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3341,6 +3820,7 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3421,6 +3901,11 @@ name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -3436,11 +3921,82 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wasi"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "wayland-client"
 version = "0.21.13"
@@ -3548,6 +4104,32 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "web-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -3619,6 +4201,14 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winres"
 version = "0.1.11"
@@ -3693,11 +4283,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
 "checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
@@ -3709,8 +4302,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
+"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 "checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
@@ -3739,7 +4334,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 "checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
@@ -3759,6 +4356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
 "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
+"checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
 "checksum daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
@@ -3771,7 +4369,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11afd3251e588f2770226659b2a1d55ec2f8aaf2ca42bdcdbd01ff53b4a81e70"
 "checksum downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
 "checksum draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
@@ -3790,6 +4390,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
+"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
+"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
+"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
+"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
+"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
+"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
+"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
@@ -3822,12 +4430,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
+"checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
+"checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+"checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
+"checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
@@ -3841,6 +4455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
+"checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -3865,7 +4480,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
+"checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 "checksum minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
@@ -3915,6 +4532,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+"checksum pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
+"checksum pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
+"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
+"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
 "checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
 "checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
 "checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
@@ -3924,6 +4545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
@@ -3963,29 +4585,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+"checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
+"checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
 "checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
+"checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 "checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "faf737f37ca340201889b5f48ecde47f233e9da3cbf3d04be27883adac39b4da"
+"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+"checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
+"checksum security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
+"checksum security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
@@ -4022,25 +4654,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
+"checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
+"checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
+"checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
+"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
 "checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
 "checksum uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf"
 "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb3ca8ea588deba055424cc1a79a830428b2f6c270b8d8f91946f660fa4d8ee"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
+"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
+"checksum wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
+"checksum wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
+"checksum wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
+"checksum wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
+"checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
 "checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
 "checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
@@ -4051,6 +4699,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
 "checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
+"checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
+"checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
+"checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
@@ -4059,6 +4710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
 "checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 "checksum winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
diff --git a/client/src/error.rs b/client/src/error.rs
index 154387e16c..1b533e641b 100644
--- a/client/src/error.rs
+++ b/client/src/error.rs
@@ -8,6 +8,7 @@ pub enum Error {
     ServerShutdown,
     TooManyPlayers,
     InvalidAuth,
+    AlreadyLoggedIn,
     //TODO: InvalidAlias,
     Other(String),
 }
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 5bb2068dc6..723c348b11 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -105,6 +105,8 @@ impl Client {
                     );
                 }
 
+                log::error!("Auth Server: {:?}", server_info.auth_provider);
+
                 // Initialize `State`
                 let mut state = State::default();
                 let entity = state.ecs_mut().apply_entity_package(entity_package);
@@ -549,6 +551,7 @@ impl Client {
                     ServerMsg::Error(e) => match e {
                         ServerError::TooManyPlayers => return Err(Error::ServerWentMad),
                         ServerError::InvalidAuth => return Err(Error::InvalidAuth),
+                        ServerError::AlreadyLoggedIn => return Err(Error::AlreadyLoggedIn),
                         //TODO: ServerError::InvalidAlias => return Err(Error::InvalidAlias),
                     },
                     ServerMsg::Shutdown => return Err(Error::ServerShutdown),
diff --git a/common/src/msg/server.rs b/common/src/msg/server.rs
index 0a7b84ae33..c472bd1942 100644
--- a/common/src/msg/server.rs
+++ b/common/src/msg/server.rs
@@ -21,6 +21,7 @@ pub struct ServerInfo {
     pub description: String,
     pub git_hash: String,
     pub git_date: String,
+    pub auth_provider: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -86,6 +87,7 @@ pub enum ServerMsg {
 pub enum ServerError {
     TooManyPlayers,
     InvalidAuth,
+    AlreadyLoggedIn,
     //TODO: InvalidAlias,
 }
 
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e6e9917ad7..5b07f16c5e 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,3 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
+authc = { git = "https://gitlab.com/veloren/auth.git" }
\ No newline at end of file
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 68160a48e0..198df45c41 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -1,32 +1,59 @@
+use authc::{AuthClient, AuthToken};
+use common::msg::ServerError;
 use hashbrown::HashMap;
-use log::{info, warn};
+use std::str::FromStr;
 
 pub struct AuthProvider {
     accounts: HashMap<String, String>,
+    auth_server: Option<AuthClient>,
 }
 
 impl AuthProvider {
-    pub fn new() -> Self {
+    pub fn new(auth_addr: Option<String>) -> Self {
+        let auth_server = match auth_addr {
+            Some(addr) => Some(AuthClient::new(addr)),
+            None => None,
+        };
+
         AuthProvider {
             accounts: HashMap::new(),
+            auth_server,
         }
     }
 
-    pub fn query(&mut self, username: String, password: String) -> bool {
-        let pwd = password.clone();
-        if self.accounts.entry(username.clone()).or_insert_with(|| {
-            info!("Registered new user '{}'", &username);
-            pwd
-        }) == &password
-        {
-            info!("User '{}' successfully authenticated", username);
-            true
-        } else {
-            warn!(
-                "User '{}' attempted to log in with invalid password '{}'!",
-                username, password
-            );
-            false
+    pub fn query(&mut self, username_or_token: String) -> Result<bool, ServerError> {
+        // Based on whether auth server is provided or not we expect an username or
+        // token
+        match &self.auth_server {
+            // Token from auth server expected
+            Some(srv) => {
+                // TODO: Check if already logged in!
+                log::info!("Validating '{}' token.", &username_or_token);
+                match srv.validate(
+                    AuthToken::from_str(&username_or_token).expect("Failed parsing token"), // TODO: POSSIBLE DOS, handle result!
+                ) {
+                    Ok(id) => {
+                        // TODO: Get username!
+                        self.accounts.insert("peter".into(), id.to_string());
+                        Ok(true)
+                    }
+                    Err(e) => {
+                        log::error!("{}", e);
+                        Ok(false)
+                    }
+                }
+            },
+            // Username is expected
+            None => {
+                if !self.accounts.contains_key(&username_or_token) {
+                    log::info!("New User '{}'", username_or_token);
+                    self.accounts
+                        .insert(username_or_token, "whateverUUID".into()); // TODO: generate UUID
+                    Ok(true)
+                } else {
+                    Err(ServerError::AlreadyLoggedIn)
+                }
+            },
         }
     }
 }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index d9f009a890..47fc395176 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -86,7 +86,9 @@ impl Server {
         let mut state = State::default();
         state.ecs_mut().insert(EventBus::<ServerEvent>::default());
         // TODO: anything but this
-        state.ecs_mut().insert(AuthProvider::new());
+        state
+            .ecs_mut()
+            .insert(AuthProvider::new(settings.auth_server_address.clone()));
         state.ecs_mut().insert(Tick(0));
         state.ecs_mut().insert(ChunkGenerator::new());
         // System timers for performance monitoring
@@ -196,6 +198,7 @@ impl Server {
                 description: settings.server_description.clone(),
                 git_hash: common::util::GIT_HASH.to_string(),
                 git_date: common::util::GIT_DATE.to_string(),
+                auth_provider: settings.auth_server_address.clone(),
             },
             metrics: ServerMetrics::new(settings.metrics_address)
                 .expect("Failed to initialize server metrics submodule."),
diff --git a/server/src/settings.rs b/server/src/settings.rs
index 4ab9e0bbd1..12c6fc157f 100644
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -10,12 +10,12 @@ const DEFAULT_WORLD_SEED: u32 = 5284;
 pub struct ServerSettings {
     pub gameserver_address: SocketAddr,
     pub metrics_address: SocketAddr,
+    pub auth_server_address: Option<String>,
     pub max_players: usize,
     pub world_seed: u32,
     //pub pvp_enabled: bool,
     pub server_name: String,
     pub server_description: String,
-    //pub login_server: whatever
     pub start_time: f64,
     pub admins: Vec<String>,
     /// When set to None, loads the default map file (if available); otherwise,
@@ -28,6 +28,7 @@ impl Default for ServerSettings {
         Self {
             gameserver_address: SocketAddr::from(([0; 4], 14004)),
             metrics_address: SocketAddr::from(([0; 4], 14005)),
+            auth_server_address: Some("https://auth.veloren.net".into()),
             world_seed: DEFAULT_WORLD_SEED,
             server_name: "Veloren Alpha".to_owned(),
             server_description: "This is the best Veloren server.".to_owned(),
@@ -107,6 +108,7 @@ impl ServerSettings {
                 [127, 0, 0, 1],
                 pick_unused_port().expect("Failed to find unused port!"),
             )),
+            auth_server_address: None,
             // If loading the default map file, make sure the seed is also default.
             world_seed: if load.map_file.is_some() {
                 load.world_seed
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index f68d32f9e6..fe55a49c1b 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -124,7 +124,12 @@ impl<'a> System<'a> for Sys {
                     },
                     // Valid player
                     ClientMsg::Register { player, password } if player.is_valid() => {
-                        if !accounts.query(player.alias.clone(), password) {
+                        if !accounts
+                            .query(password.clone())
+                            .expect("Handle this error!")
+                        {
+                            // TODO: Graceful error handling!
+                            // TODO: Graceful error handling! (e.g. AlreadyLoggedIn)
                             client.error_state(RequestStateError::Denied);
                             break;
                         }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 9ae1608213..e9df01d6e5 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -64,6 +64,7 @@ rust-argon2 = "0.5"
 bincode = "1.2"
 deunicode = "1.0"
 uvth = "3.1.1"
+authc = { git = "https://gitlab.com/veloren/auth.git" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 dispatch = "0.1.4"
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 95be603556..e7ed201382 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -68,13 +68,40 @@ impl ClientInit {
                         {
                             match Client::new(socket_addr, player.view_distance) {
                                 Ok(mut client) => {
+                                    // Authentication
+                                    let username_or_token = match &client.server_info.auth_provider
+                                    {
+                                        Some(addr) => {
+                                            let auth_client = authc::AuthClient::new(addr);
+                                            // TODO: PROMPT USER INCASE OF THE AUTH SERVER BEING
+                                            // UNKNOWN!
+                                            log::error!(
+                                                "Logging in with '{}', '{}'.",
+                                                &player.alias,
+                                                &password
+                                            );
+                                            match auth_client.sign_in(
+                                                &player.alias,
+                                                &password,
+                                                socket_addr.ip(),
+                                            ) {
+                                                Ok(token) => token.serialize(),
+                                                // TODO: Properly deal with it
+                                                Err(e) => panic!(
+                                                    "Failed to sign in to auth server '{}'! {}",
+                                                    addr, e
+                                                ),
+                                            }
+                                        },
+                                        None => player.alias.clone(),
+                                    };
+
                                     if let Err(ClientError::InvalidAuth) =
-                                        client.register(player.clone(), password.clone())
+                                        client.register(player.clone(), username_or_token.clone())
                                     {
                                         last_err = Some(Error::InvalidAuth);
                                         break;
                                     }
-                                    //client.register(player, password);
                                     let _ = tx.send(Ok(client));
                                     return;
                                 },
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 504e3d6dc9..c1c93df6df 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -8,7 +8,6 @@ use crate::{
     window::Event,
     Direction, GlobalState, PlayState, PlayStateResult,
 };
-use argon2::{self, Config};
 use client_init::{ClientInit, Error as InitError};
 use common::{assets::load_expect, clock::Clock, comp};
 use log::warn;
@@ -202,9 +201,10 @@ fn attempt_login(
                 (server_address, server_port, false),
                 player,
                 {
-                    let salt = b"staticsalt_zTuGkGvybZIjZbNUDtw15";
+                    password
+                    /*let salt = b"staticsalt_zTuGkGvybZIjZbNUDtw15";
                     let config = Config::default();
-                    argon2::hash_encoded(password.as_bytes(), salt, &config).unwrap()
+                    argon2::hash_encoded(password.as_bytes(), salt, &config).unwrap()*/
                 },
             ));
         }
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 43d1e774ff..b13fbee394 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -90,7 +90,7 @@ image_ids! {
         button_hover: "voxygen.element.buttons.button_hover",
         button_press: "voxygen.element.buttons.button_press",
         input_bg_top: "voxygen.element.misc_bg.textbox_top",
-        //input_bg_mid: "voxygen.element.misc_bg.textbox_mid", <-- For password input
+        input_bg_mid: "voxygen.element.misc_bg.textbox_mid",
         input_bg_bot: "voxygen.element.misc_bg.textbox_bot",
 
 
@@ -461,14 +461,14 @@ impl MainMenuUi {
                     }
                 }
                 // Password
-                // TODO: REACTIVATE THIS WHEN A PROPER ACCOUNT SYSTEM IS IN PLACE
-                /*Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
+                // TODO: Why isn't it showing up?
+                // Password
+                Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
                     .down_from(self.ids.usrnm_bg, 30.0)
                     .set(self.ids.passwd_bg, ui_widgets);
                 Image::new(self.imgs.input_bg_mid)
                     .w_h(337.0, 67.0)
                     .middle_of(self.ids.passwd_bg)
-                    .color(Some(INACTIVE))
                     .set(self.ids.password_bg, ui_widgets);
                 for event in TextBox::new(&self.password)
                     .w_h(290.0, 30.0)
@@ -485,12 +485,13 @@ impl MainMenuUi {
                         TextBoxEvent::Update(password) => {
                             // Note: TextBox limits the input string length to what fits in it
                             self.password = password;
-                        }
+                        },
                         TextBoxEvent::Enter => {
                             login!();
-                        }
+                        },
                     }
-                }*/
+                }
+
                 if self.show_servers {
                     Image::new(self.imgs.info_frame)
                         .mid_top_with_margin_on(self.ids.username_bg, -320.0)
@@ -556,7 +557,7 @@ impl MainMenuUi {
                 }
                 // Server address
                 Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
-                    .down_from(self.ids.usrnm_bg, 30.0)
+                    .down_from(self.ids.passwd_bg, 30.0)
                     .set(self.ids.srvr_bg, ui_widgets);
                 Image::new(self.imgs.input_bg_bot)
                     .w_h(337.0, 67.0)
@@ -582,6 +583,7 @@ impl MainMenuUi {
                         },
                     }
                 }
+
                 // Login button
                 if Button::image(self.imgs.button)
                     .hover_image(self.imgs.button_hover)

From f4689db33321f161b89756fd839c0c3e44751912 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 1 Jan 2020 19:41:42 +0100
Subject: [PATCH 08/41] Updated to latest and greatest auth version.

---
 Cargo.lock                           | 810 ++++++++++++++++-----------
 server/Cargo.toml                    |   2 +-
 voxygen/Cargo.toml                   |   2 +-
 voxygen/src/menu/main/client_init.rs |   6 +-
 4 files changed, 496 insertions(+), 324 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 365119f7ad..f098c2c441 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git#65571ade0d954a0e0bd995fdb314854ff146ab97"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -147,14 +147,13 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git#65571ade0d954a0e0bd995fdb314854ff146ab97"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git)",
- "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -205,11 +204,6 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bincode"
 version = "1.2.0"
@@ -263,6 +257,25 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -306,6 +319,11 @@ name = "bumpalo"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -318,8 +336,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bytes"
-version = "0.5.4"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "c2-chacha"
@@ -501,7 +524,7 @@ dependencies = [
 [[package]]
 name = "conrod_core"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
 dependencies = [
  "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
  "copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -516,7 +539,7 @@ dependencies = [
 [[package]]
 name = "conrod_derive"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -526,7 +549,7 @@ dependencies = [
 [[package]]
 name = "conrod_winit"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
 
 [[package]]
 name = "const-random"
@@ -551,6 +574,32 @@ name = "constant_time_eq"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cookie"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "copypasta"
 version = "0.6.0"
@@ -574,25 +623,11 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
@@ -838,6 +873,14 @@ name = "deunicode"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "directories"
 version = "2.0.2"
@@ -935,6 +978,14 @@ dependencies = [
  "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "error-chain"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "euc"
 version = "0.3.0"
@@ -1013,6 +1064,17 @@ name = "fixedbitset"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "flate2"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1068,66 +1130,17 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "futures-channel"
-version = "0.3.4"
+name = "futures"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-cpupool"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "futures-io"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "futures-task"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "futures-util"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1191,6 +1204,14 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -1500,20 +1521,19 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.2.2"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1556,21 +1576,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "http"
-version = "0.2.0"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1588,42 +1610,47 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.3"
+version = "0.12.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "hyper-rustls"
-version = "0.20.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1747,6 +1774,11 @@ dependencies = [
  "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "keccak"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1961,17 +1993,29 @@ dependencies = [
 
 [[package]]
 name = "minifb"
-version = "0.13.0"
-source = "git+https://github.com/emoon/rust_minifb.git#bac71b297920c1f7ab5d6e384673d3ae5cc7d46d"
+version = "0.15.3"
+source = "git+https://github.com/emoon/rust_minifb.git#9d5529422c883d541a0eedcc329dc32afdcf28fa"
 dependencies = [
  "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-protocols 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.21"
@@ -2067,6 +2111,18 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "nix"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2250,6 +2306,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
@@ -2435,34 +2496,6 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "pin-project"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0-alpha.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "piston-float"
 version = "0.3.0"
@@ -2536,11 +2569,6 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "proc-macro2"
 version = "0.3.8"
@@ -2594,6 +2622,18 @@ name = "protobuf"
 version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "publicsuffix"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.2"
@@ -2808,7 +2848,7 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2894,36 +2934,36 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.10.4"
+version = "0.9.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3001,17 +3041,6 @@ dependencies = [
  "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rust-argon2"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
@@ -3035,27 +3064,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.17.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rusttype"
 version = "0.7.9"
@@ -3106,15 +3124,6 @@ dependencies = [
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@@ -3156,26 +3165,6 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "security-framework"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -3219,13 +3208,13 @@ dependencies = [
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.6.1"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3233,6 +3222,18 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sha3"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -3391,6 +3392,14 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "string"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3451,6 +3460,19 @@ dependencies = [
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "term"
 version = "0.5.2"
@@ -3537,42 +3559,138 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "0.2.13"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-buf"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-current-thread"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-executor"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-io"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-reactor"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.13.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "tokio-util"
-version = "0.2.0"
+name = "tokio-sync"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tcp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-threadpool"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-timer"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3583,11 +3701,6 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tower-service"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "treeculler"
 version = "0.1.0"
@@ -3601,6 +3714,14 @@ name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "try_from"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -3614,6 +3735,11 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicase"
 version = "1.4.2"
@@ -3783,7 +3909,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3820,7 +3946,7 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3879,7 +4005,7 @@ dependencies = [
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)",
+ "minifb 0.15.3 (git+https://github.com/emoon/rust_minifb.git)",
  "noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3923,9 +4049,10 @@ dependencies = [
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3941,8 +4068,6 @@ version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3960,17 +4085,6 @@ dependencies = [
  "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.59"
@@ -4025,6 +4139,20 @@ dependencies = [
  "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-client"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-commons"
 version = "0.21.13"
@@ -4043,6 +4171,17 @@ dependencies = [
  "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-commons"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-protocols"
 version = "0.21.13"
@@ -4066,6 +4205,17 @@ dependencies = [
  "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-protocols"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-scanner"
 version = "0.21.13"
@@ -4086,6 +4236,16 @@ dependencies = [
  "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-scanner"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-sys"
 version = "0.21.13"
@@ -4104,6 +4264,11 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-sys"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "web-sys"
 version = "0.3.36"
@@ -4124,7 +4289,7 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4193,7 +4358,7 @@ dependencies = [
  "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4283,14 +4448,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
 "checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
@@ -4298,14 +4462,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 "checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 "checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
+"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 "checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
@@ -4332,11 +4499,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
+"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 "checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
@@ -4361,6 +4528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@@ -4373,6 +4541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
 "checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
@@ -4382,6 +4551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 "checksum find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -4390,18 +4560,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
-"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
-"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
-"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
-"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
-"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
-"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 "checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
 "checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
@@ -4430,18 +4595,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
-"checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
+"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
-"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
-"checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
-"checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
+"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
+"checksum hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
@@ -4456,6 +4621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
 "checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
+"checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -4483,7 +4649,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-"checksum minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
+"checksum minifb 0.15.3 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
+"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -4492,6 +4659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
+"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 "checksum noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
@@ -4511,6 +4679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
@@ -4532,10 +4701,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
-"checksum pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
-"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
-"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
 "checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
 "checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
 "checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
@@ -4545,13 +4710,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
-"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
 "checksum prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 "checksum prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
 "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
+"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
@@ -4575,7 +4740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
-"checksum raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9db80d08d3ed847ce4fb3def46de0af4bfb6155bd09bd6eaf28b5ac72541c1f1"
+"checksum raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
 "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
@@ -4585,40 +4750,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
+"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
 "checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-"checksum rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
-"checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
+"checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 "checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "faf737f37ca340201889b5f48ecde47f233e9da3cbf3d04be27883adac39b4da"
-"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
-"checksum security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
-"checksum security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
-"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
+"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
@@ -4638,6 +4799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
@@ -4645,6 +4807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -4654,15 +4817,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
-"checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
-"checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
-"checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
+"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
+"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
+"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
+"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
+"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
+"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
+"checksum tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
+"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
+"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
+"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
+"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-"checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
@@ -4681,27 +4853,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 "checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
 "checksum wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
-"checksum wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
 "checksum wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
 "checksum wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
 "checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
 "checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
+"checksum wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9bcc929c26d59a655b0d2cd337299326acc1f6e3d4434c3ae2d6c78d32290ca4"
 "checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
 "checksum wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
+"checksum wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "539cdd0c296802332d763ff663739a7f83bdf67b3df58e99fe0215e96a495142"
 "checksum wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
 "checksum wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
+"checksum wayland-protocols 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79df44471a2e01b61c089472443858062fa64ea60dfd24267848efd7a8f161b6"
 "checksum wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
+"checksum wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43ea5ea1a117137d72c0c197431d198d69783b5e8ca996b0583c98e10b44d426"
 "checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
+"checksum wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "537500923d50be11d95a63c4cb538145e4c82edf61296b7debc1f94a1a6514ed"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
-"checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
+"checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 5b07f16c5e..e7ee9febba 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,4 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
-authc = { git = "https://gitlab.com/veloren/auth.git" }
\ No newline at end of file
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index e9df01d6e5..f639501007 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -64,7 +64,7 @@ rust-argon2 = "0.5"
 bincode = "1.2"
 deunicode = "1.0"
 uvth = "3.1.1"
-authc = { git = "https://gitlab.com/veloren/auth.git" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 dispatch = "0.1.4"
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index e7ed201382..72c1abe152 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -80,11 +80,7 @@ impl ClientInit {
                                                 &player.alias,
                                                 &password
                                             );
-                                            match auth_client.sign_in(
-                                                &player.alias,
-                                                &password,
-                                                socket_addr.ip(),
-                                            ) {
+                                            match auth_client.sign_in(&player.alias, &password) {
                                                 Ok(token) => token.serialize(),
                                                 // TODO: Properly deal with it
                                                 Err(e) => panic!(

From db427a2c185f8c8ffe6b5989b4d2b05bd49731fa Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 1 Jan 2020 21:17:43 +0100
Subject: [PATCH 09/41] Server auth handling improvements.

---
 Cargo.lock                  |  1 +
 client/src/lib.rs           |  1 +
 common/Cargo.toml           |  1 +
 common/src/msg/server.rs    |  6 ++++
 server/src/auth_provider.rs | 62 ++++++++++++++++++++++++++++---------
 5 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f098c2c441..901b3da8d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3878,6 +3878,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 723c348b11..6a169f8e4a 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -552,6 +552,7 @@ impl Client {
                         ServerError::TooManyPlayers => return Err(Error::ServerWentMad),
                         ServerError::InvalidAuth => return Err(Error::InvalidAuth),
                         ServerError::AlreadyLoggedIn => return Err(Error::AlreadyLoggedIn),
+                        ServerError::AuthError(_) => unreachable!(),
                         //TODO: ServerError::InvalidAlias => return Err(Error::InvalidAlias),
                     },
                     ServerMsg::Shutdown => return Err(Error::ServerShutdown),
diff --git a/common/Cargo.toml b/common/Cargo.toml
index f28f688c43..fe3123a720 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -33,6 +33,7 @@ crossbeam = "=0.7.2"
 notify = "5.0.0-pre.1"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/common/src/msg/server.rs b/common/src/msg/server.rs
index c472bd1942..8159dfb874 100644
--- a/common/src/msg/server.rs
+++ b/common/src/msg/server.rs
@@ -4,6 +4,7 @@ use crate::{
     terrain::{Block, TerrainChunk},
     ChatType,
 };
+use authc::AuthClientError;
 use hashbrown::HashMap;
 use vek::*;
 
@@ -88,9 +89,14 @@ pub enum ServerError {
     TooManyPlayers,
     InvalidAuth,
     AlreadyLoggedIn,
+    AuthError(String),
     //TODO: InvalidAlias,
 }
 
+impl From<AuthClientError> for ServerError {
+    fn from(err: AuthClientError) -> Self { Self::AuthError(err.to_string()) }
+}
+
 impl ServerMsg {
     pub fn chat(message: String) -> ServerMsg {
         ServerMsg::ChatMsg {
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 198df45c41..4e7861f0bf 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -1,8 +1,39 @@
-use authc::{AuthClient, AuthToken};
+use authc::{AuthClient, AuthToken, Uuid};
 use common::msg::ServerError;
 use hashbrown::HashMap;
 use std::str::FromStr;
 
+fn contains_value(map: &HashMap<String, String>, value: &str) -> bool {
+    let mut contains = false;
+    for ev in map.values() {
+        if value == ev {
+            contains = true;
+        }
+    }
+    contains
+}
+
+fn derive_uuid(username: &str) -> Uuid {
+    let mut state: [u8; 16] = [
+        52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239,
+    ];
+    for mix_byte_1 in username.as_bytes() {
+        for i in 0..16 {
+            let mix_byte_step: u8 = mix_byte_1
+                .wrapping_pow(239)
+                .wrapping_mul((i as u8).wrapping_pow(43));
+            let mix_byte_2 = state[i + mix_byte_step as usize % 16];
+            let rot_step: u8 = mix_byte_1
+                .wrapping_pow(29)
+                .wrapping_mul((i as u8).wrapping_pow(163));
+            state[i] = (state[i] ^ mix_byte_1)
+                .wrapping_mul(mix_byte_2)
+                .rotate_left(rot_step as u32);
+        }
+    }
+    Uuid::from_slice(&state).unwrap()
+}
+
 pub struct AuthProvider {
     accounts: HashMap<String, String>,
     auth_server: Option<AuthClient>,
@@ -27,28 +58,29 @@ impl AuthProvider {
         match &self.auth_server {
             // Token from auth server expected
             Some(srv) => {
-                // TODO: Check if already logged in!
                 log::info!("Validating '{}' token.", &username_or_token);
-                match srv.validate(
-                    AuthToken::from_str(&username_or_token).expect("Failed parsing token"), // TODO: POSSIBLE DOS, handle result!
-                ) {
-                    Ok(id) => {
-                        // TODO: Get username!
-                        self.accounts.insert("peter".into(), id.to_string());
-                        Ok(true)
-                    }
-                    Err(e) => {
-                        log::error!("{}", e);
-                        Ok(false)
+                if let Ok(token) = AuthToken::from_str(&username_or_token) {
+                    match srv.validate(token) {
+                        Ok(id) => {
+                            if contains_value(&self.accounts, &id.to_string()) {
+                                return Err(ServerError::AlreadyLoggedIn);
+                            }
+                            let username = srv.uuid_to_username(id.clone())?;
+                            self.accounts.insert(username, id.to_string());
+                            Ok(true)
+                        },
+                        Err(e) => Err(ServerError::from(e)),
                     }
+                } else {
+                    Ok(false)
                 }
             },
             // Username is expected
             None => {
                 if !self.accounts.contains_key(&username_or_token) {
                     log::info!("New User '{}'", username_or_token);
-                    self.accounts
-                        .insert(username_or_token, "whateverUUID".into()); // TODO: generate UUID
+                    let uuid = derive_uuid(&username_or_token);
+                    self.accounts.insert(username_or_token, uuid.to_string());
                     Ok(true)
                 } else {
                     Err(ServerError::AlreadyLoggedIn)

From d066505bd3c5dd111ce588818e8ad79e6657d90d Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 2 Jan 2020 03:43:45 -0500
Subject: [PATCH 10/41] Add warning prompt for untrusted auth servers, move
 some auth code into

---
 Cargo.lock                           |  31 +++++++-
 client/Cargo.toml                    |   1 +
 client/src/error.rs                  |   9 ++-
 client/src/lib.rs                    |  31 +++++++-
 common/Cargo.toml                    |   2 +-
 common/src/msg/client.rs             |   2 +-
 server/Cargo.toml                    |   2 +-
 server/src/auth_provider.rs          |  30 +++----
 server/src/sys/message.rs            |   7 +-
 voxygen/Cargo.toml                   |   1 -
 voxygen/src/menu/main/client_init.rs |  97 +++++++++++------------
 voxygen/src/menu/main/mod.rs         |  52 +++++++++---
 voxygen/src/menu/main/ui.rs          | 113 ++++++++++++++++++++++-----
 voxygen/src/settings.rs              |   6 ++
 14 files changed, 265 insertions(+), 119 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 901b3da8d3..0b4c37a8d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,6 +144,16 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "auth-common"
+version = "0.1.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b#f3445fc1dca55f09205bdbe8ad038db60fea442b"
+dependencies = [
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "authc"
 version = "1.0.0"
@@ -157,6 +167,19 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "authc"
+version = "1.0.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b#f3445fc1dca55f09205bdbe8ad038db60fea442b"
+dependencies = [
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -3863,6 +3886,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3878,7 +3902,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3910,7 +3934,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3978,7 +4002,6 @@ dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4450,7 +4473,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)" = "<none>"
 "checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index a67b2db65d..983d2f59a5 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,3 +15,4 @@ log = "0.4.8"
 specs = "0.15.1"
 vek = { version = "0.9.9", features = ["serde"] }
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
diff --git a/client/src/error.rs b/client/src/error.rs
index 1b533e641b..6003bcb046 100644
--- a/client/src/error.rs
+++ b/client/src/error.rs
@@ -1,3 +1,4 @@
+use authc::AuthClientError;
 use common::net::PostError;
 
 #[derive(Debug)]
@@ -9,10 +10,16 @@ pub enum Error {
     TooManyPlayers,
     InvalidAuth,
     AlreadyLoggedIn,
+    AuthClientError(AuthClientError),
+    AuthServerNotTrusted,
     //TODO: InvalidAlias,
     Other(String),
 }
 
 impl From<PostError> for Error {
-    fn from(err: PostError) -> Self { Error::Network(err) }
+    fn from(err: PostError) -> Self { Self::Network(err) }
+}
+
+impl From<AuthClientError> for Error {
+    fn from(err: AuthClientError) -> Self { Self::AuthClientError(err) }
 }
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 6a169f8e4a..7e3520a606 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -105,7 +105,7 @@ impl Client {
                     );
                 }
 
-                log::error!("Auth Server: {:?}", server_info.auth_provider);
+                log::info!("Auth Server: {:?}", server_info.auth_provider);
 
                 // Initialize `State`
                 let mut state = State::default();
@@ -174,10 +174,33 @@ impl Client {
     }
 
     /// Request a state transition to `ClientState::Registered`.
-    pub fn register(&mut self, player: comp::Player, password: String) -> Result<(), Error> {
-        self.postbox
-            .send_message(ClientMsg::Register { player, password });
+    pub fn register(
+        &mut self,
+        player: comp::Player,
+        password: String,
+        mut auth_trusted: impl FnMut(&str) -> bool,
+    ) -> Result<(), Error> {
+        // Authentication
+        let token_or_username = match &self.server_info.auth_provider {
+            Some(addr) => {
+                // Query whether this is a trusted auth server
+                if auth_trusted(&addr) {
+                    authc::AuthClient::new(addr)
+                        .sign_in(&player.alias, &password)?
+                        .serialize()
+                } else {
+                    return Err(Error::AuthServerNotTrusted);
+                }
+            },
+            None => player.alias.clone(),
+        };
+
+        self.postbox.send_message(ClientMsg::Register {
+            player,
+            token_or_username,
+        });
         self.client_state = ClientState::Pending;
+
         loop {
             match self.postbox.next_message() {
                 Some(ServerMsg::StateAnswer(Err((RequestStateError::Denied, _)))) => {
diff --git a/common/Cargo.toml b/common/Cargo.toml
index fe3123a720..255ff314a8 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -33,7 +33,7 @@ crossbeam = "=0.7.2"
 notify = "5.0.0-pre.1"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/common/src/msg/client.rs b/common/src/msg/client.rs
index b4022483ad..87ded3f830 100644
--- a/common/src/msg/client.rs
+++ b/common/src/msg/client.rs
@@ -5,7 +5,7 @@ use vek::*;
 pub enum ClientMsg {
     Register {
         player: comp::Player,
-        password: String,
+        token_or_username: String,
     },
     Character {
         name: String,
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e7ee9febba..cf364fd0b9 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,4 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 4e7861f0bf..6634e5bf51 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -3,16 +3,6 @@ use common::msg::ServerError;
 use hashbrown::HashMap;
 use std::str::FromStr;
 
-fn contains_value(map: &HashMap<String, String>, value: &str) -> bool {
-    let mut contains = false;
-    for ev in map.values() {
-        if value == ev {
-            contains = true;
-        }
-    }
-    contains
-}
-
 fn derive_uuid(username: &str) -> Uuid {
     let mut state: [u8; 16] = [
         52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239,
@@ -35,7 +25,7 @@ fn derive_uuid(username: &str) -> Uuid {
 }
 
 pub struct AuthProvider {
-    accounts: HashMap<String, String>,
+    accounts: HashMap<Uuid, String>,
     auth_server: Option<AuthClient>,
 }
 
@@ -61,12 +51,12 @@ impl AuthProvider {
                 log::info!("Validating '{}' token.", &username_or_token);
                 if let Ok(token) = AuthToken::from_str(&username_or_token) {
                     match srv.validate(token) {
-                        Ok(id) => {
-                            if contains_value(&self.accounts, &id.to_string()) {
+                        Ok(uuid) => {
+                            if self.accounts.contains_key(&uuid) {
                                 return Err(ServerError::AlreadyLoggedIn);
                             }
-                            let username = srv.uuid_to_username(id.clone())?;
-                            self.accounts.insert(username, id.to_string());
+                            let username = srv.uuid_to_username(uuid.clone())?;
+                            self.accounts.insert(uuid, username);
                             Ok(true)
                         },
                         Err(e) => Err(ServerError::from(e)),
@@ -77,10 +67,12 @@ impl AuthProvider {
             },
             // Username is expected
             None => {
-                if !self.accounts.contains_key(&username_or_token) {
-                    log::info!("New User '{}'", username_or_token);
-                    let uuid = derive_uuid(&username_or_token);
-                    self.accounts.insert(username_or_token, uuid.to_string());
+                // Assume username was provided
+                let username = username_or_token;
+                let uuid = derive_uuid(&username);
+                if !self.accounts.contains_key(&uuid) {
+                    log::info!("New User '{}'", username);
+                    self.accounts.insert(uuid, username);
                     Ok(true)
                 } else {
                     Err(ServerError::AlreadyLoggedIn)
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index fe55a49c1b..bc7a4b9b25 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -123,9 +123,12 @@ impl<'a> System<'a> for Sys {
                         ClientState::Pending => {},
                     },
                     // Valid player
-                    ClientMsg::Register { player, password } if player.is_valid() => {
+                    ClientMsg::Register {
+                        player,
+                        token_or_username,
+                    } if player.is_valid() => {
                         if !accounts
-                            .query(password.clone())
+                            .query(token_or_username.clone())
                             .expect("Handle this error!")
                         {
                             // TODO: Graceful error handling!
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index f639501007..49939b5767 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -60,7 +60,6 @@ cpal = "0.10"
 crossbeam = "=0.7.2"
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
 chrono = "0.4.9"
-rust-argon2 = "0.5"
 bincode = "1.2"
 deunicode = "1.0"
 uvth = "3.1.1"
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 72c1abe152..04e37f6f7f 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -1,6 +1,6 @@
 use client::{error::Error as ClientError, Client};
 use common::{comp, net::PostError};
-use crossbeam::channel::{unbounded, Receiver, TryRecvError};
+use crossbeam::channel::{unbounded, Receiver, Sender, TryRecvError};
 use std::{
     net::ToSocketAddrs,
     sync::{
@@ -15,21 +15,26 @@ use std::{
 pub enum Error {
     // Error parsing input string or error resolving host name.
     BadAddress(std::io::Error),
-    // Parsing/host name resolution successful but could not connect.
-    #[allow(dead_code)]
-    ConnectionFailed(ClientError),
+    // Parsing/host name resolution successful but there was an error within the client.
+    ClientError(ClientError),
     // Parsing yielded an empty iterator (specifically to_socket_addrs()).
     NoAddress,
-    InvalidAuth,
     ClientCrashed,
-    ServerIsFull,
 }
 
+pub enum Msg {
+    IsAuthTrusted(String),
+    Done(Result<Client, Error>),
+}
+
+pub struct AuthTrust(String, bool);
+
 // Used to asynchronously parse the server address, resolve host names,
 // and create the client (which involves establishing a connection to the
 // server).
 pub struct ClientInit {
-    rx: Receiver<Result<Client, Error>>,
+    rx: Receiver<Msg>,
+    trust_tx: Sender<AuthTrust>,
     cancel: Arc<AtomicBool>,
 }
 impl ClientInit {
@@ -41,6 +46,7 @@ impl ClientInit {
         let (server_address, default_port, prefer_ipv6) = connection_args;
 
         let (tx, rx) = unbounded();
+        let (trust_tx, trust_rx) = unbounded();
         let cancel = Arc::new(AtomicBool::new(false));
         let cancel2 = Arc::clone(&cancel);
 
@@ -68,35 +74,20 @@ impl ClientInit {
                         {
                             match Client::new(socket_addr, player.view_distance) {
                                 Ok(mut client) => {
-                                    // Authentication
-                                    let username_or_token = match &client.server_info.auth_provider
+                                    if let Err(err) =
+                                        client.register(player.clone(), password, |auth_server| {
+                                            let _ = tx
+                                                .send(Msg::IsAuthTrusted(auth_server.to_string()));
+                                            trust_rx
+                                                .recv()
+                                                .map(|AuthTrust(server, trust)| {
+                                                    trust && &server == auth_server
+                                                })
+                                                .unwrap_or(false)
+                                        })
                                     {
-                                        Some(addr) => {
-                                            let auth_client = authc::AuthClient::new(addr);
-                                            // TODO: PROMPT USER INCASE OF THE AUTH SERVER BEING
-                                            // UNKNOWN!
-                                            log::error!(
-                                                "Logging in with '{}', '{}'.",
-                                                &player.alias,
-                                                &password
-                                            );
-                                            match auth_client.sign_in(&player.alias, &password) {
-                                                Ok(token) => token.serialize(),
-                                                // TODO: Properly deal with it
-                                                Err(e) => panic!(
-                                                    "Failed to sign in to auth server '{}'! {}",
-                                                    addr, e
-                                                ),
-                                            }
-                                        },
-                                        None => player.alias.clone(),
-                                    };
-
-                                    if let Err(ClientError::InvalidAuth) =
-                                        client.register(player.clone(), username_or_token.clone())
-                                    {
-                                        last_err = Some(Error::InvalidAuth);
-                                        break;
+                                        last_err = Some(Error::ClientError(err));
+                                        break 'tries;
                                     }
                                     let _ = tx.send(Ok(client));
                                     return;
@@ -109,20 +100,11 @@ impl ClientInit {
                                         },
                                         // Assume the connection failed and try again soon
                                         ClientError::Network(_) => {},
-                                        ClientError::TooManyPlayers => {
-                                            last_err = Some(Error::ServerIsFull);
+                                        // Non-connection error, stop attempts
+                                        err => {
+                                            last_err = Some(Error::ClientError(err));
                                             break 'tries;
                                         },
-                                        ClientError::InvalidAuth => {
-                                            last_err = Some(Error::InvalidAuth);
-                                            break 'tries;
-                                        },
-                                        // TODO: Handle errors?
-                                        _ => panic!(
-                                            "Unexpected non-network error when creating client: \
-                                             {:?}",
-                                            err
-                                        ),
                                     }
                                 },
                             }
@@ -130,29 +112,38 @@ impl ClientInit {
                         thread::sleep(Duration::from_secs(5));
                     }
                     // Parsing/host name resolution successful but no connection succeeded.
-                    let _ = tx.send(Err(last_err.unwrap_or(Error::NoAddress)));
+                    let _ = tx.send(Msg::Done(Err(last_err.unwrap_or(Error::NoAddress))));
                 },
                 Err(err) => {
                     // Error parsing input string or error resolving host name.
-                    let _ = tx.send(Err(Error::BadAddress(err)));
+                    let _ = tx.send(Msg::Done(Err(Error::BadAddress(err))));
                 },
             }
         });
 
-        ClientInit { rx, cancel }
+        ClientInit {
+            rx,
+            trust_tx,
+            cancel,
+        }
     }
 
     /// Poll if the thread is complete.
     /// Returns None if the thread is still running, otherwise returns the
     /// Result of client creation.
-    pub fn poll(&self) -> Option<Result<Client, Error>> {
+    pub fn poll(&self) -> Option<Msg> {
         match self.rx.try_recv() {
-            Ok(result) => Some(result),
+            Ok(msg) => Some(msg),
             Err(TryRecvError::Empty) => None,
-            Err(TryRecvError::Disconnected) => Some(Err(Error::ClientCrashed)),
+            Err(TryRecvError::Disconnected) => Some(Msg::Done(Err(Error::ClientCrashed))),
         }
     }
 
+    /// Report trust status of auth server
+    pub fn auth_trust(&self, auth_server: String, trusted: bool) {
+        let _ = self.trust_tx.send(AuthTrust(auth_server, trusted));
+    }
+
     pub fn cancel(&mut self) { self.cancel.store(true, Ordering::Relaxed); }
 }
 
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index c1c93df6df..ddcd6cd9db 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -8,9 +8,9 @@ use crate::{
     window::Event,
     Direction, GlobalState, PlayState, PlayStateResult,
 };
-use client_init::{ClientInit, Error as InitError};
+use client_init::{ClientInit, Error as InitError, Msg as InitMsg};
 use common::{assets::load_expect, clock::Clock, comp};
-use log::warn;
+use log::{error, warn};
 #[cfg(feature = "singleplayer")]
 use std::time::Duration;
 use ui::{Event as MainMenuEvent, MainMenuUi};
@@ -73,19 +73,39 @@ impl PlayState for MainMenuState {
                         std::rc::Rc::new(std::cell::RefCell::new(client)),
                     )));
                 },
-                Some(Err(err)) => {
+                Some(InitMsg::Done(Err(err))) => {
                     client_init = None;
                     global_state.info_message = Some(
                         match err {
                             InitError::BadAddress(_) | InitError::NoAddress => "Server not found",
-                            InitError::InvalidAuth => "Invalid credentials",
-                            InitError::ServerIsFull => "Server is full",
-                            InitError::ConnectionFailed(_) => "Connection failed",
+                            InitError::ClientError(err) => match err {
+                                client::Error::InvalidAuth => "Invalid credentials",
+                                client::Error::TooManyPlayers => "Server is full",
+                                client::Error::AuthServerNotTrusted => "Auth server not trusted",
+                                _ => {
+                                    error!("Error when trying to connect: {:?}", err);
+                                    "Connection Failed"
+                                },
+                            },
                             InitError::ClientCrashed => "Client crashed",
                         }
                         .to_string(),
                     );
                 },
+                Some(InitMsg::IsAuthTrusted(auth_server)) => {
+                    if global_state
+                        .settings
+                        .networking
+                        .trusted_auth_servers
+                        .contains(&auth_server)
+                    {
+                        // Can't fail since we just polled it, it must be Some
+                        client_init.as_ref().unwrap().auth_trust(auth_server, true);
+                    } else {
+                        // Show warning that auth server is not trusted and prompt for approval
+                        self.main_menu_ui.auth_trust_prompt(auth_server);
+                    }
+                },
                 None => {},
             }
 
@@ -140,6 +160,19 @@ impl PlayState for MainMenuState {
                     MainMenuEvent::DisclaimerClosed => {
                         global_state.settings.show_disclaimer = false
                     },
+                    MainMenuEvent::AuthServerTrust(auth_server, trust) => {
+                        if trust {
+                            global_state
+                                .settings
+                                .networking
+                                .trusted_auth_servers
+                                .insert(auth_server.clone());
+                            global_state.settings.save_to_file_warn();
+                        }
+                        client_init
+                            .as_ref()
+                            .map(|init| init.auth_trust(auth_server, trust));
+                    },
                 }
             }
             let localized_strings = load_expect::<VoxygenLocalization>(&i18n_asset_key(
@@ -200,12 +233,7 @@ fn attempt_login(
             *client_init = Some(ClientInit::new(
                 (server_address, server_port, false),
                 player,
-                {
-                    password
-                    /*let salt = b"staticsalt_zTuGkGvybZIjZbNUDtw15";
-                    let config = Config::default();
-                    argon2::hash_encoded(password.as_bytes(), salt, &config).unwrap()*/
-                },
+                { password },
             ));
         }
     } else {
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index b13fbee394..6e83e2e85f 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -68,7 +68,9 @@ widget_ids! {
         // Info Window
         info_frame,
         info_text,
-        info_bottom
+        info_bottom,
+        // Auth Trust Prompt
+        button_add_auth_trust,
     }
 }
 
@@ -122,16 +124,17 @@ pub enum Event {
     Quit,
     Settings,
     DisclaimerClosed,
+    AuthServerTrust(String, bool),
 }
 
 pub enum PopupType {
     Error,
     ConnectionInfo,
+    AuthTrustPrompt(String),
 }
 
 pub struct PopupData {
     msg: String,
-    button_text: String,
     popup_type: PopupType,
 }
 
@@ -261,27 +264,51 @@ impl MainMenuUi {
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.version, ui_widgets);
-        // Popup (Error/Info)
-        if let Some(popup_data) = &self.popup {
-            let text = Text::new(&popup_data.msg)
-                .rgba(1.0, 1.0, 1.0, if self.connect { fade_msg } else { 1.0 })
+
+        // Popup (Error/Info/AuthTrustPrompt)
+        let mut change_popup = None;
+        if let Some(PopupData { msg, popup_type }) = &self.popup {
+            let text = Text::new(msg)
+                .rgba(
+                    1.0,
+                    1.0,
+                    1.0,
+                    if let PopupType::ConnectionInfo = popup_type {
+                        fade_msg
+                    } else {
+                        1.0
+                    },
+                )
                 .font_id(self.fonts.cyri.conrod_id);
-            Rectangle::fill_with([65.0 * 6.0, 140.0], color::TRANSPARENT)
+            let (frame_w, frame_h) = if let PopupType::AuthTrustPrompt(_) = popup_type {
+                (65.0 * 8.0, 300.0)
+            } else {
+                (65.0 * 6.0, 140.0)
+            };
+            let error_bg = Rectangle::fill_with([frame_w, frame_h], color::TRANSPARENT)
                 .rgba(0.1, 0.1, 0.1, if self.connect { 0.0 } else { 1.0 })
-                .parent(ui_widgets.window)
-                .up_from(self.ids.banner_top, 15.0)
-                .set(self.ids.login_error_bg, ui_widgets);
+                .parent(ui_widgets.window);
+            if let PopupType::AuthTrustPrompt(_) = popup_type {
+                error_bg.middle_of(ui_widgets.window)
+            } else {
+                error_bg.up_from(self.ids.banner_top, 15.0)
+            }
+            .set(self.ids.login_error_bg, ui_widgets);
             Image::new(self.imgs.info_frame)
-                .w_h(65.0 * 6.0, 140.0)
+                .w_h(frame_w, frame_h)
                 .color(Some(Color::Rgba(
                     1.0,
                     1.0,
                     1.0,
-                    if self.connect { 0.0 } else { 1.0 },
+                    if let PopupType::ConnectionInfo = popup_type {
+                        0.0
+                    } else {
+                        1.0
+                    },
                 )))
                 .middle_of(self.ids.login_error_bg)
                 .set(self.ids.error_frame, ui_widgets);
-            if self.connect {
+            if let PopupType::ConnectionInfo = popup_type {
                 text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
                     .font_id(self.fonts.alkhemi.conrod_id)
                     .bottom_left_with_margins_on(ui_widgets.window, 60.0, 60.0)
@@ -289,6 +316,7 @@ impl MainMenuUi {
                     .set(self.ids.login_error, ui_widgets);
             } else {
                 text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
+                    .w(frame_w - 10.0 * 2.0)
                     .font_id(self.fonts.cyri.conrod_id)
                     .font_size(self.fonts.cyri.scale(25))
                     .set(self.ids.login_error, ui_widgets);
@@ -296,7 +324,7 @@ impl MainMenuUi {
             if Button::image(self.imgs.button)
                 .w_h(100.0, 30.0)
                 .mid_bottom_with_margin_on(
-                    if self.connect {
+                    if let PopupType::ConnectionInfo = popup_type {
                         ui_widgets.window
                     } else {
                         self.ids.login_error_bg
@@ -306,22 +334,55 @@ impl MainMenuUi {
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
                 .label_y(Relative::Scalar(2.0))
-                .label(&popup_data.button_text)
+                .label(match popup_type {
+                    PopupType::Error => "Okay",
+                    PopupType::ConnectionInfo => "Cancel",
+                    PopupType::AuthTrustPrompt(_) => "Cancel",
+                })
                 .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(self.fonts.cyri.scale(15))
                 .label_color(TEXT_COLOR)
                 .set(self.ids.button_ok, ui_widgets)
                 .was_clicked()
             {
-                match popup_data.popup_type {
+                match &popup_type {
+                    PopupType::Error => (),
                     PopupType::ConnectionInfo => {
                         events.push(Event::CancelLoginAttempt);
                     },
-                    _ => (),
+                    PopupType::AuthTrustPrompt(auth_server) => {
+                        events.push(Event::AuthServerTrust(auth_server.clone(), false));
+                    },
                 };
-                self.popup = None;
-            };
+                change_popup = Some(None);
+            }
+
+            if let PopupType::AuthTrustPrompt(auth_server) = popup_type {
+                if Button::image(self.imgs.button)
+                    .w_h(100.0, 30.0)
+                    .right_from(self.ids.button_ok, 10.0)
+                    .hover_image(self.imgs.button_hover)
+                    .press_image(self.imgs.button_press)
+                    .label_y(Relative::Scalar(2.0))
+                    .label("Add")
+                    .label_font_id(self.fonts.cyri)
+                    .label_font_size(15)
+                    .label_color(TEXT_COLOR)
+                    .set(self.ids.button_add_auth_trust, ui_widgets)
+                    .was_clicked()
+                {
+                    events.push(Event::AuthServerTrust(auth_server.clone(), true));
+                    change_popup = Some(Some(PopupData {
+                        msg: "Connecting...".to_string(),
+                        popup_type: PopupType::ConnectionInfo,
+                    }));
+                }
+            }
         }
+        if let Some(p) = change_popup {
+            self.popup = p;
+        }
+
         if !self.connect {
             Image::new(self.imgs.banner)
                 .w_h(65.0 * 6.0, 100.0 * 6.0)
@@ -461,8 +522,6 @@ impl MainMenuUi {
                     }
                 }
                 // Password
-                // TODO: Why isn't it showing up?
-                // Password
                 Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
                     .down_from(self.ids.usrnm_bg, 30.0)
                     .set(self.ids.passwd_bg, ui_widgets);
@@ -686,6 +745,18 @@ impl MainMenuUi {
         events
     }
 
+    pub fn auth_trust_prompt(&mut self, auth_server: String) {
+        self.popup = Some(PopupData {
+            msg: format!(
+                "Warning: The server you are trying to connect to has provided this \
+                 authentication server addresss:\n\n{}\n\nbut it is not in your list of trusted \
+                 authentication servers.",
+                &auth_server
+            ),
+            popup_type: PopupType::AuthTrustPrompt(auth_server),
+        })
+    }
+
     pub fn show_info(&mut self, msg: String, button_text: String) {
         self.popup = Some(PopupData {
             msg,
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index 5bae056d85..854464422f 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -7,6 +7,7 @@ use crate::{
 };
 use directories::{ProjectDirs, UserDirs};
 use glutin::{MouseButton, VirtualKeyCode};
+use hashbrown::HashSet;
 use log::warn;
 use serde_derive::{Deserialize, Serialize};
 use std::{fs, io::prelude::*, path::PathBuf};
@@ -157,6 +158,7 @@ pub struct NetworkingSettings {
     pub password: String,
     pub servers: Vec<String>,
     pub default_server: usize,
+    pub trusted_auth_servers: HashSet<String>,
 }
 
 impl Default for NetworkingSettings {
@@ -166,6 +168,10 @@ impl Default for NetworkingSettings {
             password: String::default(),
             servers: vec!["server.veloren.net".to_string()],
             default_server: 0,
+            trusted_auth_servers: ["https://auth.veloren.net"]
+                .iter()
+                .map(|s| s.to_string())
+                .collect(),
         }
     }
 }

From c6a159ff14d0d0bc02671e061bf7317f168e7142 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Thu, 2 Jan 2020 10:49:48 +0100
Subject: [PATCH 11/41] Update chat-cli to work properly. Update reqwest to
 0.10.0

---
 Cargo.lock                   | 421 ++++++++++++++++++++++++++++++++++-
 chat-cli/src/main.rs         |   4 +-
 client/Cargo.toml            |   2 +-
 common/Cargo.toml            |   2 +-
 server/Cargo.toml            |   2 +-
 voxygen/src/menu/main/mod.rs |   3 +-
 voxygen/src/menu/main/ui.rs  |  15 +-
 7 files changed, 422 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b4c37a8d4..90350a0271 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
+source = "git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033#68504561dd868bc2065e9300a27616f3560f7033"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -147,7 +147,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b#f3445fc1dca55f09205bdbe8ad038db60fea442b"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -157,11 +157,11 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
+source = "git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033#68504561dd868bc2065e9300a27616f3560f7033"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -170,9 +170,9 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b#f3445fc1dca55f09205bdbe8ad038db60fea442b"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -227,6 +227,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bincode"
 version = "1.2.0"
@@ -367,6 +372,11 @@ dependencies = [
  "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bytes"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "c2-chacha"
 version = "0.2.3"
@@ -646,11 +656,25 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
@@ -1157,6 +1181,19 @@ name = "futures"
 version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-channel"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "futures-cpupool"
 version = "0.1.8"
@@ -1166,6 +1203,48 @@ dependencies = [
  "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "futures-io"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-task"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-util"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gdk"
 version = "0.8.0"
@@ -1559,6 +1638,24 @@ dependencies = [
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "h2"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -1607,6 +1704,16 @@ dependencies = [
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "http-body"
 version = "0.1.0"
@@ -1618,6 +1725,15 @@ dependencies = [
  "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -1660,6 +1776,29 @@ dependencies = [
  "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.17.1"
@@ -1676,6 +1815,23 @@ dependencies = [
  "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -2519,6 +2675,34 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "pin-project"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "piston-float"
 version = "0.3.0"
@@ -2592,6 +2776,11 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "0.3.8"
@@ -2990,6 +3179,41 @@ dependencies = [
  "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.11"
@@ -3097,6 +3321,29 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rusttype"
 version = "0.7.9"
@@ -3147,6 +3394,15 @@ dependencies = [
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@@ -3188,6 +3444,26 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "security-framework"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -3240,6 +3516,17 @@ dependencies = [
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -3598,6 +3885,22 @@ dependencies = [
  "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-buf"
 version = "0.1.1"
@@ -3667,6 +3970,17 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-sync"
 version = "0.1.8"
@@ -3716,6 +4030,19 @@ dependencies = [
  "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.5"
@@ -3724,6 +4051,11 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "treeculler"
 version = "0.1.0"
@@ -3886,7 +4218,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3902,7 +4234,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3934,7 +4266,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4081,6 +4413,15 @@ dependencies = [
  "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wasi"
 version = "0.7.0"
@@ -4092,6 +4433,8 @@ version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -4109,6 +4452,17 @@ dependencies = [
  "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.59"
@@ -4319,6 +4673,14 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -4472,15 +4834,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)" = "<none>"
 "checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)" = "<none>"
 "checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=f3445fc1dca55f09205bdbe8ad038db60fea442b)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
 "checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
@@ -4499,6 +4862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 "checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
@@ -4529,7 +4893,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 "checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
@@ -4587,7 +4953,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
+"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
+"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
+"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
+"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
+"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
@@ -4622,17 +4995,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
 "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
+"checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
 "checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
 "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
+"checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 "checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
+"checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
 "checksum hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
+"checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
@@ -4727,6 +5105,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+"checksum pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
+"checksum pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
+"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
+"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
 "checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
 "checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
 "checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
@@ -4736,6 +5118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
@@ -4776,6 +5159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+"checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
 "checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
@@ -4787,23 +5171,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
+"checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
+"checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 "checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "faf737f37ca340201889b5f48ecde47f233e9da3cbf3d04be27883adac39b4da"
+"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
+"checksum security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
+"checksum security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
+"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
@@ -4844,17 +5234,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
 "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
+"checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
 "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 "checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 "checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 "checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 "checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 "checksum tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
+"checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
 "checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
 "checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
 "checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 "checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
+"checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
@@ -4880,9 +5274,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
 "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
+"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 "checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
 "checksum wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
+"checksum wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
 "checksum wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
 "checksum wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
 "checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
@@ -4904,6 +5300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
 "checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
+"checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/chat-cli/src/main.rs b/chat-cli/src/main.rs
index b74c1ea87f..4b4776dc9c 100644
--- a/chat-cli/src/main.rs
+++ b/chat-cli/src/main.rs
@@ -51,7 +51,9 @@ fn main() {
     println!("Players online: {:?}", client.get_players());
 
     client
-        .register(comp::Player::new(username, None), password)
+        .register(comp::Player::new(username, None), password, |provider| {
+            provider == "https://auth.veloren.net"
+        })
         .unwrap();
 
     let (tx, rx) = mpsc::channel();
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 983d2f59a5..f6a04ab2b9 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,4 +15,4 @@ log = "0.4.8"
 specs = "0.15.1"
 vek = { version = "0.9.9", features = ["serde"] }
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 255ff314a8..0e95113d79 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -33,7 +33,7 @@ crossbeam = "=0.7.2"
 notify = "5.0.0-pre.1"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index cf364fd0b9..5e2c228bb7 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,4 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "f3445fc1dca55f09205bdbe8ad038db60fea442b" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index ddcd6cd9db..aa50f7d19b 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -180,8 +180,7 @@ impl PlayState for MainMenuState {
             ));
 
             if let Some(info) = global_state.info_message.take() {
-                self.main_menu_ui
-                    .show_info(info, localized_strings.get("common.okay").to_owned());
+                self.main_menu_ui.show_info(info);
             }
 
             // Draw the UI to the screen.
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 6e83e2e85f..cb7399ecc1 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -335,9 +335,9 @@ impl MainMenuUi {
                 .press_image(self.imgs.button_press)
                 .label_y(Relative::Scalar(2.0))
                 .label(match popup_type {
-                    PopupType::Error => "Okay",
-                    PopupType::ConnectionInfo => "Cancel",
-                    PopupType::AuthTrustPrompt(_) => "Cancel",
+                    PopupType::Error => self.voxygen_i18n.get("common.okay"),
+                    PopupType::ConnectionInfo => self.voxygen_i18n.get("common.cancel"),
+                    PopupType::AuthTrustPrompt(_) => self.voxygen_i18n.get("common.cancel"),
                 })
                 .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(self.fonts.cyri.scale(15))
@@ -365,8 +365,8 @@ impl MainMenuUi {
                     .press_image(self.imgs.button_press)
                     .label_y(Relative::Scalar(2.0))
                     .label("Add")
-                    .label_font_id(self.fonts.cyri)
-                    .label_font_size(15)
+                    .label_font_id(self.fonts.cyri.conrod_id)
+                    .label_font_size(self.fonts.cyri.scale(15))
                     .label_color(TEXT_COLOR)
                     .set(self.ids.button_add_auth_trust, ui_widgets)
                     .was_clicked()
@@ -448,7 +448,6 @@ impl MainMenuUi {
                         self.connecting = Some(std::time::Instant::now());
                         self.popup = Some(PopupData {
                             msg: [self.voxygen_i18n.get("main.connecting"), "..."].concat(),
-                            button_text: self.voxygen_i18n.get("common.cancel").to_owned(),
                             popup_type: PopupType::ConnectionInfo,
                         });
 
@@ -486,7 +485,6 @@ impl MainMenuUi {
                         self.connecting = Some(std::time::Instant::now());
                         self.popup = Some(PopupData {
                             msg: [self.voxygen_i18n.get("main.creating_world"), "..."].concat(),
-                            button_text: self.voxygen_i18n.get("common.cancel").to_owned(),
                             popup_type: PopupType::ConnectionInfo,
                         });
                     };
@@ -757,10 +755,9 @@ impl MainMenuUi {
         })
     }
 
-    pub fn show_info(&mut self, msg: String, button_text: String) {
+    pub fn show_info(&mut self, msg: String) {
         self.popup = Some(PopupData {
             msg,
-            button_text,
             popup_type: PopupType::Error,
         });
         self.connecting = None;

From 0b78b316660a5546cdc3721303cb622cccd2794a Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Sat, 4 Jan 2020 11:21:59 +0100
Subject: [PATCH 12/41] improve(voxygen): error handling while connecting

---
 client/src/lib.rs                    |  3 +-
 voxygen/src/menu/main/client_init.rs |  2 +-
 voxygen/src/menu/main/mod.rs         | 52 +++++++++++++++++++++-------
 voxygen/src/menu/main/ui.rs          |  7 ++--
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 7e3520a606..fc85c38ff6 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -5,6 +5,7 @@ pub mod error;
 
 // Reexports
 pub use crate::error::Error;
+pub use authc::AuthClientError;
 pub use specs::{
     join::Join,
     saveload::{Marker, MarkerAllocator},
@@ -105,7 +106,7 @@ impl Client {
                     );
                 }
 
-                log::info!("Auth Server: {:?}", server_info.auth_provider);
+                log::debug!("Auth Server: {:?}", server_info.auth_provider);
 
                 // Initialize `State`
                 let mut state = State::default();
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 04e37f6f7f..26dc674983 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -95,7 +95,7 @@ impl ClientInit {
                                 Err(err) => {
                                     match err {
                                         ClientError::Network(PostError::Bincode(_)) => {
-                                            last_err = Some(Error::ConnectionFailed(err));
+                                            last_err = Some(Error::ClientError(err));
                                             break 'tries;
                                         },
                                         // Assume the connection failed and try again soon
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index aa50f7d19b..f4fb75a122 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -75,22 +75,48 @@ impl PlayState for MainMenuState {
                 },
                 Some(InitMsg::Done(Err(err))) => {
                     client_init = None;
-                    global_state.info_message = Some(
-                        match err {
-                            InitError::BadAddress(_) | InitError::NoAddress => "Server not found",
+                    global_state.info_message = Some({
+                        let err = match err {
+                            InitError::BadAddress(_) | InitError::NoAddress => {
+                                "Server not found".into()
+                            },
                             InitError::ClientError(err) => match err {
-                                client::Error::InvalidAuth => "Invalid credentials",
-                                client::Error::TooManyPlayers => "Server is full",
-                                client::Error::AuthServerNotTrusted => "Auth server not trusted",
-                                _ => {
-                                    error!("Error when trying to connect: {:?}", err);
-                                    "Connection Failed"
+                                client::Error::InvalidAuth => "Invalid credentials".into(),
+                                client::Error::TooManyPlayers => "Server is full".into(),
+                                client::Error::AuthServerNotTrusted => {
+                                    "Auth server not trusted".into()
+                                },
+                                client::Error::ServerWentMad => "ServerWentMad: Probably versions \
+                                                                 are incompatible, check for \
+                                                                 updates."
+                                    .into(),
+                                client::Error::ServerTimeout => "Timeout: Server did not respond \
+                                                                 in time. (Overloaded or network \
+                                                                 issues)."
+                                    .into(),
+                                client::Error::ServerShutdown => "Server shut down".into(),
+                                client::Error::AlreadyLoggedIn => {
+                                    "You are already logged into the server.".into()
+                                },
+                                client::Error::Network(e) => format!("Network error: {:?}", e),
+                                client::Error::Other(e) => format!("Error: {}", e),
+                                client::Error::AuthClientError(e) => match e {
+                                    client::AuthClientError::JsonError(e) => {
+                                        format!("Fatal error: {}", e)
+                                    },
+                                    client::AuthClientError::RequestError(e) => {
+                                        format!("Failed to send request to Auth server: {}", e)
+                                    },
+                                    client::AuthClientError::ServerError(_, e) => format!("{}", e),
                                 },
                             },
-                            InitError::ClientCrashed => "Client crashed",
-                        }
-                        .to_string(),
-                    );
+                            InitError::ClientCrashed => "Client crashed".into(),
+                        };
+                        // Log error for possible additional use later or incase that the error
+                        // displayed is cut of.
+                        error!("{}", err);
+                        err
+                    });
                 },
                 Some(InitMsg::IsAuthTrusted(auth_server)) => {
                     if global_state
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index cb7399ecc1..f56c8c309e 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -281,7 +281,7 @@ impl MainMenuUi {
                 )
                 .font_id(self.fonts.cyri.conrod_id);
             let (frame_w, frame_h) = if let PopupType::AuthTrustPrompt(_) = popup_type {
-                (65.0 * 8.0, 300.0)
+                (65.0 * 8.0, 370.0)
             } else {
                 (65.0 * 6.0, 140.0)
             };
@@ -747,8 +747,9 @@ impl MainMenuUi {
         self.popup = Some(PopupData {
             msg: format!(
                 "Warning: The server you are trying to connect to has provided this \
-                 authentication server addresss:\n\n{}\n\nbut it is not in your list of trusted \
-                 authentication servers.",
+                 authentication server address:\n\n{}\n\nbut it is not in your list of trusted \
+                 authentication servers.\n\nMake sure that you trust this site and owner to not \
+                 try and bruteforce your password!",
                 &auth_server
             ),
             popup_type: PopupType::AuthTrustPrompt(auth_server),

From 20ac07374f0c1db7ee9229f6f2a88774370dec19 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Sun, 5 Jan 2020 23:37:40 +0100
Subject: [PATCH 13/41] Update auth to use new hashing scheme.

---
 Cargo.lock        | 40 +++++++++++++++++++++++++++++++---------
 client/Cargo.toml |  2 +-
 common/Cargo.toml |  2 +-
 server/Cargo.toml |  2 +-
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90350a0271..f1f4dca142 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033#68504561dd868bc2065e9300a27616f3560f7033"
+source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -157,13 +157,14 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033#68504561dd868bc2065e9300a27616f3560f7033"
+source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1245,6 +1246,14 @@ dependencies = [
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gdk"
 version = "0.8.0"
@@ -3288,6 +3297,17 @@ dependencies = [
  "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rust-argon2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
@@ -4218,7 +4238,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4234,7 +4254,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4266,7 +4286,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4834,9 +4854,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
 "checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=68504561dd868bc2065e9300a27616f3560f7033)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
 "checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
@@ -4961,6 +4981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
 "checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
 "checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
+"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
@@ -5167,6 +5188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
 "checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index f6a04ab2b9..671d5c2a11 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,4 +15,4 @@ log = "0.4.8"
 specs = "0.15.1"
 vek = { version = "0.9.9", features = ["serde"] }
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 0e95113d79..219b9aeb61 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -33,7 +33,7 @@ crossbeam = "=0.7.2"
 notify = "5.0.0-pre.1"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 5e2c228bb7..aaccf0a24a 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,4 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "68504561dd868bc2065e9300a27616f3560f7033" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }

From 0716b9b8e99d5e6b29f0ed57bfb58f133d70d0ea Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Mon, 6 Jan 2020 23:32:46 +0100
Subject: [PATCH 14/41] Fixed gameserver crash on authprovider error.

---
 server/src/sys/message.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index bc7a4b9b25..425e10cc42 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -127,12 +127,8 @@ impl<'a> System<'a> for Sys {
                         player,
                         token_or_username,
                     } if player.is_valid() => {
-                        if !accounts
-                            .query(token_or_username.clone())
-                            .expect("Handle this error!")
-                        {
-                            // TODO: Graceful error handling!
-                            // TODO: Graceful error handling! (e.g. AlreadyLoggedIn)
+                        if !accounts.query(token_or_username.clone()).unwrap_or(false) {
+                            // TO-DO: Set a less generic error here.
                             client.error_state(RequestStateError::Denied);
                             break;
                         }

From 59011de228f00aada2ca07c9e49288999d588de3 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Tue, 7 Jan 2020 01:27:18 -0500
Subject: [PATCH 15/41] improve(login): more precise error handling during
 login

---
 client/src/error.rs          |  2 +-
 client/src/lib.rs            | 36 +++++++++++++++---------------------
 common/src/msg/mod.rs        |  2 +-
 common/src/msg/server.rs     | 27 +++++++++++++--------------
 common/src/net/post2.rs      | 14 +++++++-------
 server/src/auth_provider.rs  | 34 ++++++++++++++++------------------
 server/src/lib.rs            |  4 ++--
 server/src/sys/message.rs    | 10 ++++++----
 voxygen/src/menu/main/mod.rs |  2 +-
 9 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/client/src/error.rs b/client/src/error.rs
index 6003bcb046..b81e806286 100644
--- a/client/src/error.rs
+++ b/client/src/error.rs
@@ -8,8 +8,8 @@ pub enum Error {
     ServerTimeout,
     ServerShutdown,
     TooManyPlayers,
-    InvalidAuth,
     AlreadyLoggedIn,
+    AuthErr(String),
     AuthClientError(AuthClientError),
     AuthServerNotTrusted,
     //TODO: InvalidAlias,
diff --git a/client/src/lib.rs b/client/src/lib.rs
index fc85c38ff6..71f69f5444 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -18,7 +18,7 @@ use common::{
     event::{EventBus, SfxEvent, SfxEventItem},
     msg::{
         validate_chat_msg, ChatMsgValidationError, ClientMsg, ClientState, PlayerListUpdate,
-        RequestStateError, ServerError, ServerInfo, ServerMsg, MAX_BYTES_CHAT_MSG,
+        RegisterError, RequestStateError, ServerInfo, ServerMsg, MAX_BYTES_CHAT_MSG,
     },
     net::PostBox,
     state::State,
@@ -87,13 +87,13 @@ impl Client {
         let mut postbox = PostBox::to(addr)?;
 
         // Wait for initial sync
-        let (state, entity, server_info, world_map) = match postbox.next_message() {
-            Some(ServerMsg::InitialSync {
+        let (state, entity, server_info, world_map) = match postbox.next_message()? {
+            ServerMsg::InitialSync {
                 entity_package,
                 server_info,
                 time_of_day,
                 world_map: (map_size, world_map),
-            }) => {
+            } => {
                 // TODO: Display that versions don't match in Voxygen
                 if server_info.git_hash != common::util::GIT_HASH.to_string() {
                     log::warn!(
@@ -132,9 +132,7 @@ impl Client {
 
                 (state, entity, server_info, (world_map, map_size))
             },
-            Some(ServerMsg::Error(ServerError::TooManyPlayers)) => {
-                return Err(Error::TooManyPlayers);
-            },
+            ServerMsg::TooManyPlayers => return Err(Error::TooManyPlayers),
             _ => return Err(Error::ServerWentMad),
         };
 
@@ -203,11 +201,15 @@ impl Client {
         self.client_state = ClientState::Pending;
 
         loop {
-            match self.postbox.next_message() {
-                Some(ServerMsg::StateAnswer(Err((RequestStateError::Denied, _)))) => {
-                    break Err(Error::InvalidAuth);
+            match self.postbox.next_message()? {
+                ServerMsg::StateAnswer(Err((RequestStateError::RegisterDenied(err), state))) => {
+                    self.client_state = state;
+                    break Err(match err {
+                        RegisterError::AlreadyLoggedIn => Error::AlreadyLoggedIn,
+                        RegisterError::AuthError(err) => Error::AuthErr(err),
+                    });
                 },
-                Some(ServerMsg::StateAnswer(Ok(ClientState::Registered))) => break Ok(()),
+                ServerMsg::StateAnswer(Ok(ClientState::Registered)) => break Ok(()),
                 _ => {},
             }
         }
@@ -572,12 +574,8 @@ impl Client {
         if new_msgs.len() > 0 {
             for msg in new_msgs {
                 match msg {
-                    ServerMsg::Error(e) => match e {
-                        ServerError::TooManyPlayers => return Err(Error::ServerWentMad),
-                        ServerError::InvalidAuth => return Err(Error::InvalidAuth),
-                        ServerError::AlreadyLoggedIn => return Err(Error::AlreadyLoggedIn),
-                        ServerError::AuthError(_) => unreachable!(),
-                        //TODO: ServerError::InvalidAlias => return Err(Error::InvalidAlias),
+                    ServerMsg::TooManyPlayers => {
+                        return Err(Error::ServerWentMad);
                     },
                     ServerMsg::Shutdown => return Err(Error::ServerShutdown),
                     ServerMsg::InitialSync { .. } => return Err(Error::ServerWentMad),
@@ -720,10 +718,6 @@ impl Client {
                         self.client_state = state;
                     },
                     ServerMsg::StateAnswer(Err((error, state))) => {
-                        if error == RequestStateError::Denied {
-                            warn!("Connection denied!");
-                            return Err(Error::InvalidAuth);
-                        }
                         warn!(
                             "StateAnswer: {:?}. Server thinks client is in state {:?}.",
                             error, state
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index 1baee67e15..1c04fece94 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -6,7 +6,7 @@ pub mod server;
 pub use self::{
     client::ClientMsg,
     ecs_packet::EcsCompPacket,
-    server::{PlayerListUpdate, RequestStateError, ServerError, ServerInfo, ServerMsg},
+    server::{PlayerListUpdate, RegisterError, RequestStateError, ServerInfo, ServerMsg},
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
diff --git a/common/src/msg/server.rs b/common/src/msg/server.rs
index 8159dfb874..c517eec665 100644
--- a/common/src/msg/server.rs
+++ b/common/src/msg/server.rs
@@ -8,14 +8,6 @@ use authc::AuthClientError;
 use hashbrown::HashMap;
 use vek::*;
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum RequestStateError {
-    Denied,
-    Already,
-    Impossible,
-    WrongMessage,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServerInfo {
     pub name: String,
@@ -79,21 +71,28 @@ pub enum ServerMsg {
         chunk: Result<Box<TerrainChunk>, ()>,
     },
     TerrainBlockUpdates(HashMap<Vec3<i32>, Block>),
-    Error(ServerError),
     Disconnect,
     Shutdown,
+    TooManyPlayers,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum ServerError {
-    TooManyPlayers,
-    InvalidAuth,
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RequestStateError {
+    RegisterDenied(RegisterError),
+    Denied,
+    Already,
+    Impossible,
+    WrongMessage,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RegisterError {
     AlreadyLoggedIn,
     AuthError(String),
     //TODO: InvalidAlias,
 }
 
-impl From<AuthClientError> for ServerError {
+impl From<AuthClientError> for RegisterError {
     fn from(err: AuthClientError) -> Self { Self::AuthError(err.to_string()) }
 }
 
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index bae88d25f2..ee9e7303e5 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -119,16 +119,16 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
 
     pub fn send_message(&mut self, msg: S) { let _ = self.send_tx.send(msg); }
 
-    pub fn next_message(&mut self) -> Option<R> {
-        if self.error.is_some() {
-            return None;
+    pub fn next_message(&mut self) -> Result<R, Error> {
+        if let Some(e) = self.error.clone() {
+            return Err(e);
         }
 
-        match self.recv_rx.recv().ok()? {
-            Ok(msg) => Some(msg),
+        match self.recv_rx.recv().map_err(|_| Error::ChannelFailure)? {
+            Ok(msg) => Ok(msg),
             Err(e) => {
-                self.error = Some(e);
-                None
+                self.error = Some(e.clone());
+                Err(e)
             },
         }
     }
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 6634e5bf51..4ec2abb306 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -1,5 +1,5 @@
 use authc::{AuthClient, AuthToken, Uuid};
-use common::msg::ServerError;
+use common::msg::RegisterError;
 use hashbrown::HashMap;
 use std::str::FromStr;
 
@@ -42,28 +42,26 @@ impl AuthProvider {
         }
     }
 
-    pub fn query(&mut self, username_or_token: String) -> Result<bool, ServerError> {
+    pub fn query(&mut self, username_or_token: String) -> Result<(), RegisterError> {
         // Based on whether auth server is provided or not we expect an username or
         // token
         match &self.auth_server {
             // Token from auth server expected
             Some(srv) => {
                 log::info!("Validating '{}' token.", &username_or_token);
-                if let Ok(token) = AuthToken::from_str(&username_or_token) {
-                    match srv.validate(token) {
-                        Ok(uuid) => {
-                            if self.accounts.contains_key(&uuid) {
-                                return Err(ServerError::AlreadyLoggedIn);
-                            }
-                            let username = srv.uuid_to_username(uuid.clone())?;
-                            self.accounts.insert(uuid, username);
-                            Ok(true)
-                        },
-                        Err(e) => Err(ServerError::from(e)),
-                    }
-                } else {
-                    Ok(false)
+                // Parse token
+                let token = AuthToken::from_str(&username_or_token)
+                    .map_err(|e| RegisterError::AuthError(e.to_string()))?;
+                // Validate token
+                let uuid = srv.validate(token)?;
+                // Check if already logged in
+                if self.accounts.contains_key(&uuid) {
+                    return Err(RegisterError::AlreadyLoggedIn);
                 }
+                // Log in
+                let username = srv.uuid_to_username(uuid.clone())?;
+                self.accounts.insert(uuid, username);
+                Ok(())
             },
             // Username is expected
             None => {
@@ -73,9 +71,9 @@ impl AuthProvider {
                 if !self.accounts.contains_key(&uuid) {
                     log::info!("New User '{}'", username);
                     self.accounts.insert(uuid, username);
-                    Ok(true)
+                    Ok(())
                 } else {
-                    Err(ServerError::AlreadyLoggedIn)
+                    Err(RegisterError::AlreadyLoggedIn)
                 }
             },
         }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 47fc395176..c3cc142a63 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -27,7 +27,7 @@ use common::{
     assets, comp,
     effect::Effect,
     event::{EventBus, ServerEvent},
-    msg::{ClientMsg, ClientState, ServerError, ServerInfo, ServerMsg},
+    msg::{ClientMsg, ClientState, ServerInfo, ServerMsg},
     net::PostOffice,
     state::{State, TimeOfDay},
     sync::{Uid, WorldSyncExt},
@@ -505,7 +505,7 @@ impl Server {
                 <= self.state.ecs().read_storage::<Client>().join().count()
             {
                 // Note: in this case the client is dropped
-                client.notify(ServerMsg::Error(ServerError::TooManyPlayers));
+                client.notify(ServerMsg::TooManyPlayers);
             } else {
                 let entity = self
                     .state
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 425e10cc42..b7d0fa182d 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -127,10 +127,12 @@ impl<'a> System<'a> for Sys {
                         player,
                         token_or_username,
                     } if player.is_valid() => {
-                        if !accounts.query(token_or_username.clone()).unwrap_or(false) {
-                            // TO-DO: Set a less generic error here.
-                            client.error_state(RequestStateError::Denied);
-                            break;
+                        match accounts.query(token_or_username.clone()) {
+                            Err(err) => {
+                                client.error_state(RequestStateError::RegisterDenied(err));
+                                break;
+                            },
+                            Ok(()) => {},
                         }
                         match client.client_state {
                             ClientState::Connected => {
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index f4fb75a122..0d44cb8c16 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -81,7 +81,7 @@ impl PlayState for MainMenuState {
                                 "Server not found".into()
                             },
                             InitError::ClientError(err) => match err {
-                                client::Error::InvalidAuth => "Invalid credentials".into(),
+                                client::Error::AuthErr(e) => format!("Auth error on server: {}", e),
                                 client::Error::TooManyPlayers => "Server is full".into(),
                                 client::Error::AuthServerNotTrusted => {
                                     "Auth server not trusted".into()

From 504f225acb169bd582829b546591c1f340d9f06d Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 8 Jan 2020 00:16:43 +0100
Subject: [PATCH 16/41] Update readme with signup link.

add changes to changelog
---
 CHANGELOG.md | 1 +
 README.md    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd4f119c21..ef5177faaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Overhauled NPC AI
 - Pets now attack enemies and defend their owners
 - Added collars to tame wild animals
+- Added authentication system (to play on the official server register on https://account.veloren.net)
 
 ### Changed
 
diff --git a/README.md b/README.md
index 4ffbf053c8..60d017207d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,9 @@ Currently the communication of contributors happens mainly on our [official Disc
 
 ## Useful Links
 
+[Sign Up](https://account.veloren.net) - Here you can create an online account for Veloren.
+This will be needed to play on auth-enabled servers, including the official server.
+
 [The Book](https://book.veloren.net) - A collection of all important information relating to Veloren. It includes information on how to compile Veloren and how to contribute.
 
 [Future Plans](https://gitlab.com/veloren/veloren/milestones) - Go here for information about Veloren's development roadmap and what we're currently working on.

From 026a3647b2a5810b5d430a3398df2bec15eef10c Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 8 Jan 2020 23:45:10 +0100
Subject: [PATCH 17/41] Auth error help message. main menu message about auth

---
 assets/voxygen/i18n/en.ron   | 13 ++++++++-----
 voxygen/src/menu/main/mod.rs |  6 ++++--
 voxygen/src/menu/main/ui.rs  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index 96d7344654..459dca3398 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -113,11 +113,14 @@ Thanks for taking the time to read this notice, we hope you enjoy the game!
         // Login process description
         "main.login_process": r#"Information on the Login Process:
 
-Put in any username. No Account needed yet.
-                                        
-Character names and appearances will be saved locally.
+If you are having issues signing in:
 
-Levels/Items are not saved yet."#,
+Please note that you now need an account
+to play on auth-enabled servers.
+
+You can create an account over at
+
+https://account.veloren.net."#,
 
 
         /// End Main screen section
@@ -358,4 +361,4 @@ Willpower
         "esc_menu.quit_game": "Quit Game",
         /// End Escape Menu Section
     }
-)
\ No newline at end of file
+)
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 0d44cb8c16..7a9c445b90 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -30,6 +30,8 @@ impl MainMenuState {
 
 const DEFAULT_PORT: u16 = 14004;
 
+static LOGIN_FAILED_MSG: &str = "If you are having issues signing in. Please note that you now need an account to play on auth-enabled servers.\nYou can create an account over at https://account.veloren.net.";
+
 impl PlayState for MainMenuState {
     fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult {
         // Set up an fps clock.
@@ -104,8 +106,8 @@ impl PlayState for MainMenuState {
                                     client::AuthClientError::JsonError(e) => {
                                         format!("Fatal error: {}", e)
                                     },
-                                    client::AuthClientError::RequestError(e) => {
-                                        format!("Failed to send request to Auth server: {}", e)
+                                    client::AuthClientError::RequestError(_) => {
+                                        LOGIN_FAILED_MSG.into()
                                     },
                                     client::AuthClientError::ServerError(_, e) => format!("{}", e),
                                 },
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index f56c8c309e..b323be9169 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -459,7 +459,7 @@ impl MainMenuUi {
                     };
                 }
                 // Info Window
-                Rectangle::fill_with([550.0, 200.0], color::BLACK)
+                Rectangle::fill_with([550.0, 400.0], color::BLACK)
                     .top_left_with_margins_on(ui_widgets.window, 40.0, 40.0)
                     .color(Color::Rgba(0.0, 0.0, 0.0, 0.95))
                     .set(self.ids.info_frame, ui_widgets);

From 0024fe2d0b21b9008b6a9586c87597882b75cf69 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 8 Jan 2020 23:53:04 +0100
Subject: [PATCH 18/41] Fix singleplayer crash.

---
 server/src/auth_provider.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 4ec2abb306..bfc2855ce9 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -12,7 +12,7 @@ fn derive_uuid(username: &str) -> Uuid {
             let mix_byte_step: u8 = mix_byte_1
                 .wrapping_pow(239)
                 .wrapping_mul((i as u8).wrapping_pow(43));
-            let mix_byte_2 = state[i + mix_byte_step as usize % 16];
+            let mix_byte_2 = state[(i + mix_byte_step as usize) % 16];
             let rot_step: u8 = mix_byte_1
                 .wrapping_pow(29)
                 .wrapping_mul((i as u8).wrapping_pow(163));

From 19b56afc3d10c9d97ddd6b60ba033bda442b85df Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Sat, 11 Jan 2020 20:50:35 +0100
Subject: [PATCH 19/41] Remove account on logout.

---
 server/src/auth_provider.rs | 2 ++
 server/src/sys/message.rs   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index bfc2855ce9..1f6f411198 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -42,6 +42,8 @@ impl AuthProvider {
         }
     }
 
+    pub fn logout(&mut self, username: &str) { self.accounts.retain(|_, v| v != username); }
+
     pub fn query(&mut self, username_or_token: String) -> Result<(), RegisterError> {
         // Based on whether auth server is provided or not we expect an username or
         // token
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index b7d0fa182d..8d42652867 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -293,6 +293,7 @@ impl<'a> System<'a> for Sys {
                         None,
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
                     ));
+                    accounts.logout(&player.alias);
                 }
                 server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                 client.postbox.send_message(ServerMsg::Disconnect);

From 1ccff31be587e5a7318b1995b399dbf6bb274e7f Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 11 Jan 2020 16:04:49 -0500
Subject: [PATCH 20/41] Add uid to Player component fix: world examples

---
 Cargo.lock                           | 94 ++--------------------------
 chat-cli/src/main.rs                 |  2 +-
 client/src/lib.rs                    | 19 +++---
 common/Cargo.toml                    |  2 +-
 common/src/comp/player.rs            | 15 +++--
 common/src/msg/client.rs             |  2 +-
 server/src/auth_provider.rs          | 19 +++---
 server/src/sys/message.rs            | 23 ++++---
 voxygen/src/menu/main/client_init.rs | 11 ++--
 voxygen/src/menu/main/mod.rs         | 24 +++----
 world/Cargo.toml                     |  2 +-
 11 files changed, 67 insertions(+), 146 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1f4dca142..80411e8e72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2181,17 +2181,14 @@ dependencies = [
 
 [[package]]
 name = "minifb"
-version = "0.15.3"
-source = "git+https://github.com/emoon/rust_minifb.git#9d5529422c883d541a0eedcc329dc32afdcf28fa"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-protocols 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2299,18 +2296,6 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "nix"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -3790,19 +3775,6 @@ dependencies = [
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "term"
 version = "0.5.2"
@@ -4381,7 +4353,7 @@ dependencies = [
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "minifb 0.15.3 (git+https://github.com/emoon/rust_minifb.git)",
+ "minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4537,20 +4509,6 @@ dependencies = [
  "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wayland-client"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "wayland-commons"
 version = "0.21.13"
@@ -4569,17 +4527,6 @@ dependencies = [
  "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wayland-commons"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "wayland-protocols"
 version = "0.21.13"
@@ -4603,17 +4550,6 @@ dependencies = [
  "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wayland-protocols"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "wayland-scanner"
 version = "0.21.13"
@@ -4634,16 +4570,6 @@ dependencies = [
  "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wayland-scanner"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "wayland-sys"
 version = "0.21.13"
@@ -4662,11 +4588,6 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wayland-sys"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "web-sys"
 version = "0.3.36"
@@ -5074,7 +4995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-"checksum minifb 0.15.3 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
+"checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
 "checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
@@ -5084,7 +5005,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
-"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 "checksum noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
@@ -5245,7 +5165,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -5306,19 +5225,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
 "checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
-"checksum wayland-client 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9bcc929c26d59a655b0d2cd337299326acc1f6e3d4434c3ae2d6c78d32290ca4"
 "checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
 "checksum wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
-"checksum wayland-commons 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "539cdd0c296802332d763ff663739a7f83bdf67b3df58e99fe0215e96a495142"
 "checksum wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
 "checksum wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
-"checksum wayland-protocols 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79df44471a2e01b61c089472443858062fa64ea60dfd24267848efd7a8f161b6"
 "checksum wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
-"checksum wayland-scanner 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43ea5ea1a117137d72c0c197431d198d69783b5e8ca996b0583c98e10b44d426"
 "checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
-"checksum wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "537500923d50be11d95a63c4cb538145e4c82edf61296b7debc1f94a1a6514ed"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
 "checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
diff --git a/chat-cli/src/main.rs b/chat-cli/src/main.rs
index 4b4776dc9c..312094231c 100644
--- a/chat-cli/src/main.rs
+++ b/chat-cli/src/main.rs
@@ -51,7 +51,7 @@ fn main() {
     println!("Players online: {:?}", client.get_players());
 
     client
-        .register(comp::Player::new(username, None), password, |provider| {
+        .register(username, password, |provider| {
             provider == "https://auth.veloren.net"
         })
         .unwrap();
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 71f69f5444..09841e3fa7 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -175,27 +175,24 @@ impl Client {
     /// Request a state transition to `ClientState::Registered`.
     pub fn register(
         &mut self,
-        player: comp::Player,
+        username: String,
         password: String,
         mut auth_trusted: impl FnMut(&str) -> bool,
     ) -> Result<(), Error> {
         // Authentication
-        let token_or_username = match &self.server_info.auth_provider {
-            Some(addr) => {
+        let token_or_username = self.server_info.auth_provider.as_ref().map(|addr|
                 // Query whether this is a trusted auth server
                 if auth_trusted(&addr) {
-                    authc::AuthClient::new(addr)
-                        .sign_in(&player.alias, &password)?
-                        .serialize()
+                    Ok(authc::AuthClient::new(addr)
+                        .sign_in(&username, &password)?
+                        .serialize())
                 } else {
-                    return Err(Error::AuthServerNotTrusted);
+                    Err(Error::AuthServerNotTrusted)
                 }
-            },
-            None => player.alias.clone(),
-        };
+        ).unwrap_or(Ok(username))?;
 
         self.postbox.send_message(ClientMsg::Register {
-            player,
+            view_distance: self.view_distance,
             token_or_username,
         });
         self.client_state = ClientState::Pending;
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 219b9aeb61..83f065ac92 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -30,7 +30,7 @@ hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
 find_folder = "0.3.0"
 parking_lot = "0.9.0"
 crossbeam = "=0.7.2"
-notify = "5.0.0-pre.1"
+notify = "5.0.0-pre.2"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
 authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
diff --git a/common/src/comp/player.rs b/common/src/comp/player.rs
index 2078b0efb8..b7a6aa1a3d 100644
--- a/common/src/comp/player.rs
+++ b/common/src/comp/player.rs
@@ -1,3 +1,4 @@
+use authc::Uuid;
 use specs::{Component, FlaggedStorage, NullStorage};
 use specs_idvs::IDVStorage;
 
@@ -7,20 +8,26 @@ const MAX_ALIAS_LEN: usize = 32;
 pub struct Player {
     pub alias: String,
     pub view_distance: Option<u32>,
+    uuid: Uuid,
 }
 
 impl Player {
-    pub fn new(alias: String, view_distance: Option<u32>) -> Self {
+    pub fn new(alias: String, view_distance: Option<u32>, uuid: Uuid) -> Self {
         Self {
             alias,
             view_distance,
+            uuid,
         }
     }
 
-    pub fn is_valid(&self) -> bool {
-        self.alias.chars().all(|c| c.is_alphanumeric() || c == '_')
-            && self.alias.len() <= MAX_ALIAS_LEN
+    pub fn is_valid(&self) -> bool { Self::alias_is_valid(&self.alias) }
+
+    pub fn alias_is_valid(alias: &str) -> bool {
+        alias.chars().all(|c| c.is_alphanumeric() || c == '_') && alias.len() <= MAX_ALIAS_LEN
     }
+
+    /// Not to be confused with uid
+    pub fn uuid(&self) -> Uuid { self.uuid }
 }
 
 impl Component for Player {
diff --git a/common/src/msg/client.rs b/common/src/msg/client.rs
index 87ded3f830..962cf40174 100644
--- a/common/src/msg/client.rs
+++ b/common/src/msg/client.rs
@@ -4,7 +4,7 @@ use vek::*;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ClientMsg {
     Register {
-        player: comp::Player,
+        view_distance: Option<u32>,
         token_or_username: String,
     },
     Character {
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 1f6f411198..03c3db9960 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -1,6 +1,7 @@
 use authc::{AuthClient, AuthToken, Uuid};
 use common::msg::RegisterError;
 use hashbrown::HashMap;
+use log::error;
 use std::str::FromStr;
 
 fn derive_uuid(username: &str) -> Uuid {
@@ -42,9 +43,13 @@ impl AuthProvider {
         }
     }
 
-    pub fn logout(&mut self, username: &str) { self.accounts.retain(|_, v| v != username); }
+    pub fn logout(&mut self, uuid: Uuid) {
+        if self.accounts.remove(&uuid).is_none() {
+            error!("Attempted to logout user that is not logged in.");
+        };
+    }
 
-    pub fn query(&mut self, username_or_token: String) -> Result<(), RegisterError> {
+    pub fn query(&mut self, username_or_token: String) -> Result<(String, Uuid), RegisterError> {
         // Based on whether auth server is provided or not we expect an username or
         // token
         match &self.auth_server {
@@ -61,9 +66,9 @@ impl AuthProvider {
                     return Err(RegisterError::AlreadyLoggedIn);
                 }
                 // Log in
-                let username = srv.uuid_to_username(uuid.clone())?;
-                self.accounts.insert(uuid, username);
-                Ok(())
+                let username = srv.uuid_to_username(uuid)?;
+                self.accounts.insert(uuid, username.clone());
+                Ok((username, uuid))
             },
             // Username is expected
             None => {
@@ -72,8 +77,8 @@ impl AuthProvider {
                 let uuid = derive_uuid(&username);
                 if !self.accounts.contains_key(&uuid) {
                     log::info!("New User '{}'", username);
-                    self.accounts.insert(uuid, username);
-                    Ok(())
+                    self.accounts.insert(uuid, username.clone());
+                    Ok((username, uuid))
                 } else {
                     Err(RegisterError::AlreadyLoggedIn)
                 }
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 8d42652867..47d02d23c3 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -122,18 +122,27 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Pending => {},
                     },
-                    // Valid player
+                    // Request registered state (login)
                     ClientMsg::Register {
-                        player,
+                        view_distance,
                         token_or_username,
-                    } if player.is_valid() => {
-                        match accounts.query(token_or_username.clone()) {
+                    } => {
+                        let (username, uuid) = match accounts.query(token_or_username.clone()) {
                             Err(err) => {
                                 client.error_state(RequestStateError::RegisterDenied(err));
                                 break;
                             },
-                            Ok(()) => {},
+                            Ok((username, uuid)) => (username, uuid),
+                        };
+
+                        let player = Player::new(username, view_distance, uuid);
+
+                        if !player.is_valid() {
+                            // Invalid player
+                            client.error_state(RequestStateError::Impossible);
+                            break;
                         }
+
                         match client.client_state {
                             ClientState::Connected => {
                                 // Add Player component to this client
@@ -154,8 +163,6 @@ impl<'a> System<'a> for Sys {
                         }
                         //client.allow_state(ClientState::Registered);
                     },
-                    // Invalid player
-                    ClientMsg::Register { .. } => client.error_state(RequestStateError::Impossible),
                     ClientMsg::SetViewDistance(view_distance) => match client.client_state {
                         ClientState::Character { .. } => {
                             players
@@ -293,7 +300,7 @@ impl<'a> System<'a> for Sys {
                         None,
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
                     ));
-                    accounts.logout(&player.alias);
+                    accounts.logout(player.uuid());
                 }
                 server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                 client.postbox.send_message(ServerMsg::Disconnect);
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 26dc674983..87e33fee55 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -1,5 +1,5 @@
 use client::{error::Error as ClientError, Client};
-use common::{comp, net::PostError};
+use common::net::PostError;
 use crossbeam::channel::{unbounded, Receiver, Sender, TryRecvError};
 use std::{
     net::ToSocketAddrs,
@@ -40,7 +40,8 @@ pub struct ClientInit {
 impl ClientInit {
     pub fn new(
         connection_args: (String, u16, bool),
-        player: comp::Player,
+        username: String,
+        view_distance: Option<u32>,
         password: String,
     ) -> Self {
         let (server_address, default_port, prefer_ipv6) = connection_args;
@@ -72,10 +73,10 @@ impl ClientInit {
                         for socket_addr in
                             first_addrs.clone().into_iter().chain(second_addrs.clone())
                         {
-                            match Client::new(socket_addr, player.view_distance) {
+                            match Client::new(socket_addr, view_distance) {
                                 Ok(mut client) => {
                                     if let Err(err) =
-                                        client.register(player.clone(), password, |auth_server| {
+                                        client.register(username, password, |auth_server| {
                                             let _ = tx
                                                 .send(Msg::IsAuthTrusted(auth_server.to_string()));
                                             trust_rx
@@ -89,7 +90,7 @@ impl ClientInit {
                                         last_err = Some(Error::ClientError(err));
                                         break 'tries;
                                     }
-                                    let _ = tx.send(Ok(client));
+                                    let _ = tx.send(Msg::Done(Ok(client)));
                                     return;
                                 },
                                 Err(err) => {
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 7a9c445b90..04b212886b 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -3,13 +3,10 @@ mod client_init;
 
 use super::char_selection::CharSelectionState;
 use crate::{
-    i18n::{i18n_asset_key, VoxygenLocalization},
-    singleplayer::Singleplayer,
-    window::Event,
-    Direction, GlobalState, PlayState, PlayStateResult,
+    singleplayer::Singleplayer, window::Event, Direction, GlobalState, PlayState, PlayStateResult,
 };
 use client_init::{ClientInit, Error as InitError, Msg as InitMsg};
-use common::{assets::load_expect, clock::Clock, comp};
+use common::{clock::Clock, comp};
 use log::{error, warn};
 #[cfg(feature = "singleplayer")]
 use std::time::Duration;
@@ -66,7 +63,7 @@ impl PlayState for MainMenuState {
 
             // Poll client creation.
             match client_init.as_ref().and_then(|init| init.poll()) {
-                Some(Ok(mut client)) => {
+                Some(InitMsg::Done(Ok(mut client))) => {
                     self.main_menu_ui.connected();
                     // Register voxygen components / resources
                     crate::ecs::init(client.state_mut().ecs_mut());
@@ -203,9 +200,6 @@ impl PlayState for MainMenuState {
                     },
                 }
             }
-            let localized_strings = load_expect::<VoxygenLocalization>(&i18n_asset_key(
-                &global_state.settings.language.selected_language,
-            ));
 
             if let Some(info) = global_state.info_message.take() {
                 self.main_menu_ui.show_info(info);
@@ -249,21 +243,17 @@ fn attempt_login(
         warn!("Failed to save settings: {:?}", err);
     }
 
-    let player = comp::Player::new(
-        username.clone(),
-        Some(global_state.settings.graphics.view_distance),
-    );
-
-    if player.is_valid() {
+    if comp::Player::alias_is_valid(&username) {
         // Don't try to connect if there is already a connection in progress.
         if client_init.is_none() {
             *client_init = Some(ClientInit::new(
                 (server_address, server_port, false),
-                player,
+                username,
+                Some(global_state.settings.graphics.view_distance),
                 { password },
             ));
         }
     } else {
-        global_state.info_message = Some("Invalid username or password".to_string());
+        global_state.info_message = Some("Invalid username".to_string());
     }
 }
diff --git a/world/Cargo.toml b/world/Cargo.toml
index 9430acc0d9..4dd4c22b71 100644
--- a/world/Cargo.toml
+++ b/world/Cargo.toml
@@ -28,5 +28,5 @@ serde_derive = "1.0.102"
 ron = "0.5.1"
 
 [dev-dependencies]
-minifb = { git = "https://github.com/emoon/rust_minifb.git" }
 pretty_env_logger = "0.3.0"
+minifb = "0.14.0"

From 7b218b9054d7e478e4f53e4e4bc9ce810e1ea285 Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Sun, 2 Feb 2020 09:05:58 +0100
Subject: [PATCH 21/41] feat(auth): localisation of authentication errors

---
 assets/voxygen/i18n/en.ron   | 14 +++++++-
 voxygen/src/menu/main/mod.rs | 70 +++++++++++++++++++++++-------------
 voxygen/src/menu/main/ui.rs  |  8 ++---
 3 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index 459dca3398..a9ab34bd68 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -65,6 +65,8 @@ VoxygenLocalization(
         "common.disclaimer": "Disclaimer",
         "common.cancel": "Cancel",
         "common.none": "None",
+        "common.error": "Error",
+        "common.fatal_error": "Fatal Error",
 
         // Message when connection to the server is lost
         "common.connection_lost": r#"Connection lost!
@@ -121,7 +123,17 @@ to play on auth-enabled servers.
 You can create an account over at
 
 https://account.veloren.net."#,
-
+        "main.login.server_not_found": "Server not found",
+        "main.login.authentication_error": "Auth error on server",
+        "main.login.server_full": "Server is full",
+        "main.login.untrusted_auth_server": "Auth server not trusted",
+        "main.login.outdated_client_or_server": "ServerWentMad: Probably versions are incompatible, check for updates.",
+        "main.login.timeout": "Timeout: Server did not respond in time. (Overloaded or network issues).",
+        "main.login.server_shut_down": "Server shut down",
+        "main.login.already_logged_in": "You are already logged into the server.",
+        "main.login.network_error": "Network error",
+        "main.login.failed_sending_request": "Request to Auth server failed",
+        "main.login.client_crashed": "Client crashed",
 
         /// End Main screen section
 
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 04b212886b..145d8e9b16 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -6,7 +6,7 @@ use crate::{
     singleplayer::Singleplayer, window::Event, Direction, GlobalState, PlayState, PlayStateResult,
 };
 use client_init::{ClientInit, Error as InitError, Msg as InitMsg};
-use common::{clock::Clock, comp};
+use common::{assets::load_expect, clock::Clock, comp};
 use log::{error, warn};
 #[cfg(feature = "singleplayer")]
 use std::time::Duration;
@@ -27,8 +27,6 @@ impl MainMenuState {
 
 const DEFAULT_PORT: u16 = 14004;
 
-static LOGIN_FAILED_MSG: &str = "If you are having issues signing in. Please note that you now need an account to play on auth-enabled servers.\nYou can create an account over at https://account.veloren.net.";
-
 impl PlayState for MainMenuState {
     fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult {
         // Set up an fps clock.
@@ -45,6 +43,10 @@ impl PlayState for MainMenuState {
         // Reset singleplayer server if it was running already
         global_state.singleplayer = None;
 
+        let localized_strings = load_expect::<crate::i18n::VoxygenLocalization>(
+            &crate::i18n::i18n_asset_key(&global_state.settings.language.selected_language),
+        );
+
         loop {
             // Handle window events.
             for event in global_state.window.fetch_events(&mut global_state.settings) {
@@ -77,39 +79,57 @@ impl PlayState for MainMenuState {
                     global_state.info_message = Some({
                         let err = match err {
                             InitError::BadAddress(_) | InitError::NoAddress => {
-                                "Server not found".into()
+                                localized_strings.get("main.login.server_not_found").into()
                             },
                             InitError::ClientError(err) => match err {
-                                client::Error::AuthErr(e) => format!("Auth error on server: {}", e),
-                                client::Error::TooManyPlayers => "Server is full".into(),
-                                client::Error::AuthServerNotTrusted => {
-                                    "Auth server not trusted".into()
+                                client::Error::AuthErr(e) => format!(
+                                    "{}: {}",
+                                    localized_strings.get("main.login.authentication_error"),
+                                    e
+                                ),
+                                client::Error::TooManyPlayers => {
+                                    localized_strings.get("main.login.server_full").into()
                                 },
-                                client::Error::ServerWentMad => "ServerWentMad: Probably versions \
-                                                                 are incompatible, check for \
-                                                                 updates."
+                                client::Error::AuthServerNotTrusted => localized_strings
+                                    .get("main.login.untrusted_auth_server")
                                     .into(),
-                                client::Error::ServerTimeout => "Timeout: Server did not respond \
-                                                                 in time. (Overloaded or network \
-                                                                 issues)."
+                                client::Error::ServerWentMad => localized_strings
+                                    .get("main.login.outdated_client_or_server")
                                     .into(),
-                                client::Error::ServerShutdown => "Server shut down".into(),
+                                client::Error::ServerTimeout => {
+                                    localized_strings.get("main.login.timeout").into()
+                                },
+                                client::Error::ServerShutdown => {
+                                    localized_strings.get("main.login.server_shut_down").into()
+                                },
                                 client::Error::AlreadyLoggedIn => {
-                                    "You are already logged into the server.".into()
+                                    localized_strings.get("main.login.already_logged_in").into()
+                                },
+                                client::Error::Network(e) => format!(
+                                    "{}: {:?}",
+                                    localized_strings.get("main.login.network_error"),
+                                    e
+                                ),
+                                client::Error::Other(e) => {
+                                    format!("{}: {}", localized_strings.get("common.error"), e)
                                 },
-                                client::Error::Network(e) => format!("Network error: {:?}", e),
-                                client::Error::Other(e) => format!("Error: {}", e),
                                 client::Error::AuthClientError(e) => match e {
-                                    client::AuthClientError::JsonError(e) => {
-                                        format!("Fatal error: {}", e)
-                                    },
-                                    client::AuthClientError::RequestError(_) => {
-                                        LOGIN_FAILED_MSG.into()
-                                    },
+                                    client::AuthClientError::JsonError(e) => format!(
+                                        "{}: {}",
+                                        localized_strings.get("common.fatal_error"),
+                                        e
+                                    ),
+                                    client::AuthClientError::RequestError(_) => format!(
+                                        "{}: {}",
+                                        localized_strings.get("main.login.failed_sending_request"),
+                                        e
+                                    ),
                                     client::AuthClientError::ServerError(_, e) => format!("{}", e),
                                 },
                             },
-                            InitError::ClientCrashed => "Client crashed".into(),
+                            InitError::ClientCrashed => {
+                                localized_strings.get("main.login.client_crashed").into()
+                            },
                         };
                         // Log error for possible additional use later or incase that the error
                         // displayed is cut of.
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index b323be9169..e0fd515c89 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -364,16 +364,16 @@ impl MainMenuUi {
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
                     .label_y(Relative::Scalar(2.0))
-                    .label("Add")
-                    .label_font_id(self.fonts.cyri.conrod_id)
-                    .label_font_size(self.fonts.cyri.scale(15))
+                    .label("Add") // TODO: localize
+                    .label_font_id(self.fonts.cyri)
+                    .label_font_size(15)
                     .label_color(TEXT_COLOR)
                     .set(self.ids.button_add_auth_trust, ui_widgets)
                     .was_clicked()
                 {
                     events.push(Event::AuthServerTrust(auth_server.clone(), true));
                     change_popup = Some(Some(PopupData {
-                        msg: "Connecting...".to_string(),
+                        msg: localized_strings.get("main.connecting").into(),
                         popup_type: PopupType::ConnectionInfo,
                     }));
                 }

From 88fdff77c4510379b589f34e5c4943a253ce2477 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 22 Feb 2020 13:35:25 -0500
Subject: [PATCH 22/41] Update auth

---
 Cargo.lock                  | 569 ++----------------------------------
 voxygen/src/menu/main/ui.rs |   6 +-
 2 files changed, 21 insertions(+), 554 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80411e8e72..81d5bdc3d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,17 +137,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
-dependencies = [
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "auth-common"
-version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -157,9 +147,9 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -168,19 +158,6 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "authc"
-version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
-dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -286,25 +263,6 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -348,11 +306,6 @@ name = "bumpalo"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -363,16 +316,6 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "bytes"
 version = "0.5.4"
@@ -558,9 +501,9 @@ dependencies = [
 [[package]]
 name = "conrod_core"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
- "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
+ "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
  "copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -573,7 +516,7 @@ dependencies = [
 [[package]]
 name = "conrod_derive"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -583,7 +526,7 @@ dependencies = [
 [[package]]
 name = "conrod_winit"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#bbc8a5efd2760669754f866fd7ee556d381e2c0e"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 
 [[package]]
 name = "const-random"
@@ -608,32 +551,6 @@ name = "constant_time_eq"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "cookie"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "copypasta"
 version = "0.6.0"
@@ -921,14 +838,6 @@ name = "deunicode"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "directories"
 version = "2.0.2"
@@ -1026,14 +935,6 @@ dependencies = [
  "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "euc"
 version = "0.3.0"
@@ -1112,17 +1013,6 @@ name = "fixedbitset"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "flate2"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1177,11 +1067,6 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "futures"
-version = "0.1.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "futures-channel"
 version = "0.3.4"
@@ -1195,15 +1080,6 @@ name = "futures-core"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "futures-cpupool"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.4"
@@ -1315,14 +1191,6 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -1630,23 +1498,6 @@ dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "h2"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "h2"
 version = "0.2.2"
@@ -1703,16 +1554,6 @@ name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "http"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "http"
 version = "0.2.0"
@@ -1723,17 +1564,6 @@ dependencies = [
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "http-body"
 version = "0.3.1"
@@ -1756,35 +1586,6 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hyper"
-version = "0.12.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hyper"
 version = "0.13.3"
@@ -1808,22 +1609,6 @@ dependencies = [
  "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.20.0"
@@ -1962,11 +1747,6 @@ dependencies = [
  "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "keccak"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -2193,14 +1973,6 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.21"
@@ -2479,11 +2251,6 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
@@ -2828,18 +2595,6 @@ name = "protobuf"
 version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "publicsuffix"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.2"
@@ -3138,41 +2893,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.9.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.10.4"
@@ -3314,18 +3034,6 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rustls"
 version = "0.17.0"
@@ -3510,17 +3218,6 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.6.1"
@@ -3537,18 +3234,6 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -3707,14 +3392,6 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "string"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3859,24 +3536,6 @@ dependencies = [
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio"
 version = "0.2.13"
@@ -3893,75 +3552,6 @@ dependencies = [
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio-buf"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-current-thread"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.13.0"
@@ -3973,55 +3563,6 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio-sync"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-threadpool"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-timer"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.2.0"
@@ -4061,14 +3602,6 @@ name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "try_from"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -4082,11 +3615,6 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicase"
 version = "1.4.2"
@@ -4210,7 +3738,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4226,7 +3754,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4258,7 +3786,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4295,12 +3823,12 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
- "conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
+ "conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
+ "conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
  "cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4395,16 +3923,6 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "want"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "want"
 version = "0.3.0"
@@ -4606,14 +4124,6 @@ dependencies = [
  "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.18.0"
@@ -4775,10 +4285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
@@ -4792,17 +4300,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 "checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 "checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
-"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
@@ -4824,14 +4328,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
 "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
 "checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
-"checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
-"checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
-"checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
+"checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
+"checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
+"checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
-"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
@@ -4861,7 +4363,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
-"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@@ -4874,7 +4375,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
 "checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
@@ -4884,7 +4384,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 "checksum find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
-"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -4893,10 +4392,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 "checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
 "checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
 "checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 "checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
@@ -4907,7 +4404,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 "checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
-"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
 "checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
@@ -4936,22 +4432,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
-"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
-"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
-"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 "checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
-"checksum hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 "checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
@@ -4967,7 +4458,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
 "checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
-"checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -4996,7 +4486,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 "checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
-"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -5024,7 +4513,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
-"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
@@ -5066,7 +4554,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 "checksum prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
 "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
-"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
@@ -5101,7 +4588,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
-"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
@@ -5112,7 +4598,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
 "checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
 "checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
@@ -5134,10 +4619,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
-"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
@@ -5157,7 +4640,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
@@ -5174,28 +4656,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
-"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 "checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
-"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
-"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
-"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
-"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
-"checksum tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
 "checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
-"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
-"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
-"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
-"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
-"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
@@ -5214,7 +4683,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 "checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 "checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
@@ -5235,7 +4703,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
-"checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
 "checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index e0fd515c89..4859783c59 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -365,15 +365,15 @@ impl MainMenuUi {
                     .press_image(self.imgs.button_press)
                     .label_y(Relative::Scalar(2.0))
                     .label("Add") // TODO: localize
-                    .label_font_id(self.fonts.cyri)
-                    .label_font_size(15)
+                    .label_font_id(self.fonts.cyri.conrod_id)
+                    .label_font_size(self.fonts.cyri.scale(15))
                     .label_color(TEXT_COLOR)
                     .set(self.ids.button_add_auth_trust, ui_widgets)
                     .was_clicked()
                 {
                     events.push(Event::AuthServerTrust(auth_server.clone(), true));
                     change_popup = Some(Some(PopupData {
-                        msg: localized_strings.get("main.connecting").into(),
+                        msg: self.voxygen_i18n.get("main.connecting").into(),
                         popup_type: PopupType::ConnectionInfo,
                     }));
                 }

From b451baa1fca21eb5610553ac7dc209b981b333de Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 22 Feb 2020 21:37:12 -0500
Subject: [PATCH 23/41] Hide password text

---
 Cargo.lock                  | 551 +++++++++++++++++++++++++++++++++++-
 voxygen/Cargo.toml          |   4 +-
 voxygen/src/menu/main/ui.rs |   1 +
 3 files changed, 545 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 81d5bdc3d3..34f02d0066 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,17 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
+source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
+dependencies = [
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "auth-common"
+version = "0.1.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -147,9 +157,9 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
+source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -158,6 +168,19 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "authc"
+version = "1.0.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
+dependencies = [
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -263,6 +286,25 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -306,6 +348,11 @@ name = "bumpalo"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -316,6 +363,16 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bytes"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bytes"
 version = "0.5.4"
@@ -551,6 +608,32 @@ name = "constant_time_eq"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cookie"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "copypasta"
 version = "0.6.0"
@@ -838,6 +921,14 @@ name = "deunicode"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "directories"
 version = "2.0.2"
@@ -935,6 +1026,14 @@ dependencies = [
  "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "error-chain"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "euc"
 version = "0.3.0"
@@ -1013,6 +1112,17 @@ name = "fixedbitset"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "flate2"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1067,6 +1177,11 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "futures-channel"
 version = "0.3.4"
@@ -1080,6 +1195,15 @@ name = "futures-core"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-cpupool"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.4"
@@ -1191,6 +1315,14 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -1498,6 +1630,23 @@ dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "h2"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "h2"
 version = "0.2.2"
@@ -1554,6 +1703,16 @@ name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "http"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "http"
 version = "0.2.0"
@@ -1564,6 +1723,17 @@ dependencies = [
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "http-body"
 version = "0.3.1"
@@ -1586,6 +1756,35 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.12.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hyper"
 version = "0.13.3"
@@ -1609,6 +1808,22 @@ dependencies = [
  "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.20.0"
@@ -1747,6 +1962,11 @@ dependencies = [
  "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "keccak"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1973,6 +2193,14 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.21"
@@ -2251,6 +2479,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
@@ -2595,6 +2828,18 @@ name = "protobuf"
 version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "publicsuffix"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.2"
@@ -2893,6 +3138,41 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.9.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.10.4"
@@ -3034,6 +3314,18 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustls"
 version = "0.17.0"
@@ -3218,6 +3510,17 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.6.1"
@@ -3234,6 +3537,18 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sha3"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -3392,6 +3707,14 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "string"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3536,6 +3859,24 @@ dependencies = [
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio"
 version = "0.2.13"
@@ -3552,6 +3893,75 @@ dependencies = [
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio-buf"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-current-thread"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-executor"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-io"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-reactor"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.13.0"
@@ -3563,6 +3973,55 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio-sync"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tcp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-threadpool"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-timer"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.2.0"
@@ -3602,6 +4061,14 @@ name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "try_from"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -3615,6 +4082,11 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicase"
 version = "1.4.2"
@@ -3738,7 +4210,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3754,7 +4226,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3786,7 +4258,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3823,7 +4295,7 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3923,6 +4395,16 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "want"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "want"
 version = "0.3.0"
@@ -4124,6 +4606,14 @@ dependencies = [
  "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.18.0"
@@ -4285,8 +4775,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
@@ -4300,13 +4792,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 "checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 "checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
@@ -4334,6 +4830,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
+"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
@@ -4363,6 +4861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@@ -4375,6 +4874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
 "checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
@@ -4384,6 +4884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 "checksum find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -4392,8 +4893,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 "checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
 "checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
 "checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 "checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
@@ -4404,6 +4907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 "checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
 "checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
@@ -4432,17 +4936,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
+"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
+"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
+"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 "checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
+"checksum hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 "checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
@@ -4458,6 +4967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
 "checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
+"checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -4486,6 +4996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 "checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
+"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -4513,6 +5024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
@@ -4554,6 +5066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 "checksum prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
 "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
+"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
@@ -4588,6 +5101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
+"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
@@ -4598,6 +5112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
 "checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
 "checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
@@ -4619,8 +5134,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
@@ -4640,6 +5157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
@@ -4656,15 +5174,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
+"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 "checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
+"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
+"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
+"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
+"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
+"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
+"checksum tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
 "checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
+"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
+"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
+"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
+"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
@@ -4683,6 +5214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
+"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 "checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 "checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
@@ -4703,6 +5235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
+"checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
 "checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 49939b5767..c7ad82331f 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -24,8 +24,8 @@ gfx_device_gl = { version = "0.16.2", optional = true }
 gfx_window_glutin = "0.31.0"
 glutin = "0.21.1"
 winit = { version = "0.19.4", features = ["serde"] }
-conrod_core = { git = "https://gitlab.com/veloren/conrod.git" }
-conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
+conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "hide_text" }
+conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "hide_text" }
 euc = "0.3.0"
 
 # ECS
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 4859783c59..8832cc7e59 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -536,6 +536,7 @@ impl MainMenuUi {
                     // transparent background
                     .color(TRANSPARENT)
                     .border_color(TRANSPARENT)
+                    .hide_text("*")
                     .set(self.ids.password_field, ui_widgets)
                 {
                     match event {

From 69f1a1597cef4b80ba298e81a5e73cbe37adc061 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 22 Feb 2020 21:39:18 -0500
Subject: [PATCH 24/41] Move changelog entry back up to the unreleased section

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5177faaf..37648ad8bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - New attack animation
 - weapon control system
 - Game pauses when in singleplayer and pause menu
+- Added authentication system (to play on the official server register on https://account.veloren.net)
 
 ### Changed
 
@@ -80,7 +81,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Overhauled NPC AI
 - Pets now attack enemies and defend their owners
 - Added collars to tame wild animals
-- Added authentication system (to play on the official server register on https://account.veloren.net)
 
 ### Changed
 

From ea33a8e2b33e262213101ed7cff9c0419f9f5257 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Sun, 8 Mar 2020 21:59:49 +0100
Subject: [PATCH 25/41] Rebased.

---
 Cargo.lock         | 551 +--------------------------------------------
 client/Cargo.toml  |   2 +-
 common/Cargo.toml  |   2 +-
 server/Cargo.toml  |   2 +-
 voxygen/Cargo.toml |   2 +-
 5 files changed, 13 insertions(+), 546 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 34f02d0066..81d5bdc3d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,17 +137,7 @@ dependencies = [
 [[package]]
 name = "auth-common"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
-dependencies = [
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "auth-common"
-version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -157,9 +147,9 @@ dependencies = [
 [[package]]
 name = "authc"
 version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e#0f7efccdcce2089a6997653d36178705ade5749e"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -168,19 +158,6 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "authc"
-version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad#7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad"
-dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -286,25 +263,6 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -348,11 +306,6 @@ name = "bumpalo"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -363,16 +316,6 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "bytes"
 version = "0.5.4"
@@ -608,32 +551,6 @@ name = "constant_time_eq"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "cookie"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "copypasta"
 version = "0.6.0"
@@ -921,14 +838,6 @@ name = "deunicode"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "directories"
 version = "2.0.2"
@@ -1026,14 +935,6 @@ dependencies = [
  "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "euc"
 version = "0.3.0"
@@ -1112,17 +1013,6 @@ name = "fixedbitset"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "flate2"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1177,11 +1067,6 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "futures"
-version = "0.1.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "futures-channel"
 version = "0.3.4"
@@ -1195,15 +1080,6 @@ name = "futures-core"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "futures-cpupool"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.4"
@@ -1315,14 +1191,6 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -1630,23 +1498,6 @@ dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "h2"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "h2"
 version = "0.2.2"
@@ -1703,16 +1554,6 @@ name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "http"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "http"
 version = "0.2.0"
@@ -1723,17 +1564,6 @@ dependencies = [
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "http-body"
 version = "0.3.1"
@@ -1756,35 +1586,6 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hyper"
-version = "0.12.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hyper"
 version = "0.13.3"
@@ -1808,22 +1609,6 @@ dependencies = [
  "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.20.0"
@@ -1962,11 +1747,6 @@ dependencies = [
  "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "keccak"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -2193,14 +1973,6 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.21"
@@ -2479,11 +2251,6 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
@@ -2828,18 +2595,6 @@ name = "protobuf"
 version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "publicsuffix"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.2"
@@ -3138,41 +2893,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.9.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.10.4"
@@ -3314,18 +3034,6 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rustls"
 version = "0.17.0"
@@ -3510,17 +3218,6 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.6.1"
@@ -3537,18 +3234,6 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -3707,14 +3392,6 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "string"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3859,24 +3536,6 @@ dependencies = [
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio"
 version = "0.2.13"
@@ -3893,75 +3552,6 @@ dependencies = [
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio-buf"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-current-thread"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.13.0"
@@ -3973,55 +3563,6 @@ dependencies = [
  "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio-sync"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-threadpool"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-timer"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.2.0"
@@ -4061,14 +3602,6 @@ name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "try_from"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -4082,11 +3615,6 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicase"
 version = "1.4.2"
@@ -4210,7 +3738,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4226,7 +3754,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4258,7 +3786,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4295,7 +3823,7 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)",
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4395,16 +3923,6 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "want"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "want"
 version = "0.3.0"
@@ -4606,14 +4124,6 @@ dependencies = [
  "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.18.0"
@@ -4775,10 +4285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=0f7efccdcce2089a6997653d36178705ade5749e)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad)" = "<none>"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
@@ -4792,17 +4300,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 "checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 "checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
-"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
@@ -4830,8 +4334,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
-"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
@@ -4861,7 +4363,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
-"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@@ -4874,7 +4375,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
 "checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
@@ -4884,7 +4384,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 "checksum find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
-"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -4893,10 +4392,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 "checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
 "checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
 "checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 "checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
@@ -4907,7 +4404,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 "checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
-"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
 "checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
@@ -4936,22 +4432,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
-"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
-"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
-"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 "checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
-"checksum hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 "checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
@@ -4967,7 +4458,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
 "checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
-"checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -4996,7 +4486,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 "checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
-"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -5024,7 +4513,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
-"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
@@ -5066,7 +4554,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 "checksum prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
 "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
-"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
@@ -5101,7 +4588,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
-"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 "checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
@@ -5112,7 +4598,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
 "checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
 "checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
@@ -5134,10 +4619,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
-"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
@@ -5157,7 +4640,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
@@ -5174,28 +4656,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
-"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 "checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
-"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
-"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
-"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
-"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
-"checksum tokio-rustls 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
 "checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
-"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
-"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
-"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
-"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
-"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
@@ -5214,7 +4683,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 "checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 "checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
@@ -5235,7 +4703,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
 "checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 "checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
-"checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
 "checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 671d5c2a11..9d649f0b01 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,4 +15,4 @@ log = "0.4.8"
 specs = "0.15.1"
 vek = { version = "0.9.9", features = ["serde"] }
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 83f065ac92..f70c8c1b6c 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -33,7 +33,7 @@ crossbeam = "=0.7.2"
 notify = "5.0.0-pre.2"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index aaccf0a24a..c86adf42d8 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,4 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "0f7efccdcce2089a6997653d36178705ade5749e" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index c7ad82331f..a4e5c7cff5 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -63,7 +63,7 @@ chrono = "0.4.9"
 bincode = "1.2"
 deunicode = "1.0"
 uvth = "3.1.1"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 dispatch = "0.1.4"

From accfd5b9f84311e58c449ececd11a5c75a7bc011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Mon, 9 Mar 2020 11:49:57 +0100
Subject: [PATCH 26/41] regenerated Cargo.lock, requiering 7 less dependent
 crates and greatly reducing size of cargo.lock file

---
 Cargo.lock | 3697 ++++++++++++++++++++++++++--------------------------
 1 file changed, 1835 insertions(+), 1862 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 81d5bdc3d3..a7da69e687 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,134 +4,153 @@
 name = "adler32"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "ahash"
 version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
 dependencies = [
- "const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "const-random",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.6"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "alsa-sys"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "andrew"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "line_drawing",
+ "rusttype 0.7.9",
+ "walkdir",
+ "xdg",
+ "xml-rs",
 ]
 
 [[package]]
 name = "android_glue"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
 
 [[package]]
 name = "anymap"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
 
 [[package]]
 name = "approx"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94"
 
 [[package]]
 name = "approx"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "arr_macro"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a105bfda48707cf19220129e78fca01e9639433ffaef4163546ed8fb04120a5"
 dependencies = [
- "arr_macro_impl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arr_macro_impl",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "arr_macro_impl"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
 dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "arrayvec"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
 dependencies = [
- "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop",
 ]
 
 [[package]]
 name = "arrayvec"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 
 [[package]]
 name = "ascii"
 version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
 
 [[package]]
 name = "atk-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "atom"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
@@ -139,9 +158,9 @@ name = "auth-common"
 version = "0.1.0"
 source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3",
+ "serde",
+ "uuid",
 ]
 
 [[package]]
@@ -149,353 +168,392 @@ name = "authc"
 version = "1.0.0"
 source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
 dependencies = [
- "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
- "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "auth-common",
+ "fxhash",
+ "hex",
+ "reqwest",
+ "rust-argon2 0.6.1",
+ "serde_json",
+ "uuid",
 ]
 
 [[package]]
 name = "autocfg"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "autocfg"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
 [[package]]
 name = "backtrace"
-version = "0.3.40"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad235dabf00f36301792cfe82499880ba54c6486be094d1047b02bacb67c14e8"
 dependencies = [
- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys",
+ "cfg-if",
+ "libc",
+ "rustc-demangle",
 ]
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17b52e737c40a7d75abca20b29a19a0eb7ba9fc72c5a72dd282a0a3c2c0dc35"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
 ]
 
 [[package]]
 name = "base64"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "safemem",
 ]
 
 [[package]]
 name = "base64"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
 ]
 
 [[package]]
 name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
 [[package]]
 name = "bincode"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "serde",
 ]
 
 [[package]]
 name = "bindgen"
 version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cexpr",
+ "cfg-if",
+ "clang-sys",
+ "lazy_static",
+ "peeking_take_while",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "regex",
+ "rustc-hash",
+ "shlex",
 ]
 
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bitvec"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 
 [[package]]
 name = "blake2b_simd"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref",
+ "arrayvec 0.5.1",
+ "constant_time_eq",
 ]
 
 [[package]]
 name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
 ]
 
 [[package]]
 name = "brotli2"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 dependencies = [
- "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "brotli-sys",
+ "libc",
 ]
 
 [[package]]
 name = "bstr"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
 ]
 
 [[package]]
 name = "buf_redux"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
+ "safemem",
 ]
 
 [[package]]
 name = "bumpalo"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
 
 [[package]]
 name = "byteorder"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 
 [[package]]
 name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "bytes"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 
 [[package]]
 name = "c2-chacha"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86",
 ]
 
 [[package]]
 name = "c_vec"
 version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 
 [[package]]
 name = "cairo-rs"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
 dependencies = [
- "c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c_vec",
+ "cairo-sys-rs",
+ "glib",
+ "glib-sys",
+ "libc",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0395175ecba60accac076a02c31d143b9dcd9d5eb5316d7163a3273803b765c7"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "pkg-config",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "cast"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 dependencies = [
- "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jobserver",
 ]
 
 [[package]]
 name = "cexpr"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
 dependencies = [
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom",
 ]
 
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cgl"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
 dependencies = [
- "gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam",
+ "libc",
 ]
 
 [[package]]
 name = "chashmap"
 version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45"
 dependencies = [
- "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "owning_ref",
+ "parking_lot 0.4.8",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 dependencies = [
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer",
+ "num-traits 0.2.11",
+ "time",
 ]
 
 [[package]]
 name = "chunked_transfer"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
 
 [[package]]
 name = "clang-sys"
 version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
 dependencies = [
- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob",
+ "libc",
+ "libloading",
 ]
 
 [[package]]
 name = "clap"
 version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "textwrap",
+ "unicode-width",
 ]
 
 [[package]]
 name = "clipboard-win"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
 ]
 
 [[package]]
 name = "cocoa"
 version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "block",
+ "core-foundation 0.6.4",
+ "core-graphics",
+ "foreign-types",
+ "libc",
+ "objc",
 ]
 
 [[package]]
 name = "cocoa"
 version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "block",
+ "core-foundation 0.6.4",
+ "core-graphics",
+ "foreign-types",
+ "libc",
+ "objc",
 ]
 
 [[package]]
 name = "color_quant"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
 
 [[package]]
 name = "colored"
-version = "1.9.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "lazy_static",
+ "winapi 0.3.8",
 ]
 
 [[package]]
@@ -503,14 +561,14 @@ name = "conrod_core"
 version = "0.63.0"
 source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
- "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
- "copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "conrod_derive",
+ "copypasta",
+ "daggy",
+ "fnv",
+ "instant",
+ "num 0.2.1",
+ "pistoncore-input",
+ "rusttype 0.7.9",
 ]
 
 [[package]]
@@ -518,9 +576,9 @@ name = "conrod_derive"
 version = "0.63.0"
 source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
 ]
 
 [[package]]
@@ -530,955 +588,1057 @@ source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122df
 
 [[package]]
 name = "const-random"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a"
 dependencies = [
- "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "const-random-macro",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a"
 dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "constant_time_eq"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "copypasta"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fcbfb17a41091ba8bad1233d0178fda058968a71998dde3f11189f0b4aa9da"
 dependencies = [
- "clipboard-win 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smithay-clipboard 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clipboard-win",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "smithay-clipboard",
+ "wayland-client 0.23.6",
+ "x11-clipboard",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 dependencies = [
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.6.2",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 dependencies = [
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "core-foundation 0.6.4",
+ "foreign-types",
+ "libc",
 ]
 
 [[package]]
 name = "coreaudio-rs"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "coreaudio-sys",
 ]
 
 [[package]]
 name = "coreaudio-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
 dependencies = [
- "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bindgen",
 ]
 
 [[package]]
 name = "cpal"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120"
 dependencies = [
- "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "alsa-sys",
+ "core-foundation-sys 0.6.2",
+ "coreaudio-rs",
+ "failure",
+ "lazy_static",
+ "libc",
+ "num-traits 0.2.11",
+ "stdweb",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "criterion"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "cast",
+ "clap",
+ "criterion-plot",
+ "csv",
+ "itertools",
+ "lazy_static",
+ "num-traits 0.2.11",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
 ]
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
 dependencies = [
- "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cast",
+ "itertools",
 ]
 
 [[package]]
 name = "crossbeam"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "crossbeam-channel 0.3.9",
+ "crossbeam-deque",
+ "crossbeam-epoch 0.7.2",
+ "crossbeam-queue 0.1.2",
+ "crossbeam-utils 0.6.6",
 ]
 
 [[package]]
 name = "crossbeam-channel"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
 dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
 dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.2",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 dependencies = [
- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
 dependencies = [
- "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.12",
+ "cfg-if",
+ "crossbeam-utils 0.6.6",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "cfg-if",
+ "crossbeam-utils 0.7.2",
+ "lazy_static",
+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
 dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
 dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
 name = "crossbeam-utils"
 version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "lazy_static",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "cfg-if",
+ "lazy_static",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
 dependencies = [
- "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "csv-core"
-version = "0.1.6"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "ct-logs"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
 dependencies = [
- "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct",
 ]
 
 [[package]]
 name = "daggy"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
 dependencies = [
- "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "petgraph",
 ]
 
 [[package]]
 name = "deflate"
 version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
+ "byteorder 1.3.4",
+ "gzip-header",
 ]
 
 [[package]]
 name = "derivative"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
 ]
 
 [[package]]
 name = "deunicode"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307dde1a517939465bc4042b47377284a56cee6160f8066f1f5035eb7b25a3fc"
 
 [[package]]
 name = "directories"
 version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "dirs-sys",
 ]
 
 [[package]]
 name = "dirs"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "dirs-sys"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "dispatch"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
 
 [[package]]
 name = "dlib"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
 dependencies = [
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libloading",
 ]
 
 [[package]]
 name = "dot_vox"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83c18405ef54de0398b77a3ec8394d3a1639e7bf060e1385201e8db40c44ab41"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "lazy_static",
+ "log 0.4.8",
+ "nom",
 ]
 
 [[package]]
 name = "downcast-rs"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
 
 [[package]]
 name = "draw_state"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
 ]
 
 [[package]]
 name = "dtoa"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 
 [[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 
 [[package]]
 name = "encoding_rs"
 version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "env_logger"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "humantime",
+ "log 0.4.8",
+ "regex",
+ "termcolor",
 ]
 
 [[package]]
 name = "euc"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 dependencies = [
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vek",
 ]
 
 [[package]]
 name = "euclid"
 version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
 dependencies = [
- "euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid_macros",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "euclid_macros"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
 ]
 
 [[package]]
 name = "failure"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
 dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace",
+ "failure_derive",
 ]
 
 [[package]]
 name = "failure_derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
+ "synstructure",
 ]
 
 [[package]]
 name = "fern"
 version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
 dependencies = [
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono",
+ "colored",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "filetime"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "find_folder"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
 
 [[package]]
 name = "fixedbitset"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
 
 [[package]]
 name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types-shared",
 ]
 
 [[package]]
 name = "foreign-types-shared"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fsevent"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1616e68919f49d311720c3cf316e0a3522d8f2bd08f8da35f6b8a0fa12f9234b"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "fsevent-sys",
 ]
 
 [[package]]
 name = "fsevent-sys"
 version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41f1722e9bf862f62429d192f37d0c82c589aa18783aa06f0c4e5c3c90649fb"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "fuchsia-zircon-sys",
 ]
 
 [[package]]
 name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures-channel"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
 dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
 
 [[package]]
 name = "futures-io"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
 
 [[package]]
 name = "futures-macro"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "futures-sink"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
 
 [[package]]
 name = "futures-task"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
 
 [[package]]
 name = "futures-util"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
 dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-task",
+ "memchr",
+ "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
+ "slab",
 ]
 
 [[package]]
 name = "fxhash"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
 ]
 
 [[package]]
 name = "gdk"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cairo-rs",
+ "cairo-sys-rs",
+ "gdk-pixbuf",
+ "gdk-sys",
+ "gio",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango",
 ]
 
 [[package]]
 name = "gdk-pixbuf"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 dependencies = [
- "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys",
+ "gio",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "gdk-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "wasi",
 ]
 
 [[package]]
 name = "gfx"
 version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
 dependencies = [
- "draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "draw_state",
+ "gfx_core",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "gfx_core"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "draw_state",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "gfx_device_gl"
 version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109c385fa380c18888633aa27d1e16cbae518469702a2f69dcb5f52d5378bebc"
 dependencies = [
- "gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx_gl 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gfx_core",
+ "gfx_gl",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "gfx_gl"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d38164670920cfb7491bc0cf6f49f0554bd1c44cdbedc6c78d2bf91691ff5e"
 dependencies = [
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.14.0",
 ]
 
 [[package]]
 name = "gfx_window_glutin"
 version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
 dependencies = [
- "gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx_device_gl 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gfx_core",
+ "gfx_device_gl",
+ "glutin",
 ]
 
 [[package]]
 name = "gif"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
 dependencies = [
- "color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "color_quant",
+ "lzw",
 ]
 
 [[package]]
 name = "gio"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2db9fad8f1b0d4c7338a210a6cbdf081dcc1a3c223718c698c4f313f6c288acb"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "lazy_static",
+ "libc",
 ]
 
 [[package]]
 name = "gio-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a57872499171d279f8577ce83837da4cae62b08dd32892236ed67ab7ea61030"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "git2"
 version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gl_generator"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log 0.4.8",
+ "openssl-probe",
+ "openssl-sys",
+ "url 2.1.1",
 ]
 
 [[package]]
 name = "gl_generator"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
 dependencies = [
- "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "khronos_api",
+ "log 0.4.8",
+ "xml-rs",
+]
+
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log 0.4.8",
+ "xml-rs",
 ]
 
 [[package]]
 name = "gleam"
 version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
 ]
 
 [[package]]
 name = "glib"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e0be1b1432e227bcd1a9b28db9dc1474a7e7fd4227e08e16f35304f32d09b61"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib-sys",
+ "gobject-sys",
+ "lazy_static",
+ "libc",
 ]
 
 [[package]]
 name = "glib-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "615bef979b5838526aee99241afc80cfb2e34a8735d4bcb8ec6072598c18a408"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "glob"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "glsl-include"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daa2afb1631e7ab4543e0dde0e3fc68bb49c58fee89c07f30a26553b1f684ab6"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "regex",
 ]
 
 [[package]]
 name = "glutin"
-version = "0.21.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
 dependencies = [
- "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "android_glue",
+ "cgl",
+ "cocoa 0.18.5",
+ "core-foundation 0.6.4",
+ "core-graphics",
+ "glutin_egl_sys",
+ "glutin_emscripten_sys",
+ "glutin_gles2_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "lazy_static",
+ "libloading",
+ "objc",
+ "osmesa-sys",
+ "parking_lot 0.9.0",
+ "wayland-client 0.21.13",
+ "winapi 0.3.8",
+ "winit",
 ]
 
 [[package]]
 name = "glutin_egl_sys"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "glutin_emscripten_sys"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1"
 
 [[package]]
 name = "glutin_gles2_sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e853d96bebcb8e53e445225c3009758c6f5960d44f2543245f6f07b567dae0"
 dependencies = [
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "objc",
 ]
 
 [[package]]
 name = "glutin_glx_sys"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c243de74d6cf5ea100c788826d2fb9319de315485dd4b310811a663b3809c3"
 dependencies = [
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "x11-dl",
 ]
 
 [[package]]
 name = "glutin_wgl_sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a93dba7ee3a0feeac0f437141ff25e71ce2066bcf1a706acab1559ffff94eb6a"
 dependencies = [
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
 ]
 
 [[package]]
 name = "gobject-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70409d6405db8b1591602fcd0cbe8af52cd9976dd39194442b4c149ba343f86d"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib-sys",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "gtk"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d695d6be4110618a97c19cd068e8a00e53e33b87e3c65cdc5397667498b1bc24"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cairo-rs",
+ "cairo-sys-rs",
+ "cc",
+ "gdk",
+ "gdk-pixbuf",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "lazy_static",
+ "libc",
+ "pango",
 ]
 
 [[package]]
 name = "gtk-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 dependencies = [
- "atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk-sys",
+ "bitflags",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
 ]
 
 [[package]]
@@ -1486,1022 +1646,1148 @@ name = "guillotiere"
 version = "0.4.2"
 source = "git+https://github.com/Imberflur/guillotiere#42c298f5bcf0f95f1a004360d05e25ca3711e9ed"
 dependencies = [
- "euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid",
+ "svg_fmt",
 ]
 
 [[package]]
 name = "gzip-header"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
 dependencies = [
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast",
 ]
 
 [[package]]
 name = "h2"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "log 0.4.8",
+ "slab",
+ "tokio",
+ "tokio-util",
 ]
 
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 dependencies = [
- "ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ahash",
+ "autocfg 0.1.7",
+ "rayon",
+ "serde",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.3"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "hex"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 
 [[package]]
 name = "hibitset"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93a1bb8316a44459a7d14253c4d28dd7395cbd23cc04a68c46e851b8e46d64b1"
 dependencies = [
- "atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atom",
+ "rayon",
 ]
 
 [[package]]
 name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
 
 [[package]]
 name = "http"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "fnv",
+ "itoa",
 ]
 
 [[package]]
 name = "http-body"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "http",
 ]
 
 [[package]]
 name = "httparse"
 version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
 [[package]]
 name = "humantime"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error",
 ]
 
 [[package]]
 name = "hyper"
 version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "log 0.4.8",
+ "net2",
+ "pin-project",
+ "time",
+ "tokio",
+ "tower-service",
+ "want",
 ]
 
 [[package]]
 name = "hyper-rustls"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "ct-logs",
+ "futures-util",
+ "hyper",
+ "log 0.4.8",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "webpki",
 ]
 
 [[package]]
 name = "idna"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "idna"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "image"
-version = "0.22.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "png 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "gif",
+ "jpeg-decoder",
+ "num-iter",
+ "num-rational",
+ "num-traits 0.2.11",
+ "png",
+ "scoped_threadpool",
+ "tiff",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.3.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
 ]
 
 [[package]]
 name = "inflate"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
 dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
 ]
 
 [[package]]
 name = "inotify"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc39ee997811267bf8aa0b10e1674c5bea6caacc1957eede5ea45251fe33c6d5"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "inotify-sys",
+ "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "instant"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
 
 [[package]]
 name = "iovec"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "itertools"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
 dependencies = [
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
 [[package]]
 name = "jobserver"
 version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "rayon",
 ]
 
 [[package]]
 name = "js-sys"
 version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
 dependencies = [
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
 
 [[package]]
 name = "khronos_api"
 version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "lewton"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "ogg",
+ "smallvec 0.6.13",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
 
 [[package]]
 name = "libgit2-sys"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "libssh2-sys 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
 ]
 
 [[package]]
 name = "libloading"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "libssh2-sys"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
 ]
 
 [[package]]
 name = "libz-sys"
 version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
 ]
 
 [[package]]
 name = "line_drawing"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "linked-hash-map"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 
 [[package]]
 name = "lock_api"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
 dependencies = [
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard",
 ]
 
 [[package]]
 name = "log"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "log"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "lz4-compress"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f966533a922a9bba9e95e594c1fdb3b9bf5fdcdb11e37e51ad84cd76e468b91"
 dependencies = [
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 0.5.3",
+ "quick-error",
 ]
 
 [[package]]
 name = "lzw"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
 
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "matches"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.2.1"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
 [[package]]
 name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "memoffset"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version",
 ]
 
 [[package]]
 name = "mime"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 dependencies = [
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9",
 ]
 
 [[package]]
 name = "mime"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mime_guess"
-version = "1.8.7"
+version = "1.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
 dependencies = [
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.6",
+ "phf",
+ "phf_codegen",
+ "unicase 1.4.2",
 ]
 
 [[package]]
 name = "mime_guess"
 version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 dependencies = [
- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16",
+ "unicase 2.6.0",
 ]
 
 [[package]]
 name = "minifb"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
 dependencies = [
- "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cast",
+ "cc",
+ "orbclient",
+ "raw-window-handle",
+ "time",
+ "winapi 0.3.8",
+ "x11-dl",
 ]
 
 [[package]]
 name = "mio"
 version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log 0.4.8",
+ "miow",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
 ]
 
 [[package]]
 name = "mio-extras"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell",
+ "log 0.4.8",
+ "mio",
+ "slab",
 ]
 
 [[package]]
 name = "miow"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
 ]
 
 [[package]]
 name = "mopa"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915"
 
 [[package]]
 name = "msgbox"
 version = "0.4.0"
 source = "git+https://github.com/bekker/msgbox-rs.git?rev=68fe39a#68fe39a60019b38a1569ae4e9ed796a0f0542673"
 dependencies = [
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cocoa 0.19.1",
+ "gtk",
+ "objc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "multipart"
 version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
 dependencies = [
- "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "buf_redux",
+ "httparse",
+ "log 0.4.8",
+ "mime 0.2.6",
+ "mime_guess 1.8.8",
+ "quick-error",
+ "rand 0.4.6",
+ "safemem",
+ "tempdir",
+ "twoway",
 ]
 
 [[package]]
 name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "nix"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "void",
 ]
 
 [[package]]
 name = "nodrop"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "noise"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
 dependencies = [
- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6",
 ]
 
 [[package]]
 name = "nom"
 version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
+ "version_check 0.1.5",
 ]
 
 [[package]]
 name = "notify"
 version = "5.0.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b00c0b65188bffb5598c302e19b062feb94adef02c31f15622a163c95d673c3"
 dependencies = [
- "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "fsevent 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "inotify 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anymap",
+ "bitflags",
+ "chashmap",
+ "crossbeam-channel 0.4.2",
+ "filetime",
+ "fsevent",
+ "fsevent-sys",
+ "inotify",
+ "libc",
+ "mio",
+ "mio-extras",
+ "walkdir",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "num"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 dependencies = [
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer",
+ "num-iter",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
 dependencies = [
- "num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "num-integer",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-derive"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.39"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "num-integer",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-rational"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "num-bigint",
+ "num-integer",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-traits"
 version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
 dependencies = [
- "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
 name = "objc"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
- "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "malloc_buf",
 ]
 
 [[package]]
 name = "objc-foundation"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 dependencies = [
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "block",
+ "objc",
+ "objc_id",
 ]
 
 [[package]]
 name = "objc_id"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 dependencies = [
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "objc",
 ]
 
 [[package]]
 name = "ogg"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
 ]
 
+[[package]]
+name = "oorandom"
+version = "11.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
 [[package]]
 name = "openssl-sys"
 version = "0.9.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
 ]
 
 [[package]]
 name = "orbclient"
 version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
 dependencies = [
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall",
+ "sdl2",
 ]
 
 [[package]]
 name = "ordered-float"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "osmesa-sys"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
 dependencies = [
- "shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shared_library",
 ]
 
 [[package]]
 name = "owning_ref"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
 dependencies = [
- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stable_deref_trait",
 ]
 
 [[package]]
 name = "packed_simd"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "pango"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45374801e224373c3c0393cd48073c81093494c8735721e81d1dbaa4096b2767"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
 ]
 
 [[package]]
 name = "pango-sys"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94039b3921a4af4058a3e4335e5d15099101f298a92f5afc40bab3a3027594a1"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "parking_lot"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
 dependencies = [
- "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "owning_ref",
+ "parking_lot_core 0.2.14",
 ]
 
 [[package]]
 name = "parking_lot"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api",
+ "parking_lot_core 0.6.2",
+ "rustc_version",
 ]
 
 [[package]]
 name = "parking_lot_core"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "rand 0.4.6",
+ "smallvec 0.6.13",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "rustc_version",
+ "smallvec 0.6.13",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "petgraph"
 version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
 dependencies = [
- "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fixedbitset",
 ]
 
 [[package]]
 name = "phf"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared",
 ]
 
 [[package]]
 name = "phf_codegen"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 dependencies = [
- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
 name = "phf_generator"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared",
+ "rand 0.6.5",
 ]
 
 [[package]]
 name = "phf_shared"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 dependencies = [
- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher",
+ "unicase 1.4.2",
 ]
 
 [[package]]
 name = "pin-project"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
 dependencies = [
- "pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "pin-project-lite"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
 
 [[package]]
 name = "pin-utils"
 version = "0.1.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
 
 [[package]]
 name = "piston-float"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
 
 [[package]]
 name = "piston-viewport"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
 dependencies = [
- "piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "piston-float",
 ]
 
 [[package]]
 name = "pistoncore-input"
 version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "piston-viewport",
+ "serde",
+ "serde_derive",
 ]
 
 [[package]]
 name = "pkg-config"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+
+[[package]]
+name = "plotters"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
+dependencies = [
+ "js-sys",
+ "num-traits 0.2.11",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
 name = "png"
-version = "0.15.1"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "crc32fast",
+ "deflate",
+ "inflate",
 ]
 
 [[package]]
@@ -2509,851 +2795,919 @@ name = "portpicker"
 version = "0.1.0"
 source = "git+https://github.com/wusyong/portpicker-rs?branch=fix_ipv6#06b989ac271ada33f9d44e7bcfcb10d55ead0c43"
 dependencies = [
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5",
 ]
 
 [[package]]
 name = "ppv-lite86"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 
 [[package]]
 name = "pretty_env_logger"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
 dependencies = [
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono",
+ "env_logger",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "proc-macro-nested"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 
 [[package]]
 name = "proc-macro2"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
 dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "prometheus"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "protobuf",
+ "quick-error",
+ "spin",
 ]
 
 [[package]]
 name = "prometheus-static-metric"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "proc-macro2 0.3.8",
+ "quote 0.5.2",
+ "syn 0.13.11",
 ]
 
 [[package]]
 name = "protobuf"
-version = "2.8.1"
+version = "2.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a5325d019a4d837d3abde0a836920f959e33d350f77b5f1e289e061e774942"
 
 [[package]]
 name = "quick-error"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 dependencies = [
- "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.3.8",
 ]
 
 [[package]]
 name = "quote"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
 ]
 
 [[package]]
 name = "rand"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 dependencies = [
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand"
 version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
 dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg 0.1.2",
+ "rand_xorshift",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "libc",
+ "rand_chacha 0.2.1",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
 name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_chacha"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 dependencies = [
- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c2-chacha",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_jitter"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "rand_core 0.4.2",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand_os"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand_pcg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7",
+ "rand_core 0.4.2",
 ]
 
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_xoshiro"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "raw-window-handle"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "rayon"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque",
+ "crossbeam-queue 0.2.1",
+ "crossbeam-utils 0.7.2",
+ "lazy_static",
+ "num_cpus",
 ]
 
 [[package]]
 name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "redox_syscall"
 version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 
 [[package]]
 name = "redox_users"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
 dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "redox_syscall",
+ "rust-argon2 0.7.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.3.1"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.12"
+version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
 
 [[package]]
 name = "remove_dir_all"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "reqwest"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
 dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "js-sys",
+ "lazy_static",
+ "log 0.4.8",
+ "mime 0.3.16",
+ "mime_guess 2.0.3",
+ "percent-encoding 2.1.0",
+ "pin-project-lite",
+ "rustls",
+ "serde",
+ "serde_urlencoded",
+ "time",
+ "tokio",
+ "tokio-rustls",
+ "url 2.1.1",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "winreg",
 ]
 
 [[package]]
 name = "ring"
 version = "0.16.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "lazy_static",
+ "libc",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rodio"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 dependencies = [
- "cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cpal",
+ "hound",
+ "lazy_static",
+ "lewton",
 ]
 
 [[package]]
 name = "ron"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1",
+ "bitflags",
+ "serde",
 ]
 
 [[package]]
 name = "roots"
 version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
 
 [[package]]
 name = "rouille"
 version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 dependencies = [
- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rust-argon2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.9.3",
+ "brotli2",
+ "chrono",
+ "deflate",
+ "filetime",
+ "multipart",
+ "num_cpus",
+ "rand 0.5.6",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "term",
+ "threadpool",
+ "time",
+ "tiny_http",
+ "url 1.7.2",
 ]
 
 [[package]]
 name = "rust-argon2"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
 dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils 0.6.6",
+]
+
+[[package]]
+name = "rust-argon2"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
+dependencies = [
+ "base64 0.11.0",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 
 [[package]]
 name = "rustc-hash"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver",
 ]
 
 [[package]]
 name = "rustls"
 version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
 dependencies = [
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0",
+ "log 0.4.8",
+ "ring",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
 name = "rustls-native-certs"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 dependencies = [
- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-probe",
+ "rustls",
+ "schannel",
+ "security-framework",
 ]
 
 [[package]]
 name = "rusttype"
 version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 dependencies = [
- "rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusttype 0.8.2",
 ]
 
 [[package]]
 name = "rusttype"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
 dependencies = [
- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "approx 0.3.2",
+ "arrayvec 0.5.1",
+ "crossbeam-deque",
+ "crossbeam-utils 0.7.2",
+ "linked-hash-map",
+ "num_cpus",
+ "ordered-float",
+ "rustc-hash",
+ "stb_truetype",
 ]
 
 [[package]]
 name = "ryu"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 
 [[package]]
 name = "safemem"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 
 [[package]]
 name = "same-file"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "scan_fmt"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248286eec0f55678879ef1caec3d76276643ebcb5460d8cb6e732ef40f50aabe"
 dependencies = [
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex",
 ]
 
 [[package]]
 name = "schannel"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 
 [[package]]
 name = "scopeguard"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "sct"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 dependencies = [
- "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "sdl2"
 version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "lazy_static",
+ "libc",
+ "num 0.1.42",
+ "rand 0.6.5",
+ "sdl2-sys",
 ]
 
 [[package]]
 name = "sdl2-sys"
 version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
 ]
 
 [[package]]
 name = "security-framework"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "core-foundation 0.7.0",
+ "core-foundation-sys 0.7.0",
+ "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
 dependencies = [
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0",
+ "libc",
 ]
 
 [[package]]
 name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.102"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 dependencies = [
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.102"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.42"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "serde_urlencoded"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 dependencies = [
- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa",
+ "itoa",
+ "serde",
+ "url 2.1.1",
 ]
 
 [[package]]
 name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "shared_library"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
 ]
 
 [[package]]
 name = "shlex"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "shred"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
 dependencies = [
- "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "shred-derive 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.12",
+ "hashbrown",
+ "mopa",
+ "rayon",
+ "shred-derive",
+ "smallvec 0.6.13",
 ]
 
 [[package]]
 name = "shred-derive"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f37080f2751fbf091dbdebaa95bd6cf9dbf74ad1d50396b1908518a1747fdf"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
 ]
 
 [[package]]
 name = "shrev"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f"
 
 [[package]]
 name = "siphasher"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 
 [[package]]
 name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 dependencies = [
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.0.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
 
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
 dependencies = [
- "andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "andrew",
+ "bitflags",
+ "dlib",
+ "lazy_static",
+ "memmap",
+ "nix",
+ "wayland-client 0.21.13",
+ "wayland-commons 0.21.13",
+ "wayland-protocols 0.21.13",
 ]
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d"
 dependencies = [
- "andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "andrew",
+ "bitflags",
+ "dlib",
+ "lazy_static",
+ "memmap",
+ "nix",
+ "wayland-client 0.23.6",
+ "wayland-protocols 0.23.6",
 ]
 
 [[package]]
 name = "smithay-clipboard"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a59486e68b5596f664deedf01c46297f4af60379adae20175357a814d40f69e"
 dependencies = [
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smithay-client-toolkit 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix",
+ "smithay-client-toolkit 0.6.6",
 ]
 
 [[package]]
 name = "specs"
 version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4943fde8c5d3d14c3d19d2a4c7abbd7b626c270a19e6cd35252294a48feb698c"
 dependencies = [
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "shrev 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.1.2",
+ "derivative",
+ "hashbrown",
+ "hibitset",
+ "log 0.4.8",
+ "rayon",
+ "serde",
+ "shred",
+ "shrev",
+ "tuple_utils",
 ]
 
 [[package]]
@@ -3361,1362 +3715,981 @@ name = "specs-idvs"
 version = "0.1.0"
 source = "git+https://gitlab.com/veloren/specs-idvs.git#111548cf44e9bb4c43feb12aa3fc253953ac6e4a"
 dependencies = [
- "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "specs",
 ]
 
 [[package]]
 name = "spin"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 
 [[package]]
 name = "static_assertions"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 
 [[package]]
 name = "stb_truetype"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
 ]
 
 [[package]]
 name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
 
 [[package]]
 name = "sum_type"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 
 [[package]]
 name = "svg_fmt"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 
 [[package]]
 name = "syn"
 version = "0.13.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
 dependencies = [
- "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.3.8",
+ "quote 0.5.2",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "syn"
 version = "0.15.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.8"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "synstructure"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "tempdir"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 dependencies = [
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.6",
+ "remove_dir_all",
 ]
 
 [[package]]
 name = "term"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "dirs",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.0.5"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 dependencies = [
- "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
 ]
 
 [[package]]
 name = "threadpool"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
 dependencies = [
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus",
 ]
 
 [[package]]
 name = "tiff"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4",
+ "lzw",
+ "num-derive",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "tiny_http"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 dependencies = [
- "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ascii",
+ "chrono",
+ "chunked_transfer",
+ "log 0.4.8",
+ "url 1.7.2",
 ]
 
 [[package]]
 name = "tinytemplate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3c6667d3e65eb1bc3aed6fd14011c6cbc3a0665218ab7f5daf040b9ec371a"
 dependencies = [
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
 name = "tokio"
 version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "fnv",
+ "iovec",
+ "lazy_static",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "slab",
 ]
 
 [[package]]
 name = "tokio-rustls"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
 dependencies = [
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core",
+ "rustls",
+ "tokio",
+ "webpki",
 ]
 
 [[package]]
 name = "tokio-util"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log 0.4.8",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 dependencies = [
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
 [[package]]
 name = "tower-service"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "treeculler"
 version = "0.1.0"
 source = "git+https://gitlab.com/yusdacra/treeculler.git#6c0fdf1c1cbf00be22e37410985d6a3973cd9bed"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11",
 ]
 
 [[package]]
 name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 
 [[package]]
 name = "twoway"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "unicase"
 version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5",
 ]
 
 [[package]]
 name = "unicase"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.9.1",
 ]
 
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
 ]
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 dependencies = [
- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.2.0",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
 [[package]]
 name = "untrusted"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
 
 [[package]]
 name = "url"
 version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 dependencies = [
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5",
+ "matches",
+ "percent-encoding 1.0.1",
 ]
 
 [[package]]
 name = "url"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 dependencies = [
- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.2.0",
+ "matches",
+ "percent-encoding 2.1.0",
 ]
 
 [[package]]
 name = "uuid"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
 dependencies = [
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5",
+ "serde",
 ]
 
 [[package]]
 name = "uvth"
 version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf"
 dependencies = [
- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9",
+ "log 0.4.8",
+ "num_cpus",
 ]
 
 [[package]]
 name = "vcpkg"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 
 [[package]]
 name = "vek"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b833a133490ae98e9e3db1c77fc28e844f8e51b12eb35b4ab8a2082cb7cb441a"
 dependencies = [
- "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "approx 0.1.1",
+ "num-integer",
+ "num-traits 0.1.43",
+ "rustc_version",
+ "serde",
+ "static_assertions",
 ]
 
 [[package]]
 name = "veloren-chat-cli"
 version = "0.5.0"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-client 0.5.0",
- "veloren-common 0.5.0",
+ "log 0.4.8",
+ "pretty_env_logger",
+ "veloren-client",
+ "veloren-common",
 ]
 
 [[package]]
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-common 0.5.0",
+ "authc",
+ "byteorder 1.3.4",
+ "hashbrown",
+ "image",
+ "log 0.4.8",
+ "num_cpus",
+ "specs",
+ "uvth",
+ "vek",
+ "veloren-common",
 ]
 
 [[package]]
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
- "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "notify 5.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
- "sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "authc",
+ "bincode",
+ "criterion",
+ "crossbeam",
+ "dot_vox",
+ "find_folder",
+ "hashbrown",
+ "image",
+ "indexmap",
+ "lazy_static",
+ "log 0.4.8",
+ "lz4-compress",
+ "mio",
+ "mio-extras",
+ "notify",
+ "parking_lot 0.9.0",
+ "rand 0.7.3",
+ "rayon",
+ "ron",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "specs",
+ "specs-idvs",
+ "sum_type",
+ "vek",
 ]
 
 [[package]]
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "portpicker 0.1.0 (git+https://github.com/wusyong/portpicker-rs?branch=fix_ipv6)",
- "prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
- "uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-common 0.5.0",
- "veloren-world 0.5.0",
+ "authc",
+ "chrono",
+ "crossbeam",
+ "hashbrown",
+ "lazy_static",
+ "log 0.4.8",
+ "portpicker",
+ "prometheus",
+ "prometheus-static-metric",
+ "rand 0.7.3",
+ "ron",
+ "rouille",
+ "scan_fmt",
+ "serde",
+ "serde_derive",
+ "specs",
+ "specs-idvs",
+ "uvth",
+ "vek",
+ "veloren-common",
+ "veloren-world",
 ]
 
 [[package]]
 name = "veloren-server-cli"
 version = "0.5.0"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-common 0.5.0",
- "veloren-server 0.5.0",
+ "log 0.4.8",
+ "pretty_env_logger",
+ "veloren-common",
+ "veloren-server",
 ]
 
 [[package]]
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
- "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
- "conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
- "cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dispatch 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx_device_gl 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx_window_glutin 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glsl-include 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "msgbox 0.4.0 (git+https://github.com/bekker/msgbox-rs.git?rev=68fe39a)",
- "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
- "treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)",
- "uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-client 0.5.0",
- "veloren-common 0.5.0",
- "veloren-server 0.5.0",
- "veloren-world 0.5.0",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "authc",
+ "backtrace",
+ "bincode",
+ "chrono",
+ "conrod_core",
+ "conrod_winit",
+ "cpal",
+ "criterion",
+ "crossbeam",
+ "deunicode",
+ "directories",
+ "dispatch",
+ "dot_vox",
+ "euc",
+ "failure",
+ "fern",
+ "gfx",
+ "gfx_device_gl",
+ "gfx_window_glutin",
+ "git2",
+ "glsl-include",
+ "glutin",
+ "guillotiere",
+ "hashbrown",
+ "image",
+ "log 0.4.8",
+ "msgbox",
+ "num 0.2.1",
+ "rand 0.7.3",
+ "rodio",
+ "ron",
+ "serde",
+ "serde_derive",
+ "specs",
+ "specs-idvs",
+ "treeculler",
+ "uvth",
+ "vek",
+ "veloren-client",
+ "veloren-common",
+ "veloren-server",
+ "veloren-world",
+ "winit",
+ "winres",
 ]
 
 [[package]]
 name = "veloren-world"
 version = "0.5.0"
 dependencies = [
- "arr_macro 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "veloren-common 0.5.0",
+ "arr_macro",
+ "bincode",
+ "bitvec",
+ "hashbrown",
+ "image",
+ "itertools",
+ "lazy_static",
+ "log 0.4.8",
+ "minifb",
+ "noise",
+ "num 0.2.1",
+ "ordered-float",
+ "packed_simd",
+ "pretty_env_logger",
+ "rand 0.7.3",
+ "rand_chacha 0.2.1",
+ "rayon",
+ "ron",
+ "roots",
+ "serde",
+ "serde_derive",
+ "vek",
+ "veloren-common",
 ]
 
 [[package]]
 name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 
 [[package]]
 name = "version_check"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "walkdir"
-version = "2.2.9"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
- "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file",
+ "winapi 0.3.8",
+ "winapi-util",
 ]
 
 [[package]]
 name = "want"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8",
+ "try-lock",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.7.0"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "serde",
+ "serde_json",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
 version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
 dependencies = [
- "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bumpalo",
+ "lazy_static",
+ "log 0.4.8",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
 version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
 dependencies = [
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.3",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
 version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.16",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
 version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
 
 [[package]]
 name = "wayland-client"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix",
+ "wayland-commons 0.21.13",
+ "wayland-scanner 0.21.13",
+ "wayland-sys 0.21.13",
 ]
 
 [[package]]
 name = "wayland-client"
 version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix",
+ "wayland-commons 0.23.6",
+ "wayland-scanner 0.23.6",
+ "wayland-sys 0.23.6",
 ]
 
 [[package]]
 name = "wayland-commons"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
 dependencies = [
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix",
+ "wayland-sys 0.21.13",
 ]
 
 [[package]]
 name = "wayland-commons"
 version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
 dependencies = [
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix",
+ "wayland-sys 0.23.6",
 ]
 
 [[package]]
 name = "wayland-protocols"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "wayland-client 0.21.13",
+ "wayland-commons 0.21.13",
+ "wayland-scanner 0.21.13",
+ "wayland-sys 0.21.13",
 ]
 
 [[package]]
 name = "wayland-protocols"
 version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "wayland-client 0.23.6",
+ "wayland-commons 0.23.6",
+ "wayland-scanner 0.23.6",
 ]
 
 [[package]]
 name = "wayland-scanner"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "xml-rs",
 ]
 
 [[package]]
 name = "wayland-scanner"
 version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "xml-rs",
 ]
 
 [[package]]
 name = "wayland-sys"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 dependencies = [
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dlib",
+ "lazy_static",
 ]
 
 [[package]]
 name = "wayland-sys"
 version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
 dependencies = [
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dlib",
+ "lazy_static",
 ]
 
 [[package]]
 name = "web-sys"
 version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
 dependencies = [
- "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "webpki"
 version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
 dependencies = [
- "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "webpki-roots"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 dependencies = [
- "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki",
 ]
 
 [[package]]
 name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wincolor"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "winit"
 version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
 dependencies = [
- "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "android_glue",
+ "backtrace",
+ "bitflags",
+ "cocoa 0.18.5",
+ "core-foundation 0.6.4",
+ "core-graphics",
+ "lazy_static",
+ "libc",
+ "log 0.4.8",
+ "objc",
+ "parking_lot 0.9.0",
+ "percent-encoding 2.1.0",
+ "raw-window-handle",
+ "serde",
+ "smithay-client-toolkit 0.4.6",
+ "wayland-client 0.21.13",
+ "winapi 0.3.8",
+ "x11-dl",
 ]
 
 [[package]]
 name = "winreg"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "winres"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
 dependencies = [
- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml",
 ]
 
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
 
 [[package]]
 name = "x11-clipboard"
-version = "0.3.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5e937afd03b64b7be4f959cc044e09260a47241b71e56933f37db097bf7859d"
 dependencies = [
- "xcb 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xcb",
 ]
 
 [[package]]
 name = "x11-dl"
-version = "2.18.4"
+version = "2.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
+ "maybe-uninit",
+ "pkg-config",
 ]
 
 [[package]]
 name = "xcb"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62056f63138b39116f82a540c983cc11f1c90cd70b3d492a70c25eaa50bd22a6"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "log 0.4.8",
 ]
 
 [[package]]
 name = "xdg"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
 
 [[package]]
 name = "xml-rs"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-"checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
-"checksum andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
-"checksum android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
-"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
-"checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94"
-"checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-"checksum arr_macro 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a105bfda48707cf19220129e78fca01e9639433ffaef4163546ed8fb04120a5"
-"checksum arr_macro_impl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
-"checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
-"checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
-"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
-"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
-"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
-"checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
-"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
-"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
-"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-"checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
-"checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
-"checksum cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0395175ecba60accac076a02c31d143b9dcd9d5eb5316d7163a3273803b765c7"
-"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
-"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
-"checksum chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45"
-"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
-"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
-"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum clipboard-win 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
-"checksum cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
-"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
-"checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
-"checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
-"checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
-"checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
-"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
-"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-"checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-"checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
-"checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
-"checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
-"checksum cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6"
-"checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2"
-"checksum crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c"
-"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
-"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
-"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
-"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
-"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
-"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
-"checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
-"checksum daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
-"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-"checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
-"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
-"checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
-"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum dispatch 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
-"checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
-"checksum dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11afd3251e588f2770226659b2a1d55ec2f8aaf2ca42bdcdbd01ff53b4a81e70"
-"checksum downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
-"checksum draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651"
-"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
-"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-"checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
-"checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
-"checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
-"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
-"checksum find_folder 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
-"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-"checksum fsevent 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1616e68919f49d311720c3cf316e0a3522d8f2bd08f8da35f6b8a0fa12f9234b"
-"checksum fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a41f1722e9bf862f62429d192f37d0c82c589aa18783aa06f0c4e5c3c90649fb"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
-"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
-"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
-"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
-"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
-"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
-"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-"checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
-"checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
-"checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
-"checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
-"checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
-"checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
-"checksum gfx_device_gl 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "109c385fa380c18888633aa27d1e16cbae518469702a2f69dcb5f52d5378bebc"
-"checksum gfx_gl 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8525888d909a6424b04f9136976f07a85fc1f3704555c1a73897e258326c8319"
-"checksum gfx_window_glutin 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)" = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
-"checksum gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
-"checksum gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2db9fad8f1b0d4c7338a210a6cbdf081dcc1a3c223718c698c4f313f6c288acb"
-"checksum gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a57872499171d279f8577ce83837da4cae62b08dd32892236ed67ab7ea61030"
-"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
-"checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
-"checksum gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
-"checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
-"checksum glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e0be1b1432e227bcd1a9b28db9dc1474a7e7fd4227e08e16f35304f32d09b61"
-"checksum glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615bef979b5838526aee99241afc80cfb2e34a8735d4bcb8ec6072598c18a408"
-"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-"checksum glsl-include 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daa2afb1631e7ab4543e0dde0e3fc68bb49c58fee89c07f30a26553b1f684ab6"
-"checksum glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)" = "938ce7a2b1bbfe1535166133bea3f9c1b46350d2794b49561303575e9e1b9949"
-"checksum glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
-"checksum glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7"
-"checksum glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89996c30857ae1b4de4b5189abf1ea822a20a9fe9e1c93e5e7b862ff0bdd5cdf"
-"checksum glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1290a5ca5e46fcfa7f66f949cc9d9194b2cb6f2ed61892c8c2b82343631dba57"
-"checksum glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f801bbc91efc22dd1c4818a47814fc72bf74d024510451b119381579bfa39021"
-"checksum gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70409d6405db8b1591602fcd0cbe8af52cd9976dd39194442b4c149ba343f86d"
-"checksum gtk 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d695d6be4110618a97c19cd068e8a00e53e33b87e3c65cdc5397667498b1bc24"
-"checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
-"checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
-"checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
-"checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
-"checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
-"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
-"checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
-"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
-"checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
-"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
-"checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
-"checksum inotify 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc39ee997811267bf8aa0b10e1674c5bea6caacc1957eede5ea45251fe33c6d5"
-"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
-"checksum instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
-"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-"checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
-"checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
-"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
-"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-"checksum libssh2-sys 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "36aa6e813339d3a063292b77091dfbbb6152ff9006a459895fa5bebed7d34f10"
-"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-"checksum line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
-"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f966533a922a9bba9e95e594c1fdb3b9bf5fdcdb11e37e51ad84cd76e468b91"
-"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
-"checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-"checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-"checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
-"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
-"checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915"
-"checksum msgbox 0.4.0 (git+https://github.com/bekker/msgbox-rs.git?rev=68fe39a)" = "<none>"
-"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
-"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-"checksum noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
-"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-"checksum notify 5.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b00c0b65188bffb5598c302e19b062feb94adef02c31f15622a163c95d673c3"
-"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
-"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
-"checksum num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a"
-"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc"
-"checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
-"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454"
-"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
-"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-"checksum objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-"checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-"checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-"checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
-"checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
-"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
-"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
-"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
-"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
-"checksum pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45374801e224373c3c0393cd48073c81093494c8735721e81d1dbaa4096b2767"
-"checksum pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94039b3921a4af4058a3e4335e5d15099101f298a92f5afc40bab3a3027594a1"
-"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
-"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
-"checksum pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
-"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
-"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
-"checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
-"checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
-"checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum png 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f00ec9242f8e01119e83117dbadf34c5228ac2f1c4ddcd92bffa340d52291de"
-"checksum portpicker 0.1.0 (git+https://github.com/wusyong/portpicker-rs?branch=fix_ipv6)" = "<none>"
-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
-"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
-"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
-"checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
-"checksum prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
-"checksum prometheus-static-metric 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
-"checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-"checksum rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a"
-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
-"checksum raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
-"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
-"checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
-"checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
-"checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
-"checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
-"checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-"checksum rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
-"checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
-"checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
-"checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-"checksum scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "faf737f37ca340201889b5f48ecde47f233e9da3cbf3d04be27883adac39b4da"
-"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
-"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-"checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
-"checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
-"checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
-"checksum security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
-"checksum security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
-"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
-"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
-"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
-"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
-"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-"checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
-"checksum shred-derive 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c245c03fd923292ae18e01eadf65606fdc995c175433104ef3eee956db7c2d7"
-"checksum shrev 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f"
-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
-"checksum smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
-"checksum smithay-client-toolkit 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "93960e8975909fcb14cc755de93af2149d8b8f4eb368315537d40cfd0f324054"
-"checksum smithay-clipboard 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9667a262ef7a9ff1c55a7e665cd3d36f9bc2809f94167b1fb3fc31423a83f8c0"
-"checksum specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4943fde8c5d3d14c3d19d2a4c7abbd7b626c270a19e6cd35252294a48feb698c"
-"checksum specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)" = "<none>"
-"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
-"checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
-"checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-"checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
-"checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
-"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
-"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
-"checksum tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
-"checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
-"checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
-"checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
-"checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
-"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-"checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
-"checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
-"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
-"checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
-"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
-"checksum uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf"
-"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-"checksum vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb3ca8ea588deba055424cc1a79a830428b2f6c270b8d8f91946f660fa4d8ee"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
-"checksum wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
-"checksum wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
-"checksum wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
-"checksum wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
-"checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
-"checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
-"checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
-"checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
-"checksum wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
-"checksum wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
-"checksum wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
-"checksum wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
-"checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
-"checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
-"checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
-"checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
-"checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
-"checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
-"checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
-"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
-"checksum winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
-"checksum x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "be65e1342a3baae65439cd03306778831a3d133b0d20243a7fb83fd5cf403c58"
-"checksum xcb 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
-"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
-"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
+checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"

From 29c27e11512708b1b7f58f5d4f1a0d4b2a2255ad Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Mon, 9 Mar 2020 20:52:04 +0100
Subject: [PATCH 27/41] fix: #517

---
 server/src/events/player.rs | 12 +++++++++++-
 server/src/sys/message.rs   |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/src/events/player.rs b/server/src/events/player.rs
index 33ea7e7b63..3237ee57dd 100644
--- a/server/src/events/player.rs
+++ b/server/src/events/player.rs
@@ -1,7 +1,8 @@
 use super::Event;
-use crate::{client::Client, Server, StateExt};
+use crate::{auth_provider::AuthProvider, client::Client, Server, StateExt};
 use common::{
     comp,
+    comp::Player,
     msg::{ClientState, PlayerListUpdate, ServerMsg},
     sync::{Uid, UidAllocator},
 };
@@ -51,6 +52,15 @@ pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event
         )))
     }
 
+    // Make sure to remove the player from the logged in list. (See AuthProvider)
+    {
+        let players = state.ecs().read_storage::<Player>();
+        let mut accounts = state.ecs().write_resource::<AuthProvider>();
+
+        if let Some(player) = players.get(entity) {
+            accounts.logout(player.uuid());
+        }
+    }
     // Delete client entity
     if let Err(err) = state.delete_entity_recorded(entity) {
         error!("Failed to delete disconnected client: {:?}", err);
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 47d02d23c3..b524c22fbc 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -300,7 +300,6 @@ impl<'a> System<'a> for Sys {
                         None,
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
                     ));
-                    accounts.logout(player.uuid());
                 }
                 server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                 client.postbox.send_message(ServerMsg::Disconnect);

From c72148a587230569aae4e6bd4bebc6de0aa87b49 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sun, 8 Mar 2020 23:32:34 -0400
Subject: [PATCH 28/41] Rearrange some operations in the server tick to reduce
 clientside latency of ServerEvent mediated effects

---
 CHANGELOG.md                   |  1 +
 client/src/lib.rs              |  2 +-
 common/src/state.rs            | 51 ++++++++++++++++--------
 server/src/lib.rs              | 73 ++++++++++++++++++++++------------
 server/src/sys/mod.rs          | 35 +++++++++-------
 server/src/sys/terrain_sync.rs |  8 +---
 server/src/sys/waypoint.rs     | 10 ++++-
 7 files changed, 114 insertions(+), 66 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37648ad8bf..8cdf3cf0c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed highlighting of non-collectible sprites
 - Fixed /give_exp ignoring player argument
 - Extend run sfx to small animals to prevent sneak attacks by geese.
+- Decreased clientside latency of ServerEvent mediated effects (e.g. projectiles, inventory operations, etc)
 
 ### Removed
 
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 09841e3fa7..f2bc898373 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -410,7 +410,7 @@ impl Client {
         // 3) Update client local data
 
         // 4) Tick the client's LocalState
-        self.state.tick(dt, add_foreign_systems);
+        self.state.tick(dt, add_foreign_systems, true);
 
         // 5) Terrain
         let pos = self
diff --git a/common/src/state.rs b/common/src/state.rs
index c657785b25..0fbd3202d0 100644
--- a/common/src/state.rs
+++ b/common/src/state.rs
@@ -286,8 +286,35 @@ impl State {
         }
     }
 
+    // Run RegionMap tick to update entity region occupancy
+    pub fn update_region_map(&self) {
+        self.ecs.write_resource::<RegionMap>().tick(
+            self.ecs.read_storage::<comp::Pos>(),
+            self.ecs.read_storage::<comp::Vel>(),
+            self.ecs.entities(),
+        );
+    }
+
+    // Apply terrain changes
+    pub fn apply_terrain_changes(&self) {
+        let mut terrain = self.ecs.write_resource::<TerrainGrid>();
+        let mut modified_blocks = std::mem::replace(
+            &mut self.ecs.write_resource::<BlockChange>().blocks,
+            Default::default(),
+        );
+        // Apply block modifications
+        // Only include in `TerrainChanges` if successful
+        modified_blocks.retain(|pos, block| terrain.set(*pos, *block).is_ok());
+        self.ecs.write_resource::<TerrainChanges>().modified_blocks = modified_blocks;
+    }
+
     /// Execute a single tick, simulating the game state by the given duration.
-    pub fn tick(&mut self, dt: Duration, add_foreign_systems: impl Fn(&mut DispatcherBuilder)) {
+    pub fn tick(
+        &mut self,
+        dt: Duration,
+        add_foreign_systems: impl Fn(&mut DispatcherBuilder),
+        update_terrain_and_regions: bool,
+    ) {
         // Change the time accordingly.
         self.ecs.write_resource::<TimeOfDay>().0 += dt.as_secs_f64() * DAY_CYCLE_FACTOR;
         self.ecs.write_resource::<Time>().0 += dt.as_secs_f64();
@@ -297,12 +324,9 @@ impl State {
         // important physics events.
         self.ecs.write_resource::<DeltaTime>().0 = dt.as_secs_f32().min(MAX_DELTA_TIME);
 
-        // Run RegionMap tick to update entity region occupancy
-        self.ecs.write_resource::<RegionMap>().tick(
-            self.ecs.read_storage::<comp::Pos>(),
-            self.ecs.read_storage::<comp::Vel>(),
-            self.ecs.entities(),
-        );
+        if update_terrain_and_regions {
+            self.update_region_map();
+        }
 
         // Run systems to update the world.
         // Create and run a dispatcher for ecs systems.
@@ -315,16 +339,9 @@ impl State {
 
         self.ecs.maintain();
 
-        // Apply terrain changes
-        let mut terrain = self.ecs.write_resource::<TerrainGrid>();
-        let mut modified_blocks = std::mem::replace(
-            &mut self.ecs.write_resource::<BlockChange>().blocks,
-            Default::default(),
-        );
-        // Apply block modifications
-        // Only include in `TerrainChanges` if successful
-        modified_blocks.retain(|pos, block| terrain.set(*pos, *block).is_ok());
-        self.ecs.write_resource::<TerrainChanges>().modified_blocks = modified_blocks;
+        if update_terrain_and_regions {
+            self.apply_terrain_changes();
+        }
 
         // Process local events
         let events = self.ecs.read_resource::<EventBus<LocalEvent>>().recv_all();
diff --git a/server/src/lib.rs b/server/src/lib.rs
index c3cc142a63..d8710d1b2c 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -98,6 +98,7 @@ impl Server {
         state.ecs_mut().insert(sys::SubscriptionTimer::default());
         state.ecs_mut().insert(sys::TerrainSyncTimer::default());
         state.ecs_mut().insert(sys::TerrainTimer::default());
+        state.ecs_mut().insert(sys::WaypointTimer::default());
         // Server-only components
         state.ecs_mut().register::<RegionSubscription>();
         state.ecs_mut().register::<Client>();
@@ -336,7 +337,6 @@ impl Server {
         // 8) Finish the tick, passing control of the main thread back
         //    to the frontend
 
-        let before_tick_1 = Instant::now();
         // 1) Build up a list of events for this frame, to be passed to the frontend.
         let mut frontend_events = Vec::new();
 
@@ -354,23 +354,38 @@ impl Server {
         // (e.g. run before controller system)
         sys::message::Sys.run_now(&self.state.ecs());
 
-        let before_tick_4 = Instant::now();
+        let before_state_tick = Instant::now();
 
         // 4) Tick the server's LocalState.
-        self.state.tick(dt, sys::add_server_systems);
+        // 5) Fetch any generated `TerrainChunk`s and insert them into the terrain.
+        // in sys/terrain.rs
+        self.state.tick(dt, sys::add_server_systems, false);
 
         let before_handle_events = Instant::now();
+
         // Handle game events
         frontend_events.append(&mut self.handle_events());
 
+        let before_update_terrain_and_regions = Instant::now();
+
+        // Apply terrain changes and update the region map after processing server
+        // events so that changes made by server events will be immediately
+        // visble to client synchronization systems, minimizing the latency of
+        // `ServerEvent` mediated effects
+        self.state.update_region_map();
+        self.state.apply_terrain_changes();
+
+        let before_sync = Instant::now();
+
+        // 6) Synchronise clients with the new state of the world.
+        sys::run_sync_systems(self.state.ecs_mut());
+
+        let before_world_tick = Instant::now();
+
         // Tick the world
         self.world.tick(dt);
 
-        // 5) Fetch any generated `TerrainChunk`s and insert them into the terrain.
-        // in sys/terrain.rs
-
-        let before_tick_6 = Instant::now();
-        // 6) Synchronise clients with the new state of the world.
+        let before_entity_cleanup = Instant::now();
 
         // Remove NPCs that are outside the view distances of all players
         // This is done by removing NPCs in unloaded chunks
@@ -392,7 +407,7 @@ impl Server {
             }
         }
 
-        let before_tick_7 = Instant::now();
+        let end_of_server_tick = Instant::now();
         // 7) Update Metrics
         let entity_sync_nanos = self
             .state
@@ -412,31 +427,31 @@ impl Server {
             .read_resource::<sys::TerrainSyncTimer>()
             .nanos as i64;
         let terrain_nanos = self.state.ecs().read_resource::<sys::TerrainTimer>().nanos as i64;
-        let total_sys_nanos = entity_sync_nanos
-            + message_nanos
-            + sentinel_nanos
-            + subscription_nanos
-            + terrain_sync_nanos
-            + terrain_nanos;
-        self.metrics
-            .tick_time
-            .with_label_values(&["input"])
-            .set((before_tick_4 - before_tick_1).as_nanos() as i64 - message_nanos);
+        let waypoint_nanos = self.state.ecs().read_resource::<sys::WaypointTimer>().nanos as i64;
+        let total_sys_ran_in_dispatcher_nanos = terrain_nanos + waypoint_nanos;
         self.metrics
             .tick_time
             .with_label_values(&["state tick"])
             .set(
-                (before_handle_events - before_tick_4).as_nanos() as i64
-                    - (total_sys_nanos - message_nanos),
+                (before_handle_events - before_state_tick).as_nanos() as i64
+                    - total_sys_ran_in_dispatcher_nanos,
             );
         self.metrics
             .tick_time
             .with_label_values(&["handle server events"])
-            .set((before_tick_6 - before_handle_events).as_nanos() as i64);
+            .set((before_update_terrain_and_regions - before_handle_events).as_nanos() as i64);
         self.metrics
             .tick_time
-            .with_label_values(&["entity deletion"])
-            .set((before_tick_7 - before_tick_6).as_nanos() as i64);
+            .with_label_values(&["update terrain and region map"])
+            .set((before_sync - before_update_terrain_and_regions).as_nanos() as i64);
+        self.metrics
+            .tick_time
+            .with_label_values(&["world tick"])
+            .set((before_entity_cleanup - before_world_tick).as_nanos() as i64);
+        self.metrics
+            .tick_time
+            .with_label_values(&["entity cleanup"])
+            .set((end_of_server_tick - before_entity_cleanup).as_nanos() as i64);
         self.metrics
             .tick_time
             .with_label_values(&["entity sync"])
@@ -445,6 +460,10 @@ impl Server {
             .tick_time
             .with_label_values(&["message"])
             .set(message_nanos);
+        self.metrics
+            .tick_time
+            .with_label_values(&["sentinel"])
+            .set(sentinel_nanos);
         self.metrics
             .tick_time
             .with_label_values(&["subscription"])
@@ -457,6 +476,10 @@ impl Server {
             .tick_time
             .with_label_values(&["terrain"])
             .set(terrain_nanos);
+        self.metrics
+            .tick_time
+            .with_label_values(&["waypoint"])
+            .set(waypoint_nanos);
         self.metrics
             .player_online
             .set(self.state.ecs().read_storage::<Client>().join().count() as i64);
@@ -476,7 +499,7 @@ impl Server {
         self.metrics
             .tick_time
             .with_label_values(&["metrics"])
-            .set(before_tick_7.elapsed().as_nanos() as i64);
+            .set(end_of_server_tick.elapsed().as_nanos() as i64);
 
         // 8) Finish the tick, pass control back to the frontend.
 
diff --git a/server/src/sys/mod.rs b/server/src/sys/mod.rs
index bead21501e..d622582e9b 100644
--- a/server/src/sys/mod.rs
+++ b/server/src/sys/mod.rs
@@ -15,30 +15,35 @@ pub type SentinelTimer = SysTimer<sentinel::Sys>;
 pub type SubscriptionTimer = SysTimer<subscription::Sys>;
 pub type TerrainTimer = SysTimer<terrain::Sys>;
 pub type TerrainSyncTimer = SysTimer<terrain_sync::Sys>;
+pub type WaypointTimer = SysTimer<waypoint::Sys>;
 
 // System names
-const ENTITY_SYNC_SYS: &str = "server_entity_sync_sys";
-const SENTINEL_SYS: &str = "sentinel_sys";
-const SUBSCRIPTION_SYS: &str = "server_subscription_sys";
-const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys";
+// Note: commented names may be useful in the future
+//const ENTITY_SYNC_SYS: &str = "server_entity_sync_sys";
+//const SENTINEL_SYS: &str = "sentinel_sys";
+//const SUBSCRIPTION_SYS: &str = "server_subscription_sys";
+//const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys";
 const TERRAIN_SYS: &str = "server_terrain_sys";
 const WAYPOINT_SYS: &str = "waypoint_sys";
 
 pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
-    // TODO: makes some of these dependent on systems in common like the phys system
-    dispatch_builder.add(sentinel::Sys, SENTINEL_SYS, &[common::sys::PHYS_SYS]);
-    dispatch_builder.add(subscription::Sys, SUBSCRIPTION_SYS, &[
-        common::sys::PHYS_SYS,
-    ]);
-    dispatch_builder.add(entity_sync::Sys, ENTITY_SYNC_SYS, &[
-        SUBSCRIPTION_SYS,
-        SENTINEL_SYS,
-    ]);
-    dispatch_builder.add(terrain_sync::Sys, TERRAIN_SYS, &[]);
-    dispatch_builder.add(terrain::Sys, TERRAIN_SYNC_SYS, &[TERRAIN_SYS]);
+    dispatch_builder.add(terrain::Sys, TERRAIN_SYS, &[]);
     dispatch_builder.add(waypoint::Sys, WAYPOINT_SYS, &[]);
 }
 
+pub fn run_sync_systems(ecs: &mut specs::World) {
+    use specs::RunNow;
+
+    // Setup for entity sync
+    // If I'm not mistaken, these two could be ran in parallel
+    sentinel::Sys.run_now(ecs);
+    subscription::Sys.run_now(ecs);
+
+    // Sync
+    terrain_sync::Sys.run_now(ecs);
+    entity_sync::Sys.run_now(ecs);
+}
+
 /// Used to keep track of how much time each system takes
 pub struct SysTimer<S> {
     pub nanos: u64,
diff --git a/server/src/sys/terrain_sync.rs b/server/src/sys/terrain_sync.rs
index 426a062788..2300640120 100644
--- a/server/src/sys/terrain_sync.rs
+++ b/server/src/sys/terrain_sync.rs
@@ -8,12 +8,8 @@ use common::{
 };
 use specs::{Join, Read, ReadExpect, ReadStorage, System, Write, WriteStorage};
 
-/// This system will handle loading generated chunks and unloading
-/// uneeded chunks.
-///     1. Inserts newly generated chunks into the TerrainGrid
-///     2. Sends new chunks to neaby clients
-///     3. Handles the chunk's supplement (e.g. npcs)
-///     4. Removes chunks outside the range of players
+/// This systems sends new chunks to clients as well as changes to existing
+/// chunks
 pub struct Sys;
 impl<'a> System<'a> for Sys {
     type SystemData = (
diff --git a/server/src/sys/waypoint.rs b/server/src/sys/waypoint.rs
index a09ec4e92b..6234b95d22 100644
--- a/server/src/sys/waypoint.rs
+++ b/server/src/sys/waypoint.rs
@@ -1,5 +1,6 @@
+use super::SysTimer;
 use common::comp::{Player, Pos, Waypoint, WaypointArea};
-use specs::{Entities, Join, ReadStorage, System, WriteStorage};
+use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
 
 /// This system updates player waypoints
 /// TODO: Make this faster by only considering local waypoints
@@ -11,12 +12,15 @@ impl<'a> System<'a> for Sys {
         ReadStorage<'a, Player>,
         ReadStorage<'a, WaypointArea>,
         WriteStorage<'a, Waypoint>,
+        Write<'a, SysTimer<Self>>,
     );
 
     fn run(
         &mut self,
-        (entities, positions, players, waypoint_areas, mut waypoints): Self::SystemData,
+        (entities, positions, players, waypoint_areas, mut waypoints, mut timer): Self::SystemData,
     ) {
+        timer.start();
+
         for (entity, player_pos, _) in (&entities, &positions, &players).join() {
             for (waypoint_pos, waypoint_area) in (&positions, &waypoint_areas).join() {
                 if player_pos.0.distance_squared(waypoint_pos.0) < waypoint_area.radius().powf(2.0)
@@ -25,5 +29,7 @@ impl<'a> System<'a> for Sys {
                 }
             }
         }
+
+        timer.end();
     }
 }

From 0049ee4bac88f48be33d1bbff97f313b8912b1b6 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Mon, 9 Mar 2020 22:27:32 -0400
Subject: [PATCH 29/41] Add metric for new connection handling time, move
 StateExt to its own module

---
 server/src/cmd.rs                    |   3 +-
 server/src/events/entity_creation.rs |   6 +-
 server/src/events/inventory_manip.rs |   2 +-
 server/src/events/player.rs          |   2 +-
 server/src/lib.rs                    | 228 ++-------------------------
 server/src/state_ext.rs              | 222 ++++++++++++++++++++++++++
 6 files changed, 246 insertions(+), 217 deletions(-)
 create mode 100644 server/src/state_ext.rs

diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index b4a2e3e5dd..096f75df5a 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -643,7 +643,7 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
         .read_storage::<comp::Ori>()
         .get(entity)
         .copied();
-    /*let builder = server
+    /*let builder = server.state
     .create_object(pos, ori, obj_type)
     .with(ori);*/
     if let (Some(pos), Some(ori)) = (pos, ori) {
@@ -705,6 +705,7 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
             },
         };
         server
+            .state
             .create_object(pos, obj_type)
             .with(comp::Ori(
                 // converts player orientation into a 90° rotation for the object by using the axis
diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
index 23bfa174db..642795c0cd 100644
--- a/server/src/events/entity_creation.rs
+++ b/server/src/events/entity_creation.rs
@@ -16,7 +16,7 @@ pub fn handle_create_character(
     let state = &mut server.state;
     let server_settings = &server.server_settings;
 
-    Server::create_player_character(state, entity, name, body, main, server_settings);
+    state.create_player_character(entity, name, body, main, server_settings);
     sys::subscription::initialize_region_subscription(state.ecs(), entity);
 }
 
@@ -59,8 +59,7 @@ pub fn handle_shoot(
     // TODO: Player height
     pos.z += 1.2;
 
-    let mut builder =
-        Server::create_projectile(state, Pos(pos), Vel(dir * 100.0), body, projectile);
+    let mut builder = state.create_projectile(Pos(pos), Vel(dir * 100.0), body, projectile);
     if let Some(light) = light {
         builder = builder.with(light)
     }
@@ -73,6 +72,7 @@ pub fn handle_shoot(
 
 pub fn handle_create_waypoint(server: &mut Server, pos: Vec3<f32>) {
     server
+        .state
         .create_object(Pos(pos), comp::object::Body::CampfireLit)
         .with(LightEmitter {
             offset: Vec3::unit_z() * 0.5,
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index 09998ca6aa..45926081aa 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -223,7 +223,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
             + Vec3::unit_z() * 10.0
             + Vec3::<f32>::zero().map(|_| rand::thread_rng().gen::<f32>() - 0.5) * 4.0;
 
-        server
+        state
             .create_object(Default::default(), comp::object::Body::Pouch)
             .with(comp::Pos(pos.0 + Vec3::unit_z() * 0.25))
             .with(item)
diff --git a/server/src/events/player.rs b/server/src/events/player.rs
index 3237ee57dd..50618a3c05 100644
--- a/server/src/events/player.rs
+++ b/server/src/events/player.rs
@@ -1,5 +1,5 @@
 use super::Event;
-use crate::{auth_provider::AuthProvider, client::Client, Server, StateExt};
+use crate::{auth_provider::AuthProvider, client::Client, state_ext::StateExt, Server};
 use common::{
     comp,
     comp::Player,
diff --git a/server/src/lib.rs b/server/src/lib.rs
index d8710d1b2c..5d06f7498f 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -10,6 +10,7 @@ pub mod events;
 pub mod input;
 pub mod metrics;
 pub mod settings;
+pub mod state_ext;
 pub mod sys;
 #[cfg(not(feature = "worldgen"))] mod test_world;
 
@@ -21,25 +22,22 @@ use crate::{
     chunk_generator::ChunkGenerator,
     client::{Client, RegionSubscription},
     cmd::CHAT_COMMANDS,
+    state_ext::StateExt,
     sys::sentinel::{DeletedEntities, TrackedComps},
 };
 use common::{
-    assets, comp,
-    effect::Effect,
+    comp,
     event::{EventBus, ServerEvent},
     msg::{ClientMsg, ClientState, ServerInfo, ServerMsg},
     net::PostOffice,
     state::{State, TimeOfDay},
-    sync::{Uid, WorldSyncExt},
+    sync::WorldSyncExt,
     terrain::TerrainChunkSize,
     vol::{ReadVol, RectVolSize},
 };
-use log::{debug, error, warn};
+use log::{debug, error};
 use metrics::ServerMetrics;
-use specs::{
-    join::Join, world::EntityBuilder as EcsEntityBuilder, Builder, Entity as EcsEntity, RunNow,
-    SystemData, WorldExt,
-};
+use specs::{join::Join, Builder, Entity as EcsEntity, RunNow, SystemData, WorldExt};
 use std::{
     i32,
     sync::Arc,
@@ -224,94 +222,6 @@ impl Server {
     /// Get a reference to the server's world.
     pub fn world(&self) -> &World { &self.world }
 
-    /// Build a static object entity
-    pub fn create_object(
-        &mut self,
-        pos: comp::Pos,
-        object: comp::object::Body,
-    ) -> EcsEntityBuilder {
-        self.state
-            .ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(comp::Vel(Vec3::zero()))
-            .with(comp::Ori(Vec3::unit_y()))
-            .with(comp::Body::Object(object))
-            .with(comp::Mass(100.0))
-            .with(comp::Gravity(1.0))
-        //.with(comp::LightEmitter::default())
-    }
-
-    /// Build a projectile
-    pub fn create_projectile(
-        state: &mut State,
-        pos: comp::Pos,
-        vel: comp::Vel,
-        body: comp::Body,
-        projectile: comp::Projectile,
-    ) -> EcsEntityBuilder {
-        state
-            .ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(vel)
-            .with(comp::Ori(vel.0.normalized()))
-            .with(comp::Mass(0.0))
-            .with(body)
-            .with(projectile)
-            .with(comp::Sticky)
-    }
-
-    pub fn create_player_character(
-        state: &mut State,
-        entity: EcsEntity,
-        name: String,
-        body: comp::Body,
-        main: Option<String>,
-        server_settings: &ServerSettings,
-    ) {
-        // Give no item when an invalid specifier is given
-        let main = main.and_then(|specifier| assets::load_cloned(&specifier).ok());
-
-        let spawn_point = state.ecs().read_resource::<SpawnPoint>().0;
-
-        state.write_component(entity, body);
-        state.write_component(entity, comp::Stats::new(name, body, main));
-        state.write_component(entity, comp::Energy::new(1000));
-        state.write_component(entity, comp::Controller::default());
-        state.write_component(entity, comp::Pos(spawn_point));
-        state.write_component(entity, comp::Vel(Vec3::zero()));
-        state.write_component(entity, comp::Ori(Vec3::unit_y()));
-        state.write_component(entity, comp::Gravity(1.0));
-        state.write_component(entity, comp::CharacterState::default());
-        state.write_component(entity, comp::Alignment::Owned(entity));
-        state.write_component(entity, comp::Inventory::default());
-        state.write_component(
-            entity,
-            comp::InventoryUpdate::new(comp::InventoryUpdateEvent::default()),
-        );
-        // Make sure physics are accepted.
-        state.write_component(entity, comp::ForceUpdate);
-
-        // Give the Admin component to the player if their name exists in admin list
-        if server_settings.admins.contains(
-            &state
-                .ecs()
-                .read_storage::<comp::Player>()
-                .get(entity)
-                .expect("Failed to fetch entity.")
-                .alias,
-        ) {
-            state.write_component(entity, comp::Admin);
-        }
-        // Tell the client its request was successful.
-        if let Some(client) = state.ecs().write_storage::<Client>().get_mut(entity) {
-            client.allow_state(ClientState::Character);
-        }
-    }
-
-    /// Handle events coming through via the event bus
-
     /// Execute a single server tick, handle input and update the game state by
     /// the given duration.
     pub fn tick(&mut self, _input: Input, dt: Duration) -> Result<Vec<Event>, Error> {
@@ -347,9 +257,13 @@ impl Server {
 
         // 2)
 
+        let before_new_connections = Instant::now();
+
         // 3) Handle inputs from clients
         frontend_events.append(&mut self.handle_new_connections()?);
 
+        let before_message_system = Instant::now();
+
         // Run message recieving sys before the systems in common for decreased latency
         // (e.g. run before controller system)
         sys::message::Sys.run_now(&self.state.ecs());
@@ -409,6 +323,7 @@ impl Server {
 
         let end_of_server_tick = Instant::now();
         // 7) Update Metrics
+        // Get system timing info
         let entity_sync_nanos = self
             .state
             .ecs()
@@ -429,6 +344,11 @@ impl Server {
         let terrain_nanos = self.state.ecs().read_resource::<sys::TerrainTimer>().nanos as i64;
         let waypoint_nanos = self.state.ecs().read_resource::<sys::WaypointTimer>().nanos as i64;
         let total_sys_ran_in_dispatcher_nanos = terrain_nanos + waypoint_nanos;
+        // Report timing info
+        self.metrics
+            .tick_time
+            .with_label_values(&["new connections"])
+            .set((before_message_system - before_new_connections).as_nanos() as i64);
         self.metrics
             .tick_time
             .with_label_values(&["state tick"])
@@ -480,6 +400,7 @@ impl Server {
             .tick_time
             .with_label_values(&["waypoint"])
             .set(waypoint_nanos);
+        // Report other info
         self.metrics
             .player_online
             .set(self.state.ecs().read_storage::<Client>().join().count() as i64);
@@ -611,118 +532,3 @@ impl Server {
 impl Drop for Server {
     fn drop(&mut self) { self.state.notify_registered_clients(ServerMsg::Shutdown); }
 }
-
-trait StateExt {
-    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool;
-    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect);
-    fn notify_registered_clients(&self, msg: ServerMsg);
-    fn create_npc(
-        &mut self,
-        pos: comp::Pos,
-        stats: comp::Stats,
-        body: comp::Body,
-    ) -> EcsEntityBuilder;
-    fn delete_entity_recorded(
-        &mut self,
-        entity: EcsEntity,
-    ) -> Result<(), specs::error::WrongGeneration>;
-}
-
-impl StateExt for State {
-    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool {
-        let success = self
-            .ecs()
-            .write_storage::<comp::Inventory>()
-            .get_mut(entity)
-            .map(|inv| inv.push(item).is_none())
-            .unwrap_or(false);
-        if success {
-            self.write_component(
-                entity,
-                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Collected),
-            );
-        }
-        success
-    }
-
-    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect) {
-        match effect {
-            Effect::Health(change) => {
-                self.ecs()
-                    .write_storage::<comp::Stats>()
-                    .get_mut(entity)
-                    .map(|stats| stats.health.change_by(change));
-            },
-            Effect::Xp(xp) => {
-                self.ecs()
-                    .write_storage::<comp::Stats>()
-                    .get_mut(entity)
-                    .map(|stats| stats.exp.change_by(xp));
-            },
-        }
-    }
-
-    /// Build a non-player character.
-    fn create_npc(
-        &mut self,
-        pos: comp::Pos,
-        stats: comp::Stats,
-        body: comp::Body,
-    ) -> EcsEntityBuilder {
-        self.ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(comp::Vel(Vec3::zero()))
-            .with(comp::Ori(Vec3::unit_y()))
-            .with(comp::Controller::default())
-            .with(body)
-            .with(stats)
-            .with(comp::Alignment::Npc)
-            .with(comp::Energy::new(500))
-            .with(comp::Gravity(1.0))
-            .with(comp::CharacterState::default())
-    }
-
-    fn notify_registered_clients(&self, msg: ServerMsg) {
-        for client in (&mut self.ecs().write_storage::<Client>())
-            .join()
-            .filter(|c| c.is_registered())
-        {
-            client.notify(msg.clone())
-        }
-    }
-
-    fn delete_entity_recorded(
-        &mut self,
-        entity: EcsEntity,
-    ) -> Result<(), specs::error::WrongGeneration> {
-        let (maybe_uid, maybe_pos) = (
-            self.ecs().read_storage::<Uid>().get(entity).copied(),
-            self.ecs().read_storage::<comp::Pos>().get(entity).copied(),
-        );
-        let res = self.ecs_mut().delete_entity(entity);
-        if res.is_ok() {
-            if let (Some(uid), Some(pos)) = (maybe_uid, maybe_pos) {
-                if let Some(region_key) = self
-                    .ecs()
-                    .read_resource::<common::region::RegionMap>()
-                    .find_region(entity, pos.0)
-                {
-                    self.ecs()
-                        .write_resource::<DeletedEntities>()
-                        .record_deleted_entity(uid, region_key);
-                } else {
-                    // Don't panic if the entity wasn't found in a region maybe it was just created
-                    // and then deleted before the region manager had a chance to assign it a
-                    // region
-                    warn!(
-                        "Failed to find region containing entity during entity deletion, assuming \
-                         it wasn't sent to any clients and so deletion doesn't need to be \
-                         recorded for sync purposes"
-                    );
-                }
-            }
-        }
-        res
-    }
-}
diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs
new file mode 100644
index 0000000000..421dfc9fe7
--- /dev/null
+++ b/server/src/state_ext.rs
@@ -0,0 +1,222 @@
+use crate::{client::Client, settings::ServerSettings, sys::sentinel::DeletedEntities, SpawnPoint};
+use common::{
+    assets, comp,
+    effect::Effect,
+    msg::{ClientState, ServerMsg},
+    state::State,
+    sync::{Uid, WorldSyncExt},
+};
+use log::warn;
+use specs::{Builder, Entity as EcsEntity, EntityBuilder as EcsEntityBuilder, Join, WorldExt};
+use vek::*;
+
+pub trait StateExt {
+    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool;
+    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect);
+    fn create_npc(
+        &mut self,
+        pos: comp::Pos,
+        stats: comp::Stats,
+        body: comp::Body,
+    ) -> EcsEntityBuilder;
+    fn create_object(&mut self, pos: comp::Pos, object: comp::object::Body) -> EcsEntityBuilder;
+    fn create_projectile(
+        &mut self,
+        pos: comp::Pos,
+        vel: comp::Vel,
+        body: comp::Body,
+        projectile: comp::Projectile,
+    ) -> EcsEntityBuilder;
+    fn create_player_character(
+        &mut self,
+        entity: EcsEntity,
+        name: String,
+        body: comp::Body,
+        main: Option<String>,
+        server_settings: &ServerSettings,
+    );
+    fn notify_registered_clients(&self, msg: ServerMsg);
+    fn delete_entity_recorded(
+        &mut self,
+        entity: EcsEntity,
+    ) -> Result<(), specs::error::WrongGeneration>;
+}
+
+impl StateExt for State {
+    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool {
+        let success = self
+            .ecs()
+            .write_storage::<comp::Inventory>()
+            .get_mut(entity)
+            .map(|inv| inv.push(item).is_none())
+            .unwrap_or(false);
+        if success {
+            self.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Collected),
+            );
+        }
+        success
+    }
+
+    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect) {
+        match effect {
+            Effect::Health(change) => {
+                self.ecs()
+                    .write_storage::<comp::Stats>()
+                    .get_mut(entity)
+                    .map(|stats| stats.health.change_by(change));
+            },
+            Effect::Xp(xp) => {
+                self.ecs()
+                    .write_storage::<comp::Stats>()
+                    .get_mut(entity)
+                    .map(|stats| stats.exp.change_by(xp));
+            },
+        }
+    }
+
+    /// Build a non-player character.
+    fn create_npc(
+        &mut self,
+        pos: comp::Pos,
+        stats: comp::Stats,
+        body: comp::Body,
+    ) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(comp::Vel(Vec3::zero()))
+            .with(comp::Ori(Vec3::unit_y()))
+            .with(comp::Controller::default())
+            .with(body)
+            .with(stats)
+            .with(comp::Alignment::Npc)
+            .with(comp::Energy::new(500))
+            .with(comp::Gravity(1.0))
+            .with(comp::CharacterState::default())
+    }
+
+    /// Build a static object entity
+    fn create_object(&mut self, pos: comp::Pos, object: comp::object::Body) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(comp::Vel(Vec3::zero()))
+            .with(comp::Ori(Vec3::unit_y()))
+            .with(comp::Body::Object(object))
+            .with(comp::Mass(100.0))
+            .with(comp::Gravity(1.0))
+        //.with(comp::LightEmitter::default())
+    }
+
+    /// Build a projectile
+    fn create_projectile(
+        &mut self,
+        pos: comp::Pos,
+        vel: comp::Vel,
+        body: comp::Body,
+        projectile: comp::Projectile,
+    ) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(vel)
+            .with(comp::Ori(vel.0.normalized()))
+            .with(comp::Mass(0.0))
+            .with(body)
+            .with(projectile)
+            .with(comp::Sticky)
+    }
+
+    fn create_player_character(
+        &mut self,
+        entity: EcsEntity,
+        name: String,
+        body: comp::Body,
+        main: Option<String>,
+        server_settings: &ServerSettings,
+    ) {
+        // Give no item when an invalid specifier is given
+        let main = main.and_then(|specifier| assets::load_cloned(&specifier).ok());
+
+        let spawn_point = self.ecs().read_resource::<SpawnPoint>().0;
+
+        self.write_component(entity, body);
+        self.write_component(entity, comp::Stats::new(name, body, main));
+        self.write_component(entity, comp::Energy::new(1000));
+        self.write_component(entity, comp::Controller::default());
+        self.write_component(entity, comp::Pos(spawn_point));
+        self.write_component(entity, comp::Vel(Vec3::zero()));
+        self.write_component(entity, comp::Ori(Vec3::unit_y()));
+        self.write_component(entity, comp::Gravity(1.0));
+        self.write_component(entity, comp::CharacterState::default());
+        self.write_component(entity, comp::Alignment::Owned(entity));
+        self.write_component(entity, comp::Inventory::default());
+        self.write_component(
+            entity,
+            comp::InventoryUpdate::new(comp::InventoryUpdateEvent::default()),
+        );
+        // Make sure physics are accepted.
+        self.write_component(entity, comp::ForceUpdate);
+
+        // Give the Admin component to the player if their name exists in admin list
+        if server_settings.admins.contains(
+            &self
+                .ecs()
+                .read_storage::<comp::Player>()
+                .get(entity)
+                .expect("Failed to fetch entity.")
+                .alias,
+        ) {
+            self.write_component(entity, comp::Admin);
+        }
+        // Tell the client its request was successful.
+        if let Some(client) = self.ecs().write_storage::<Client>().get_mut(entity) {
+            client.allow_state(ClientState::Character);
+        }
+    }
+
+    fn notify_registered_clients(&self, msg: ServerMsg) {
+        for client in (&mut self.ecs().write_storage::<Client>())
+            .join()
+            .filter(|c| c.is_registered())
+        {
+            client.notify(msg.clone())
+        }
+    }
+
+    fn delete_entity_recorded(
+        &mut self,
+        entity: EcsEntity,
+    ) -> Result<(), specs::error::WrongGeneration> {
+        let (maybe_uid, maybe_pos) = (
+            self.ecs().read_storage::<Uid>().get(entity).copied(),
+            self.ecs().read_storage::<comp::Pos>().get(entity).copied(),
+        );
+        let res = self.ecs_mut().delete_entity(entity);
+        if res.is_ok() {
+            if let (Some(uid), Some(pos)) = (maybe_uid, maybe_pos) {
+                if let Some(region_key) = self
+                    .ecs()
+                    .read_resource::<common::region::RegionMap>()
+                    .find_region(entity, pos.0)
+                {
+                    self.ecs()
+                        .write_resource::<DeletedEntities>()
+                        .record_deleted_entity(uid, region_key);
+                } else {
+                    // Don't panic if the entity wasn't found in a region maybe it was just created
+                    // and then deleted before the region manager had a chance to assign it a
+                    // region
+                    warn!(
+                        "Failed to find region containing entity during entity deletion, assuming \
+                         it wasn't sent to any clients and so deletion doesn't need to be \
+                         recorded for sync purposes"
+                    );
+                }
+            }
+        }
+        res
+    }
+}

From d131a5ce8f03ab037a4a2f28b55d5f61308eb2f9 Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sat, 7 Mar 2020 22:14:21 +0000
Subject: [PATCH 30/41] Janky fix of the logout timeout problem

---
 client/src/lib.rs         |  3 ++-
 common/src/msg/mod.rs     |  1 +
 server/src/sys/message.rs |  7 +++++++
 voxygen/src/session.rs    | 31 +++++++++++++++++++++++--------
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 09841e3fa7..27f4d9f2ea 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -222,7 +222,7 @@ impl Client {
     /// Send disconnect message to the server
     pub fn request_logout(&mut self) {
         self.postbox.send_message(ClientMsg::Disconnect);
-        self.client_state = ClientState::Pending;
+        self.client_state = ClientState::Disconnected;
     }
 
     /// Request a state transition to `ClientState::Registered` from an ingame
@@ -722,6 +722,7 @@ impl Client {
                     },
                     ServerMsg::Disconnect => {
                         frontend_events.push(Event::Disconnect);
+                        self.client_state = ClientState::Disconnected;
                     },
                 }
             }
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index 1c04fece94..ad9e8411f0 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -16,6 +16,7 @@ pub enum ClientState {
     Registered,
     Spectator,
     Character,
+    Disconnected,
 }
 
 pub const MAX_BYTES_CHAT_MSG: usize = 256;
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index b524c22fbc..fab604c10c 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -111,6 +111,7 @@ impl<'a> System<'a> for Sys {
                             server_emitter.emit(ServerEvent::ExitIngame { entity });
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request spectator state
                     ClientMsg::Spectate => match client.client_state {
@@ -121,6 +122,7 @@ impl<'a> System<'a> for Sys {
                             client.allow_state(ClientState::Spectator)
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request registered state (login)
                     ClientMsg::Register {
@@ -200,6 +202,7 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Character => client.error_state(RequestStateError::Already),
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControllerInputs(inputs) => match client.client_state {
                         ClientState::Connected
@@ -213,6 +216,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControlEvent(event) => match client.client_state {
                         ClientState::Connected
@@ -226,6 +230,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ChatMsg { message } => match client.client_state {
                         ClientState::Connected => client.error_state(RequestStateError::Impossible),
@@ -240,6 +245,7 @@ impl<'a> System<'a> for Sys {
                             ),
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::PlayerPhysics { pos, vel, ori } => match client.client_state {
                         ClientState::Character => {
@@ -280,6 +286,7 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
+                        ClientState::Disconnected => unreachable!(),
                     },
                     // Always possible.
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index cf47210669..234db82d4f 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -33,6 +33,14 @@ pub struct SessionState {
     selected_block: Block,
 }
 
+/// The action to perform after a tick
+enum TickAction {
+    // Continue executing
+    Continue,
+    // Disconnected (i.e. go to main menu)
+    Disconnect,
+}
+
 /// Represents an active game session (i.e., the one being played).
 impl SessionState {
     /// Create a new `SessionState`.
@@ -65,7 +73,7 @@ impl SessionState {
 
 impl SessionState {
     /// Tick the session (and the client attached to it).
-    fn tick(&mut self, dt: Duration) -> Result<(), Error> {
+    fn tick(&mut self, dt: Duration) -> Result<TickAction, Error> {
         self.inputs.tick(dt);
         for event in self.client.borrow_mut().tick(
             self.inputs.clone(),
@@ -79,7 +87,10 @@ impl SessionState {
                 } => {
                     self.hud.new_message(event);
                 },
-                client::Event::Disconnect => {}, // TODO
+                client::Event::Disconnect => {
+                    log::warn!("disconnect");
+                    return Ok(TickAction::Disconnect);
+                },
                 client::Event::DisconnectionNotification(time) => {
                     let message = match time {
                         0 => String::from("Goodbye!"),
@@ -94,7 +105,7 @@ impl SessionState {
             }
         }
 
-        Ok(())
+        Ok(TickAction::Continue)
     }
 
     /// Clean up the session (and the client attached to it) after a tick.
@@ -390,12 +401,16 @@ impl PlayState for SessionState {
                 || !global_state.singleplayer.as_ref().unwrap().is_paused()
             {
                 // Perform an in-game tick.
-                if let Err(err) = self.tick(clock.get_avg_delta()) {
-                    global_state.info_message =
-                        Some(localized_strings.get("common.connection_lost").to_owned());
-                    error!("[session] Failed to tick the scene: {:?}", err);
+                match self.tick(clock.get_avg_delta()) {
+                    Ok(TickAction::Continue) => {}, // Do nothing
+                    Ok(TickAction::Disconnect) => return PlayStateResult::Pop, // Go to main menu
+                    Err(err) => {
+                        global_state.info_message =
+                            Some(localized_strings.get("common.connection_lost").to_owned());
+                        error!("[session] Failed to tick the scene: {:?}", err);
 
-                    return PlayStateResult::Pop;
+                        return PlayStateResult::Pop;
+                    },
                 }
             }
 

From cc5845d7560c87ea9c022b14136cf5f3bf40e408 Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 08:06:22 +0000
Subject: [PATCH 31/41] Proper fix to the logout timeout problem using
 Disconnect ACK

---
 client/src/lib.rs                      | 10 +++++++++-
 common/src/msg/client.rs               |  1 +
 server/src/sys/message.rs              |  4 +++-
 voxygen/src/menu/char_selection/mod.rs |  7 ++++++-
 voxygen/src/session.rs                 | 21 +++++++++------------
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 27f4d9f2ea..14bbb8d96f 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -78,6 +78,8 @@ pub struct Client {
     loaded_distance: f32,
 
     pending_chunks: HashMap<Vec2<i32>, Instant>,
+
+    disconnected: bool,
 }
 
 impl Client {
@@ -164,6 +166,8 @@ impl Client {
             loaded_distance: 0.0,
 
             pending_chunks: HashMap::new(),
+
+            disconnected: false,
         })
     }
 
@@ -721,8 +725,9 @@ impl Client {
                         );
                     },
                     ServerMsg::Disconnect => {
+                        self.disconnected = true;
                         frontend_events.push(Event::Disconnect);
-                        self.client_state = ClientState::Disconnected;
+                        self.postbox.send_message(ClientMsg::Terminate);
                     },
                 }
             }
@@ -735,6 +740,9 @@ impl Client {
         Ok(frontend_events)
     }
 
+    // Get's whether or not the client just disconnected
+    pub fn disconnected(&self) -> bool { self.disconnected }
+
     /// Get the player's entity.
     pub fn entity(&self) -> EcsEntity { self.entity }
 
diff --git a/common/src/msg/client.rs b/common/src/msg/client.rs
index 962cf40174..2b2ec63f33 100644
--- a/common/src/msg/client.rs
+++ b/common/src/msg/client.rs
@@ -35,4 +35,5 @@ pub enum ClientMsg {
         key: Vec2<i32>,
     },
     Disconnect,
+    Terminate,
 }
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index fab604c10c..5ee72f410e 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -294,6 +294,9 @@ impl<'a> System<'a> for Sys {
                     ClientMsg::Disconnect => {
                         disconnect = true;
                     },
+                    ClientMsg::Terminate => {
+                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
+                    },
                 }
             }
 
@@ -308,7 +311,6 @@ impl<'a> System<'a> for Sys {
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
                     ));
                 }
-                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                 client.postbox.send_message(ServerMsg::Disconnect);
             }
         }
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index f7eaae27c2..0931126e37 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -39,6 +39,11 @@ impl PlayState for CharSelectionState {
         // Set up an fps clock.
         let mut clock = Clock::start();
 
+        // Check if we just disconnected, if so go to main menu
+        if self.client.borrow().disconnected() {
+            return PlayStateResult::Pop;
+        }
+
         let mut current_client_state = self.client.borrow().get_client_state();
         while let ClientState::Pending | ClientState::Registered = current_client_state {
             // Handle window events
@@ -141,7 +146,7 @@ impl PlayState for CharSelectionState {
             ) {
                 global_state.info_message =
                     Some(localized_strings.get("common.connection_lost").to_owned());
-                error!("[session] Failed to tick the scene: {:?}", err);
+                error!("[char_selection] Failed to tick the scene: {:?}", err);
 
                 return PlayStateResult::Pop;
             }
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 234db82d4f..7e36d44543 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -24,6 +24,14 @@ use specs::{Join, WorldExt};
 use std::{cell::RefCell, rc::Rc, time::Duration};
 use vek::*;
 
+/// The action to perform after a tick
+enum TickAction {
+    // Continue executing
+    Continue,
+    // Disconnected (i.e. go to main menu)
+    Disconnect,
+}
+
 pub struct SessionState {
     scene: Scene,
     client: Rc<RefCell<Client>>,
@@ -33,14 +41,6 @@ pub struct SessionState {
     selected_block: Block,
 }
 
-/// The action to perform after a tick
-enum TickAction {
-    // Continue executing
-    Continue,
-    // Disconnected (i.e. go to main menu)
-    Disconnect,
-}
-
 /// Represents an active game session (i.e., the one being played).
 impl SessionState {
     /// Create a new `SessionState`.
@@ -87,10 +87,7 @@ impl SessionState {
                 } => {
                     self.hud.new_message(event);
                 },
-                client::Event::Disconnect => {
-                    log::warn!("disconnect");
-                    return Ok(TickAction::Disconnect);
-                },
+                client::Event::Disconnect => return Ok(TickAction::Disconnect),
                 client::Event::DisconnectionNotification(time) => {
                     let message = match time {
                         0 => String::from("Goodbye!"),

From d8e65318cb534bf83eba5335294dc4890bd3a62f Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 08:54:29 +0000
Subject: [PATCH 32/41] Fix the spam on disconnect

---
 client/src/lib.rs         | 5 +----
 common/src/msg/mod.rs     | 1 -
 server/src/sys/message.rs | 9 +--------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 14bbb8d96f..a1d8e89480 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -224,10 +224,7 @@ impl Client {
     }
 
     /// Send disconnect message to the server
-    pub fn request_logout(&mut self) {
-        self.postbox.send_message(ClientMsg::Disconnect);
-        self.client_state = ClientState::Disconnected;
-    }
+    pub fn request_logout(&mut self) { self.postbox.send_message(ClientMsg::Disconnect); }
 
     /// Request a state transition to `ClientState::Registered` from an ingame
     /// state.
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index ad9e8411f0..1c04fece94 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -16,7 +16,6 @@ pub enum ClientState {
     Registered,
     Spectator,
     Character,
-    Disconnected,
 }
 
 pub const MAX_BYTES_CHAT_MSG: usize = 256;
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 5ee72f410e..0274184af6 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -91,7 +91,7 @@ impl<'a> System<'a> for Sys {
                 || client.postbox.error().is_some()
             // Postbox error
             {
-                disconnect = true;
+                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
             } else if time - client.last_ping > CLIENT_TIMEOUT * 0.5 {
                 // Try pinging the client if the timeout is nearing.
                 client.postbox.send_message(ServerMsg::Ping);
@@ -111,7 +111,6 @@ impl<'a> System<'a> for Sys {
                             server_emitter.emit(ServerEvent::ExitIngame { entity });
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request spectator state
                     ClientMsg::Spectate => match client.client_state {
@@ -122,7 +121,6 @@ impl<'a> System<'a> for Sys {
                             client.allow_state(ClientState::Spectator)
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Request registered state (login)
                     ClientMsg::Register {
@@ -202,7 +200,6 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Character => client.error_state(RequestStateError::Already),
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControllerInputs(inputs) => match client.client_state {
                         ClientState::Connected
@@ -216,7 +213,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ControlEvent(event) => match client.client_state {
                         ClientState::Connected
@@ -230,7 +226,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::ChatMsg { message } => match client.client_state {
                         ClientState::Connected => client.error_state(RequestStateError::Impossible),
@@ -245,7 +240,6 @@ impl<'a> System<'a> for Sys {
                             ),
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     ClientMsg::PlayerPhysics { pos, vel, ori } => match client.client_state {
                         ClientState::Character => {
@@ -286,7 +280,6 @@ impl<'a> System<'a> for Sys {
                             }
                         },
                         ClientState::Pending => {},
-                        ClientState::Disconnected => unreachable!(),
                     },
                     // Always possible.
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),

From 62a5a0ae2cd59ae7bd56bef813b36cf12869345b Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 8 Mar 2020 20:31:27 +0000
Subject: [PATCH 33/41] Switch states instead of popping

---
 client/src/lib.rs                      | 8 --------
 voxygen/src/menu/char_selection/mod.rs | 7 +------
 voxygen/src/session.rs                 | 8 ++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index a1d8e89480..390ee69b5e 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -78,8 +78,6 @@ pub struct Client {
     loaded_distance: f32,
 
     pending_chunks: HashMap<Vec2<i32>, Instant>,
-
-    disconnected: bool,
 }
 
 impl Client {
@@ -166,8 +164,6 @@ impl Client {
             loaded_distance: 0.0,
 
             pending_chunks: HashMap::new(),
-
-            disconnected: false,
         })
     }
 
@@ -722,7 +718,6 @@ impl Client {
                         );
                     },
                     ServerMsg::Disconnect => {
-                        self.disconnected = true;
                         frontend_events.push(Event::Disconnect);
                         self.postbox.send_message(ClientMsg::Terminate);
                     },
@@ -737,9 +732,6 @@ impl Client {
         Ok(frontend_events)
     }
 
-    // Get's whether or not the client just disconnected
-    pub fn disconnected(&self) -> bool { self.disconnected }
-
     /// Get the player's entity.
     pub fn entity(&self) -> EcsEntity { self.entity }
 
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index 0931126e37..23b43d7eb9 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -39,11 +39,6 @@ impl PlayState for CharSelectionState {
         // Set up an fps clock.
         let mut clock = Clock::start();
 
-        // Check if we just disconnected, if so go to main menu
-        if self.client.borrow().disconnected() {
-            return PlayStateResult::Pop;
-        }
-
         let mut current_client_state = self.client.borrow().get_client_state();
         while let ClientState::Pending | ClientState::Registered = current_client_state {
             // Handle window events
@@ -83,7 +78,7 @@ impl PlayState for CharSelectionState {
                             char_data.body,
                             char_data.tool,
                         );
-                        return PlayStateResult::Push(Box::new(SessionState::new(
+                        return PlayStateResult::Switch(Box::new(SessionState::new(
                             global_state,
                             self.client.clone(),
                         )));
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 7e36d44543..c6de6e40e0 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -3,6 +3,7 @@ use crate::{
     hud::{DebugInfo, Event as HudEvent, Hud},
     i18n::{i18n_asset_key, VoxygenLocalization},
     key_state::KeyState,
+    menu::char_selection::CharSelectionState,
     render::Renderer,
     scene::{camera, Scene, SceneData},
     window::{Event, GameInput},
@@ -680,6 +681,13 @@ impl PlayState for SessionState {
             current_client_state = self.client.borrow().get_client_state();
         }
 
+        if let ClientState::Registered = current_client_state {
+            return PlayStateResult::Switch(Box::new(CharSelectionState::new(
+                global_state,
+                self.client.clone(),
+            )));
+        }
+
         PlayStateResult::Pop
     }
 

From fdefcf3926f2cb03994f21b8c01eb05adf4e4f9b Mon Sep 17 00:00:00 2001
From: S Handley <shanehandley@fastmail.com>
Date: Tue, 10 Mar 2020 20:50:04 +0000
Subject: [PATCH 34/41] Check that a targeted collectible is within a certain
 pickup range of the character before highlighting it

---
 common/src/comp/inventory/mod.rs     |  3 ++
 common/src/comp/mod.rs               |  4 ++-
 server/src/events/inventory_manip.rs | 46 ++++++++++++++++++++++++++--
 voxygen/src/session.rs               | 39 ++++++++++++++++++-----
 4 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs
index f192208b5c..1b79359eb8 100644
--- a/common/src/comp/inventory/mod.rs
+++ b/common/src/comp/inventory/mod.rs
@@ -8,6 +8,9 @@ use specs::{Component, FlaggedStorage, HashMapStorage};
 use specs_idvs::IDVStorage;
 use std::ops::Not;
 
+// The limit on distance between the entity and a collectible (squared)
+pub const MAX_PICKUP_RANGE_SQR: f32 = 64.0;
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Inventory {
     pub slots: Vec<Option<Item>>,
diff --git a/common/src/comp/mod.rs b/common/src/comp/mod.rs
index 2871761a7a..1c49afab0b 100644
--- a/common/src/comp/mod.rs
+++ b/common/src/comp/mod.rs
@@ -28,7 +28,9 @@ pub use controller::{
 };
 pub use energy::{Energy, EnergySource};
 pub use inputs::CanBuild;
-pub use inventory::{item, Inventory, InventoryUpdate, InventoryUpdateEvent, Item, ItemKind};
+pub use inventory::{
+    item, Inventory, InventoryUpdate, InventoryUpdateEvent, Item, ItemKind, MAX_PICKUP_RANGE_SQR,
+};
 pub use last::Last;
 pub use location::{Waypoint, WaypointArea};
 pub use phys::{ForceUpdate, Gravity, Mass, Ori, PhysicsState, Pos, Scale, Sticky, Vel};
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index 09998ca6aa..8e6570f89f 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -1,6 +1,6 @@
 use crate::{Server, StateExt};
 use common::{
-    comp,
+    comp::{self, Pos, MAX_PICKUP_RANGE_SQR},
     sync::WorldSyncExt,
     terrain::block::Block,
     vol::{ReadVol, Vox},
@@ -16,7 +16,6 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
 
     match manip {
         comp::InventoryManip::Pickup(uid) => {
-            // TODO: enforce max pickup range
             let item_entity = if let (Some((item, item_entity)), Some(inv)) = (
                 state
                     .ecs()
@@ -33,7 +32,11 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
                     .write_storage::<comp::Inventory>()
                     .get_mut(entity),
             ) {
-                if inv.push(item).is_none() {
+                if within_pickup_range(
+                    state.ecs().read_storage::<comp::Pos>().get(entity),
+                    state.ecs().read_storage::<comp::Pos>().get(item_entity),
+                ) && inv.push(item).is_none()
+                {
                     Some(item_entity)
                 } else {
                     None
@@ -56,6 +59,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
 
         comp::InventoryManip::Collect(pos) => {
             let block = state.terrain().get(pos).ok().copied();
+
             if let Some(block) = block {
                 if block.is_collectible()
                     && state
@@ -231,3 +235,39 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
             .build();
     }
 }
+
+fn within_pickup_range(player_position: Option<&Pos>, item_position: Option<&Pos>) -> bool {
+    match (player_position, item_position) {
+        (Some(ppos), Some(ipos)) => ppos.0.distance_squared(ipos.0) < MAX_PICKUP_RANGE_SQR,
+        _ => false,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use common::comp::Pos;
+    use vek::Vec3;
+
+    #[test]
+    fn pickup_distance_within_range() {
+        let player_position = Pos(Vec3::zero());
+        let item_position = Pos(Vec3::one());
+
+        assert_eq!(
+            within_pickup_range(Some(&player_position), Some(&item_position)),
+            true
+        );
+    }
+
+    #[test]
+    fn pickup_distance_not_within_range() {
+        let player_position = Pos(Vec3::zero());
+        let item_position = Pos(Vec3::one() * 500.0);
+
+        assert_eq!(
+            within_pickup_range(Some(&player_position), Some(&item_position)),
+            false
+        );
+    }
+}
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index cf47210669..0fd0cbe2e3 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -13,7 +13,7 @@ use common::{
     assets::{load_watched, watch},
     clock::Clock,
     comp,
-    comp::{Pos, Vel},
+    comp::{Pos, Vel, MAX_PICKUP_RANGE_SQR},
     msg::ClientState,
     terrain::{Block, BlockKind},
     vol::ReadVol,
@@ -155,27 +155,52 @@ impl PlayState for SessionState {
             let camera::Dependents {
                 view_mat, cam_pos, ..
             } = self.scene.camera().dependents();
+
+            // Choose a spot above the player's head for item distance checks
+            let player_pos = match self
+                .client
+                .borrow()
+                .state()
+                .read_storage::<comp::Pos>()
+                .get(self.client.borrow().entity())
+            {
+                Some(pos) => pos.0 + (Vec3::unit_z() * 2.0),
+                _ => cam_pos, // Should never happen, but a safe fallback
+            };
+
             let cam_dir: Vec3<f32> = Vec3::from(view_mat.inverted() * -Vec4::unit_z());
 
             // Check to see whether we're aiming at anything
             let (build_pos, select_pos) = {
                 let client = self.client.borrow();
                 let terrain = client.state().terrain();
-                let ray = terrain
+
+                let cam_ray = terrain
                     .ray(cam_pos, cam_pos + cam_dir * 100.0)
                     .until(|block| block.is_tangible())
                     .cast();
-                let dist = ray.0;
-                if let Ok(Some(_)) = ray.1 {
-                    // Hit something!
+
+                let cam_dist = cam_ray.0;
+
+                if let Ok(Some(_)) = cam_ray.1 {
+                    // The ray hit something, is it within pickup range?
+                    let select_pos = if player_pos.distance_squared(cam_pos + cam_dir * cam_dist)
+                        <= MAX_PICKUP_RANGE_SQR
+                    {
+                        Some((cam_pos + cam_dir * cam_dist).map(|e| e.floor() as i32))
+                    } else {
+                        None
+                    };
+
                     (
-                        Some((cam_pos + cam_dir * (dist - 0.01)).map(|e| e.floor() as i32)),
-                        Some((cam_pos + cam_dir * dist).map(|e| e.floor() as i32)),
+                        Some((cam_pos + cam_dir * (cam_dist - 0.01)).map(|e| e.floor() as i32)),
+                        select_pos,
                     )
                 } else {
                     (None, None)
                 }
             };
+
             // Only highlight collectables
             self.scene.set_select_pos(select_pos.filter(|sp| {
                 self.client

From aec086a10d4df4a5ac0ded6ce505f558842d2760 Mon Sep 17 00:00:00 2001
From: Mckol <mckol363@gmail.com>
Date: Tue, 10 Mar 2020 21:00:13 +0000
Subject: [PATCH 35/41] Added Controller support

---
 CHANGELOG.md              |   1 +
 Cargo.lock                | 249 ++++++++++++++++++++++++-----
 voxygen/Cargo.toml        |   3 +
 voxygen/src/controller.rs | 329 ++++++++++++++++++++++++++++++++++++++
 voxygen/src/key_state.rs  |  16 +-
 voxygen/src/lib.rs        |   1 +
 voxygen/src/scene/mod.rs  |  21 ++-
 voxygen/src/session.rs    |  13 +-
 voxygen/src/settings.rs   | 223 +++++++++++++++++++++++++-
 voxygen/src/ui/mod.rs     |   4 +-
 voxygen/src/window.rs     | 293 ++++++++++++++++++++++++++++++++-
 11 files changed, 1100 insertions(+), 53 deletions(-)
 create mode 100644 voxygen/src/controller.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37648ad8bf..4edcbdd1c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - weapon control system
 - Game pauses when in singleplayer and pause menu
 - Added authentication system (to play on the official server register on https://account.veloren.net)
+- Added gamepad/controller support
 
 ### Changed
 
diff --git a/Cargo.lock b/Cargo.lock
index a7da69e687..22b3939864 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -160,7 +160,7 @@ source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb3
 dependencies = [
  "rand 0.7.3",
  "serde",
- "uuid",
+ "uuid 0.7.4",
 ]
 
 [[package]]
@@ -174,7 +174,7 @@ dependencies = [
  "reqwest",
  "rust-argon2 0.6.1",
  "serde_json",
- "uuid",
+ "uuid 0.7.4",
 ]
 
 [[package]]
@@ -203,14 +203,20 @@ dependencies = [
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17b52e737c40a7d75abca20b29a19a0eb7ba9fc72c5a72dd282a0a3c2c0dc35"
+checksum = "ca797db0057bae1a7aa2eef3283a874695455cecf08a43bfb8507ee0ebc1ed69"
 dependencies = [
  "cc",
  "libc",
 ]
 
+[[package]]
+name = "base-x"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
+
 [[package]]
 name = "base64"
 version = "0.9.3"
@@ -248,15 +254,16 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.51.1"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
+checksum = "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8"
 dependencies = [
  "bitflags",
  "cexpr",
  "cfg-if",
  "clang-sys",
  "lazy_static",
+ "lazycell",
  "peeking_take_while",
  "proc-macro2 1.0.9",
  "quote 1.0.3",
@@ -360,15 +367,6 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 
-[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-dependencies = [
- "ppv-lite86",
-]
-
 [[package]]
 name = "c_vec"
 version = "1.3.3"
@@ -419,11 +417,11 @@ dependencies = [
 
 [[package]]
 name = "cexpr"
-version = "0.3.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
 dependencies = [
- "nom",
+ "nom 5.1.1",
 ]
 
 [[package]]
@@ -471,9 +469,9 @@ checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
 
 [[package]]
 name = "clang-sys"
-version = "0.28.1"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
+checksum = "f92986241798376849e1a007827041fed9bb36195822c2049d18e174420e0534"
 dependencies = [
  "glob",
  "libc",
@@ -614,9 +612,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "copypasta"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fcbfb17a41091ba8bad1233d0178fda058968a71998dde3f11189f0b4aa9da"
+checksum = "865e9675691e2a7dfc806b16ef2dd5dd536e26ea9b8046519767d79be03aeb6a"
 dependencies = [
  "clipboard-win",
  "objc",
@@ -683,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
+checksum = "e81f1c165c33ffab90a03077ac3b03462b34d5947145dfa48102e063d581502c"
 dependencies = [
  "bindgen",
 ]
@@ -703,7 +701,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "num-traits 0.2.11",
- "stdweb",
+ "stdweb 0.1.3",
  "winapi 0.3.8",
 ]
 
@@ -917,9 +915,9 @@ dependencies = [
 
 [[package]]
 name = "derivative"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
+checksum = "3c6d883546668a3e2011b6a716a7330b82eabb0151b138217f632c8243e17135"
 dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
@@ -965,6 +963,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
 [[package]]
 name = "dispatch"
 version = "0.1.4"
@@ -989,7 +993,7 @@ dependencies = [
  "byteorder 1.3.4",
  "lazy_static",
  "log 0.4.8",
- "nom",
+ "nom 4.2.3",
 ]
 
 [[package]]
@@ -1400,6 +1404,40 @@ dependencies = [
  "lzw",
 ]
 
+[[package]]
+name = "gilrs"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "122bb249f904e5f4ac73fc514b9b2ce6cce3af511f5df00ffc8000e47de6b290"
+dependencies = [
+ "fnv",
+ "gilrs-core",
+ "log 0.4.8",
+ "serde",
+ "stdweb 0.4.20",
+ "uuid 0.8.1",
+ "vec_map",
+]
+
+[[package]]
+name = "gilrs-core"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdd4ea2d919ecb594362fa26b0f172729b9ee9b95e407fbad95e0a49cadc143"
+dependencies = [
+ "core-foundation 0.6.4",
+ "io-kit-sys",
+ "libc",
+ "libudev-sys",
+ "log 0.4.8",
+ "nix 0.15.0",
+ "rusty-xinput",
+ "stdweb 0.4.20",
+ "uuid 0.8.1",
+ "vec_map",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "gio"
 version = "0.4.1"
@@ -1882,6 +1920,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
 
+[[package]]
+name = "io-kit-sys"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
+dependencies = [
+ "core-foundation-sys 0.6.2",
+ "mach",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -2017,6 +2065,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.0.25"
@@ -2087,6 +2145,15 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
 
+[[package]]
+name = "mach"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2287,6 +2354,19 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "nix"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "void",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2312,6 +2392,16 @@ dependencies = [
  "version_check 0.1.5",
 ]
 
+[[package]]
+name = "nom"
+version = "5.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
+dependencies = [
+ "memchr",
+ "version_check 0.9.1",
+]
+
 [[package]]
 name = "notify"
 version = "5.0.0-pre.2"
@@ -2977,7 +3067,7 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
  "getrandom",
  "libc",
- "rand_chacha 0.2.1",
+ "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
  "rand_pcg 0.2.1",
@@ -2995,11 +3085,11 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
- "c2-chacha",
+ "ppv-lite86",
  "rand_core 0.5.1",
 ]
 
@@ -3403,6 +3493,17 @@ dependencies = [
  "stb_truetype",
 ]
 
+[[package]]
+name = "rusty-xinput"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
+dependencies = [
+ "lazy_static",
+ "log 0.4.8",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.2"
@@ -3660,7 +3761,7 @@ dependencies = [
  "dlib",
  "lazy_static",
  "memmap",
- "nix",
+ "nix 0.14.1",
  "wayland-client 0.21.13",
  "wayland-commons 0.21.13",
  "wayland-protocols 0.21.13",
@@ -3677,18 +3778,18 @@ dependencies = [
  "dlib",
  "lazy_static",
  "memmap",
- "nix",
+ "nix 0.14.1",
  "wayland-client 0.23.6",
  "wayland-protocols 0.23.6",
 ]
 
 [[package]]
 name = "smithay-clipboard"
-version = "0.3.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a59486e68b5596f664deedf01c46297f4af60379adae20175357a814d40f69e"
+checksum = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1"
 dependencies = [
- "nix",
+ "nix 0.14.1",
  "smithay-client-toolkit 0.6.6",
 ]
 
@@ -3751,6 +3852,57 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
 
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "serde",
+ "serde_derive",
+ "syn 1.0.16",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "syn 1.0.16",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
+
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -4090,6 +4242,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "uuid"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
+
 [[package]]
 name = "uvth"
 version = "3.1.1"
@@ -4107,6 +4265,12 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+
 [[package]]
 name = "vek"
 version = "0.9.12"
@@ -4239,6 +4403,7 @@ dependencies = [
  "gfx",
  "gfx_device_gl",
  "gfx_window_glutin",
+ "gilrs",
  "git2",
  "glsl-include",
  "glutin",
@@ -4285,7 +4450,7 @@ dependencies = [
  "packed_simd",
  "pretty_env_logger",
  "rand 0.7.3",
- "rand_chacha 0.2.1",
+ "rand_chacha 0.2.2",
  "rayon",
  "ron",
  "roots",
@@ -4417,7 +4582,7 @@ dependencies = [
  "bitflags",
  "downcast-rs",
  "libc",
- "nix",
+ "nix 0.14.1",
  "wayland-commons 0.21.13",
  "wayland-scanner 0.21.13",
  "wayland-sys 0.21.13",
@@ -4432,7 +4597,7 @@ dependencies = [
  "bitflags",
  "downcast-rs",
  "libc",
- "nix",
+ "nix 0.14.1",
  "wayland-commons 0.23.6",
  "wayland-scanner 0.23.6",
  "wayland-sys 0.23.6",
@@ -4444,7 +4609,7 @@ version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
 dependencies = [
- "nix",
+ "nix 0.14.1",
  "wayland-sys 0.21.13",
 ]
 
@@ -4454,7 +4619,7 @@ version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
 dependencies = [
- "nix",
+ "nix 0.14.1",
  "wayland-sys 0.23.6",
 ]
 
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index a4e5c7cff5..21049a4c4c 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -35,6 +35,9 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
 # Mathematics
 vek = { version = "0.9.9", features = ["serde"] }
 
+# Controller
+gilrs = { version = "0.7", features = ["serde"] }
+
 # Singleplayer
 server = { package = "veloren-server", path = "../server", optional = true }
 
diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs
new file mode 100644
index 0000000000..77049acc21
--- /dev/null
+++ b/voxygen/src/controller.rs
@@ -0,0 +1,329 @@
+//! Module containing controller-specific abstractions allowing complex
+//! keybindings
+
+use crate::window::{GameInput, MenuInput};
+use gilrs::{ev::Code as GilCode, Axis as GilAxis, Button as GilButton};
+use hashbrown::HashMap;
+use serde_derive::{Deserialize, Serialize};
+
+/// Contains all controller related settings and keymaps
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ControllerSettings {
+    pub game_button_map: HashMap<Button, Vec<GameInput>>,
+    pub menu_button_map: HashMap<Button, Vec<MenuInput>>,
+    pub game_analog_button_map: HashMap<AnalogButton, Vec<AnalogButtonGameAction>>,
+    pub menu_analog_button_map: HashMap<AnalogButton, Vec<AnalogButtonMenuAction>>,
+    pub game_axis_map: HashMap<Axis, Vec<AxisGameAction>>,
+    pub menu_axis_map: HashMap<Axis, Vec<AxisMenuAction>>,
+    pub pan_sensitivity: u32,
+    pub axis_deadzones: HashMap<Axis, f32>,
+    pub button_deadzones: HashMap<AnalogButton, f32>,
+    pub mouse_emulation_sensitivity: u32,
+    pub inverted_axes: Vec<Axis>,
+}
+
+impl ControllerSettings {
+    pub fn apply_axis_deadzone(&self, k: &Axis, input: f32) -> f32 {
+        let threshold = *self.axis_deadzones.get(k).unwrap_or(&0.2);
+
+        // This could be one comparison per handled event faster if threshold was
+        // guaranteed to fall into <0, 1) range
+        let input_abs = input.abs();
+        if input_abs <= threshold || threshold >= 1.0 {
+            0.0
+        } else if threshold <= 0.0 {
+            input
+        } else {
+            (input_abs - threshold) / (1.0 - threshold) * input.signum()
+        }
+    }
+
+    pub fn apply_button_deadzone(&self, k: &AnalogButton, input: f32) -> f32 {
+        let threshold = *self.button_deadzones.get(k).unwrap_or(&0.2);
+
+        // This could be one comparison per handled event faster if threshold was
+        // guaranteed to fall into <0, 1) range
+        if input <= threshold || threshold >= 1.0 {
+            0.0
+        } else if threshold <= 0.0 {
+            input
+        } else {
+            (input - threshold) / (1.0 - threshold)
+        }
+    }
+}
+
+impl From<&crate::settings::GamepadSettings> for ControllerSettings {
+    fn from(settings: &crate::settings::GamepadSettings) -> Self {
+        Self {
+            game_button_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.game_buttons.primary)
+                    .or_default()
+                    .push(GameInput::Primary);
+                map.entry(settings.game_buttons.secondary)
+                    .or_default()
+                    .push(GameInput::Secondary);
+                map.entry(settings.game_buttons.toggle_cursor)
+                    .or_default()
+                    .push(GameInput::ToggleCursor);
+                map.entry(settings.game_buttons.escape)
+                    .or_default()
+                    .push(GameInput::Escape);
+                map.entry(settings.game_buttons.enter)
+                    .or_default()
+                    .push(GameInput::Enter);
+                map.entry(settings.game_buttons.command)
+                    .or_default()
+                    .push(GameInput::Command);
+                map.entry(settings.game_buttons.move_forward)
+                    .or_default()
+                    .push(GameInput::MoveForward);
+                map.entry(settings.game_buttons.move_left)
+                    .or_default()
+                    .push(GameInput::MoveLeft);
+                map.entry(settings.game_buttons.move_back)
+                    .or_default()
+                    .push(GameInput::MoveBack);
+                map.entry(settings.game_buttons.move_right)
+                    .or_default()
+                    .push(GameInput::MoveRight);
+                map.entry(settings.game_buttons.jump)
+                    .or_default()
+                    .push(GameInput::Jump);
+                map.entry(settings.game_buttons.sit)
+                    .or_default()
+                    .push(GameInput::Sit);
+                map.entry(settings.game_buttons.glide)
+                    .or_default()
+                    .push(GameInput::Glide);
+                map.entry(settings.game_buttons.climb)
+                    .or_default()
+                    .push(GameInput::Climb);
+                map.entry(settings.game_buttons.climb_down)
+                    .or_default()
+                    .push(GameInput::ClimbDown);
+                map.entry(settings.game_buttons.wall_leap)
+                    .or_default()
+                    .push(GameInput::WallLeap);
+                map.entry(settings.game_buttons.mount)
+                    .or_default()
+                    .push(GameInput::Mount);
+                map.entry(settings.game_buttons.map)
+                    .or_default()
+                    .push(GameInput::Map);
+                map.entry(settings.game_buttons.bag)
+                    .or_default()
+                    .push(GameInput::Bag);
+                map.entry(settings.game_buttons.quest_log)
+                    .or_default()
+                    .push(GameInput::QuestLog);
+                map.entry(settings.game_buttons.character_window)
+                    .or_default()
+                    .push(GameInput::CharacterWindow);
+                map.entry(settings.game_buttons.social)
+                    .or_default()
+                    .push(GameInput::Social);
+                map.entry(settings.game_buttons.spellbook)
+                    .or_default()
+                    .push(GameInput::Spellbook);
+                map.entry(settings.game_buttons.settings)
+                    .or_default()
+                    .push(GameInput::Settings);
+                map.entry(settings.game_buttons.help)
+                    .or_default()
+                    .push(GameInput::Help);
+                map.entry(settings.game_buttons.toggle_interface)
+                    .or_default()
+                    .push(GameInput::ToggleInterface);
+                map.entry(settings.game_buttons.toggle_debug)
+                    .or_default()
+                    .push(GameInput::ToggleDebug);
+                map.entry(settings.game_buttons.fullscreen)
+                    .or_default()
+                    .push(GameInput::Fullscreen);
+                map.entry(settings.game_buttons.screenshot)
+                    .or_default()
+                    .push(GameInput::Screenshot);
+                map.entry(settings.game_buttons.toggle_ingame_ui)
+                    .or_default()
+                    .push(GameInput::ToggleIngameUi);
+                map.entry(settings.game_buttons.roll)
+                    .or_default()
+                    .push(GameInput::Roll);
+                map.entry(settings.game_buttons.respawn)
+                    .or_default()
+                    .push(GameInput::Respawn);
+                map.entry(settings.game_buttons.interact)
+                    .or_default()
+                    .push(GameInput::Interact);
+                map.entry(settings.game_buttons.toggle_wield)
+                    .or_default()
+                    .push(GameInput::ToggleWield);
+                map.entry(settings.game_buttons.charge)
+                    .or_default()
+                    .push(GameInput::Charge);
+                map
+            },
+            menu_button_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.menu_buttons.up)
+                    .or_default()
+                    .push(MenuInput::Up);
+                map.entry(settings.menu_buttons.down)
+                    .or_default()
+                    .push(MenuInput::Down);
+                map.entry(settings.menu_buttons.left)
+                    .or_default()
+                    .push(MenuInput::Left);
+                map.entry(settings.menu_buttons.right)
+                    .or_default()
+                    .push(MenuInput::Right);
+                map.entry(settings.menu_buttons.scroll_up)
+                    .or_default()
+                    .push(MenuInput::ScrollUp);
+                map.entry(settings.menu_buttons.scroll_down)
+                    .or_default()
+                    .push(MenuInput::ScrollDown);
+                map.entry(settings.menu_buttons.scroll_left)
+                    .or_default()
+                    .push(MenuInput::ScrollLeft);
+                map.entry(settings.menu_buttons.scroll_right)
+                    .or_default()
+                    .push(MenuInput::ScrollRight);
+                map.entry(settings.menu_buttons.home)
+                    .or_default()
+                    .push(MenuInput::Home);
+                map.entry(settings.menu_buttons.end)
+                    .or_default()
+                    .push(MenuInput::End);
+                map.entry(settings.menu_buttons.apply)
+                    .or_default()
+                    .push(MenuInput::Apply);
+                map.entry(settings.menu_buttons.back)
+                    .or_default()
+                    .push(MenuInput::Back);
+                map.entry(settings.menu_buttons.exit)
+                    .or_default()
+                    .push(MenuInput::Exit);
+                map
+            },
+            game_analog_button_map: HashMap::new(),
+            menu_analog_button_map: HashMap::new(),
+            game_axis_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.game_axis.movement_x)
+                    .or_default()
+                    .push(AxisGameAction::MovementX);
+                map.entry(settings.game_axis.movement_y)
+                    .or_default()
+                    .push(AxisGameAction::MovementY);
+                map.entry(settings.game_axis.camera_x)
+                    .or_default()
+                    .push(AxisGameAction::CameraX);
+                map.entry(settings.game_axis.camera_y)
+                    .or_default()
+                    .push(AxisGameAction::CameraY);
+                map
+            },
+            menu_axis_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.menu_axis.move_x)
+                    .or_default()
+                    .push(AxisMenuAction::MoveX);
+                map.entry(settings.menu_axis.move_y)
+                    .or_default()
+                    .push(AxisMenuAction::MoveY);
+                map.entry(settings.menu_axis.scroll_x)
+                    .or_default()
+                    .push(AxisMenuAction::ScrollX);
+                map.entry(settings.menu_axis.scroll_y)
+                    .or_default()
+                    .push(AxisMenuAction::ScrollY);
+                map
+            },
+            pan_sensitivity: settings.pan_sensitivity,
+            axis_deadzones: settings.axis_deadzones.clone(),
+            button_deadzones: settings.button_deadzones.clone(),
+            mouse_emulation_sensitivity: settings.mouse_emulation_sensitivity,
+            inverted_axes: settings.inverted_axes.clone(),
+        }
+    }
+}
+
+/// All the menu actions you can bind to an Axis
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AxisMenuAction {
+    MoveX,
+    MoveY,
+    ScrollX,
+    ScrollY,
+}
+
+/// All the game actions you can bind to an Axis
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AxisGameAction {
+    MovementX,
+    MovementY,
+    CameraX,
+    CameraY,
+}
+
+/// All the menu actions you can bind to an analog button
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButtonMenuAction {}
+
+/// All the game actions you can bind to an analog button
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButtonGameAction {}
+
+/// Button::Simple(GilButton::Unknown) is invalid and equal to mapping an action
+/// to nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum Button {
+    Simple(GilButton),
+    EventCode(u32),
+}
+
+/// AnalogButton::Simple(GilButton::Unknown) is invalid and equal to mapping an
+/// action to nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButton {
+    Simple(GilButton),
+    EventCode(u32),
+}
+
+/// Axis::Simple(GilAxis::Unknown) is invalid and equal to mapping an action to
+/// nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum Axis {
+    Simple(GilAxis),
+    EventCode(u32),
+}
+
+impl From<(GilAxis, GilCode)> for Axis {
+    fn from((axis, code): (GilAxis, GilCode)) -> Self {
+        match axis {
+            GilAxis::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(axis),
+        }
+    }
+}
+
+impl From<(GilButton, GilCode)> for Button {
+    fn from((button, code): (GilButton, GilCode)) -> Self {
+        match button {
+            GilButton::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(button),
+        }
+    }
+}
+
+impl From<(GilButton, GilCode)> for AnalogButton {
+    fn from((button, code): (GilButton, GilCode)) -> Self {
+        match button {
+            GilButton::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(button),
+        }
+    }
+}
diff --git a/voxygen/src/key_state.rs b/voxygen/src/key_state.rs
index 2921c4ce6c..e07474e0db 100644
--- a/voxygen/src/key_state.rs
+++ b/voxygen/src/key_state.rs
@@ -5,6 +5,7 @@ pub struct KeyState {
     pub left: bool,
     pub up: bool,
     pub down: bool,
+    pub analog_matrix: Vec2<f32>,
 }
 
 impl KeyState {
@@ -14,16 +15,21 @@ impl KeyState {
             left: false,
             up: false,
             down: false,
+            analog_matrix: Vec2::zero(),
         }
     }
 
     pub fn dir_vec(&self) -> Vec2<f32> {
-        let dir = Vec2::<f32>::new(
-            if self.right { 1.0 } else { 0.0 } + if self.left { -1.0 } else { 0.0 },
-            if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
-        );
+        let dir = if self.analog_matrix == Vec2::zero() {
+            Vec2::<f32>::new(
+                if self.right { 1.0 } else { 0.0 } + if self.left { -1.0 } else { 0.0 },
+                if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
+            )
+        } else {
+            self.analog_matrix
+        };
 
-        if dir.magnitude_squared() == 0.0 {
+        if dir.magnitude_squared() <= 1.0 {
             dir
         } else {
             dir.normalized()
diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
index 56877b2131..e1866d1188 100644
--- a/voxygen/src/lib.rs
+++ b/voxygen/src/lib.rs
@@ -6,6 +6,7 @@
 pub mod ui;
 pub mod anim;
 pub mod audio;
+pub mod controller;
 mod ecs;
 pub mod error;
 pub mod hud;
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 84c6aa2f3e..02996bca7e 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -15,7 +15,7 @@ use crate::{
         create_pp_mesh, create_skybox_mesh, Consts, Globals, Light, Model, PostProcessLocals,
         PostProcessPipeline, Renderer, Shadow, SkyboxLocals, SkyboxPipeline,
     },
-    window::Event,
+    window::{AnalogGameInput, Event},
 };
 use common::{
     comp,
@@ -50,6 +50,7 @@ pub struct Scene {
     lights: Consts<Light>,
     shadows: Consts<Shadow>,
     camera: Camera,
+    camera_input_state: Vec2<f32>,
 
     skybox: Skybox,
     postprocess: PostProcess,
@@ -85,6 +86,7 @@ impl Scene {
                 .create_consts(&[Shadow::default(); MAX_SHADOW_COUNT])
                 .unwrap(),
             camera: Camera::new(resolution.x / resolution.y, CameraMode::ThirdPerson),
+            camera_input_state: Vec2::zero(),
 
             skybox: Skybox {
                 model: renderer.create_model(&create_skybox_mesh()).unwrap(),
@@ -146,6 +148,17 @@ impl Scene {
                     .zoom_switch(delta * (0.05 + self.camera.get_distance() * 0.01));
                 true
             },
+            Event::AnalogGameInput(input) => match input {
+                AnalogGameInput::CameraX(d) => {
+                    self.camera_input_state.x = d;
+                    true
+                },
+                AnalogGameInput::CameraY(d) => {
+                    self.camera_input_state.y = d;
+                    true
+                },
+                _ => false,
+            },
             // All other events are unhandled
             _ => false,
         }
@@ -185,6 +198,12 @@ impl Scene {
             _ => 1_f32,
         };
 
+        // Add the analog input to camera
+        self.camera
+            .rotate_by(Vec3::from([self.camera_input_state.x, 0.0, 0.0]));
+        self.camera
+            .rotate_by(Vec3::from([0.0, self.camera_input_state.y, 0.0]));
+
         // Alter camera position to match player.
         let tilt = self.camera.get_orientation().y;
         let dist = self.camera.get_distance();
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index cf47210669..d4538d081e 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -5,7 +5,7 @@ use crate::{
     key_state::KeyState,
     render::Renderer,
     scene::{camera, Scene, SceneData},
-    window::{Event, GameInput},
+    window::{AnalogGameInput, Event, GameInput},
     Direction, Error, GlobalState, PlayState, PlayStateResult,
 };
 use client::{self, Client, Event::Chat};
@@ -365,6 +365,17 @@ impl PlayState for SessionState {
                     Event::InputUpdate(GameInput::Charge, state) => {
                         self.inputs.charge.set_state(state);
                     },
+                    Event::AnalogGameInput(input) => match input {
+                        AnalogGameInput::MovementX(v) => {
+                            self.key_state.analog_matrix.x = v;
+                        },
+                        AnalogGameInput::MovementY(v) => {
+                            self.key_state.analog_matrix.y = v;
+                        },
+                        other => {
+                            self.scene.handle_input_event(Event::AnalogGameInput(other));
+                        },
+                    },
 
                     // Pass all other events to the scene
                     event => {
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index 854464422f..78431b2dd1 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use directories::{ProjectDirs, UserDirs};
 use glutin::{MouseButton, VirtualKeyCode};
-use hashbrown::HashSet;
+use hashbrown::{HashMap, HashSet};
 use log::warn;
 use serde_derive::{Deserialize, Serialize};
 use std::{fs, io::prelude::*, path::PathBuf};
@@ -105,6 +105,225 @@ impl Default for ControlSettings {
     }
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(default)]
+pub struct GamepadSettings {
+    pub game_buttons: con_settings::GameButtons,
+    pub menu_buttons: con_settings::MenuButtons,
+    pub game_axis: con_settings::GameAxis,
+    pub menu_axis: con_settings::MenuAxis,
+    pub game_analog_buttons: con_settings::GameAnalogButton,
+    pub menu_analog_buttons: con_settings::MenuAnalogButton,
+    pub pan_sensitivity: u32,
+    pub pan_invert_y: bool,
+    pub axis_deadzones: HashMap<crate::controller::Axis, f32>,
+    pub button_deadzones: HashMap<crate::controller::AnalogButton, f32>,
+    pub mouse_emulation_sensitivity: u32,
+    pub inverted_axes: Vec<crate::controller::Axis>,
+}
+
+impl Default for GamepadSettings {
+    fn default() -> Self {
+        Self {
+            game_buttons: con_settings::GameButtons::default(),
+            menu_buttons: con_settings::MenuButtons::default(),
+            game_axis: con_settings::GameAxis::default(),
+            menu_axis: con_settings::MenuAxis::default(),
+            game_analog_buttons: con_settings::GameAnalogButton::default(),
+            menu_analog_buttons: con_settings::MenuAnalogButton::default(),
+            pan_sensitivity: 10,
+            pan_invert_y: false,
+            axis_deadzones: HashMap::new(),
+            button_deadzones: HashMap::new(),
+            mouse_emulation_sensitivity: 12,
+            inverted_axes: Vec::new(),
+        }
+    }
+}
+
+pub mod con_settings {
+    use crate::controller::*;
+    use gilrs::{Axis as GilAxis, Button as GilButton};
+    use serde_derive::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameButtons {
+        pub primary: Button,
+        pub secondary: Button,
+        pub toggle_cursor: Button,
+        pub escape: Button,
+        pub enter: Button,
+        pub command: Button,
+        pub move_forward: Button,
+        pub move_left: Button,
+        pub move_back: Button,
+        pub move_right: Button,
+        pub jump: Button,
+        pub sit: Button,
+        pub glide: Button,
+        pub climb: Button,
+        pub climb_down: Button,
+        pub wall_leap: Button,
+        pub mount: Button,
+        pub map: Button,
+        pub bag: Button,
+        pub quest_log: Button,
+        pub character_window: Button,
+        pub social: Button,
+        pub spellbook: Button,
+        pub settings: Button,
+        pub help: Button,
+        pub toggle_interface: Button,
+        pub toggle_debug: Button,
+        pub fullscreen: Button,
+        pub screenshot: Button,
+        pub toggle_ingame_ui: Button,
+        pub roll: Button,
+        pub respawn: Button,
+        pub interact: Button,
+        pub toggle_wield: Button,
+        pub charge: Button,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuButtons {
+        pub up: Button,
+        pub down: Button,
+        pub left: Button,
+        pub right: Button,
+        pub scroll_up: Button,
+        pub scroll_down: Button,
+        pub scroll_left: Button,
+        pub scroll_right: Button,
+        pub home: Button,
+        pub end: Button,
+        pub apply: Button,
+        pub back: Button,
+        pub exit: Button,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameAxis {
+        pub movement_x: Axis,
+        pub movement_y: Axis,
+        pub camera_x: Axis,
+        pub camera_y: Axis,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuAxis {
+        pub move_x: Axis,
+        pub move_y: Axis,
+        pub scroll_x: Axis,
+        pub scroll_y: Axis,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameAnalogButton {}
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuAnalogButton {}
+
+    impl Default for GameButtons {
+        fn default() -> Self {
+            // binding to unknown = getting skipped from processing
+            Self {
+                primary: Button::Simple(GilButton::RightTrigger2),
+                secondary: Button::Simple(GilButton::LeftTrigger2),
+                toggle_cursor: Button::Simple(GilButton::Select),
+                escape: Button::Simple(GilButton::Mode),
+                enter: Button::Simple(GilButton::Unknown),
+                command: Button::Simple(GilButton::Unknown),
+                move_forward: Button::Simple(GilButton::Unknown),
+                move_left: Button::Simple(GilButton::Unknown),
+                move_back: Button::Simple(GilButton::Unknown),
+                move_right: Button::Simple(GilButton::Unknown),
+                jump: Button::Simple(GilButton::South),
+                sit: Button::Simple(GilButton::West),
+                glide: Button::Simple(GilButton::LeftTrigger),
+                climb: Button::Simple(GilButton::South),
+                climb_down: Button::Simple(GilButton::Unknown),
+                wall_leap: Button::Simple(GilButton::Unknown),
+                mount: Button::Simple(GilButton::North),
+                map: Button::Simple(GilButton::DPadRight),
+                bag: Button::Simple(GilButton::DPadDown),
+                quest_log: Button::Simple(GilButton::Unknown),
+                character_window: Button::Simple(GilButton::Unknown),
+                social: Button::Simple(GilButton::Unknown),
+                spellbook: Button::Simple(GilButton::Unknown),
+                settings: Button::Simple(GilButton::Unknown),
+                help: Button::Simple(GilButton::Unknown),
+                toggle_interface: Button::Simple(GilButton::Unknown),
+                toggle_debug: Button::Simple(GilButton::Unknown),
+                fullscreen: Button::Simple(GilButton::Unknown),
+                screenshot: Button::Simple(GilButton::DPadUp),
+                toggle_ingame_ui: Button::Simple(GilButton::Unknown),
+                roll: Button::Simple(GilButton::RightTrigger),
+                respawn: Button::Simple(GilButton::RightTrigger2),
+                interact: Button::Simple(GilButton::LeftTrigger2),
+                toggle_wield: Button::Simple(GilButton::DPadLeft),
+                charge: Button::Simple(GilButton::Unknown),
+            }
+        }
+    }
+
+    impl Default for MenuButtons {
+        fn default() -> Self {
+            Self {
+                up: Button::Simple(GilButton::Unknown),
+                down: Button::Simple(GilButton::Unknown),
+                left: Button::Simple(GilButton::Unknown),
+                right: Button::Simple(GilButton::Unknown),
+                scroll_up: Button::Simple(GilButton::Unknown),
+                scroll_down: Button::Simple(GilButton::Unknown),
+                scroll_left: Button::Simple(GilButton::Unknown),
+                scroll_right: Button::Simple(GilButton::Unknown),
+                home: Button::Simple(GilButton::DPadUp),
+                end: Button::Simple(GilButton::DPadDown),
+                apply: Button::Simple(GilButton::South),
+                back: Button::Simple(GilButton::East),
+                exit: Button::Simple(GilButton::Mode),
+            }
+        }
+    }
+
+    impl Default for GameAxis {
+        fn default() -> Self {
+            Self {
+                movement_x: Axis::Simple(GilAxis::LeftStickX),
+                movement_y: Axis::Simple(GilAxis::LeftStickY),
+                camera_x: Axis::Simple(GilAxis::RightStickX),
+                camera_y: Axis::Simple(GilAxis::RightStickY),
+            }
+        }
+    }
+
+    impl Default for MenuAxis {
+        fn default() -> Self {
+            Self {
+                move_x: Axis::Simple(GilAxis::RightStickX),
+                move_y: Axis::Simple(GilAxis::RightStickY),
+                scroll_x: Axis::Simple(GilAxis::LeftStickX),
+                scroll_y: Axis::Simple(GilAxis::LeftStickY),
+            }
+        }
+    }
+
+    impl Default for GameAnalogButton {
+        fn default() -> Self { Self {} }
+    }
+
+    impl Default for MenuAnalogButton {
+        fn default() -> Self { Self {} }
+    }
+}
+
 /// `GameplaySettings` contains sensitivity and gameplay options.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
@@ -298,6 +517,7 @@ pub struct Settings {
     pub logon_commands: Vec<String>,
     pub language: LanguageSettings,
     pub screenshots_path: PathBuf,
+    pub controller: GamepadSettings,
 }
 
 impl Default for Settings {
@@ -329,6 +549,7 @@ impl Default for Settings {
             logon_commands: Vec::new(),
             language: LanguageSettings::default(),
             screenshots_path,
+            controller: GamepadSettings::default(),
         }
     }
 }
diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs
index 1016c2a134..a1e18915f6 100644
--- a/voxygen/src/ui/mod.rs
+++ b/voxygen/src/ui/mod.rs
@@ -634,8 +634,8 @@ impl Ui {
                     mesh.push_quad(create_ui_quad(
                         gl_aabr(rect),
                         Aabr {
-                            min: Vec2::new(0.0, 0.0),
-                            max: Vec2::new(0.0, 0.0),
+                            min: Vec2::zero(),
+                            max: Vec2::zero(),
                         },
                         color,
                         UiMode::Geometry,
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 59c9b6c4ed..f052ec73a2 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1,15 +1,17 @@
 use crate::{
+    controller::*,
     render::{Renderer, WinColorFmt, WinDepthFmt},
     settings::Settings,
     ui, Error,
 };
+use gilrs::{EventType, Gilrs};
 use hashbrown::HashMap;
 use log::{error, warn};
 use serde_derive::{Deserialize, Serialize};
 use std::fmt;
 use vek::*;
 
-/// Represents a key that the game recognises after keyboard mapping.
+/// Represents a key that the game recognises after input mapping.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub enum GameInput {
     Primary,
@@ -49,6 +51,40 @@ pub enum GameInput {
     Charge,
 }
 
+/// Represents a key that the game menus recognise after input mapping
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum MenuInput {
+    Up,
+    Down,
+    Left,
+    Right,
+    ScrollUp,
+    ScrollDown,
+    ScrollLeft,
+    ScrollRight,
+    Home,
+    End,
+    Apply,
+    Back,
+    Exit,
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub enum AnalogMenuInput {
+    MoveX(f32),
+    MoveY(f32),
+    ScrollX(f32),
+    ScrollY(f32),
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub enum AnalogGameInput {
+    MovementX(f32),
+    MovementY(f32),
+    CameraX(f32),
+    CameraY(f32),
+}
+
 /// Represents an incoming event from the window.
 #[derive(Clone)]
 pub enum Event {
@@ -76,6 +112,13 @@ pub enum Event {
     SettingsChanged,
     /// The window is (un)focused
     Focused(bool),
+    /// A key that the game recognises for menu navigation has been pressed or
+    /// released
+    MenuInput(MenuInput, bool),
+    /// Update of the analog inputs recognized by the menus
+    AnalogMenuInput(AnalogMenuInput),
+    /// Update of the analog inputs recognized by the game
+    AnalogGameInput(AnalogGameInput),
 }
 
 pub type MouseButton = winit::MouseButton;
@@ -277,6 +320,10 @@ pub struct Window {
     keypress_map: HashMap<GameInput, glutin::ElementState>,
     supplement_events: Vec<Event>,
     focused: bool,
+    gilrs: Option<Gilrs>,
+    controller_settings: ControllerSettings,
+    cursor_position: winit::dpi::LogicalPosition,
+    mouse_emulation_vec: Vec2<f32>,
 }
 
 impl Window {
@@ -414,6 +461,30 @@ impl Window {
 
         let keypress_map = HashMap::new();
 
+        let gilrs = match Gilrs::new() {
+            Ok(gilrs) => Some(gilrs),
+            Err(gilrs::Error::NotImplemented(_dummy)) => {
+                warn!("Controller input is unsupported on this platform.");
+                None
+            },
+            Err(gilrs::Error::InvalidAxisToBtn) => {
+                error!(
+                    "Invalid AxisToBtn controller mapping. Falling back to no controller support."
+                );
+                None
+            },
+            Err(gilrs::Error::Other(err)) => {
+                error!(
+                    "Platform-specific error when creating a Gilrs instance: `{}`. Falling back \
+                     to no controller support.",
+                    err
+                );
+                None
+            },
+        };
+
+        let controller_settings = ControllerSettings::from(&settings.controller);
+
         let mut this = Self {
             events_loop,
             renderer: Renderer::new(
@@ -437,6 +508,10 @@ impl Window {
             keypress_map,
             supplement_events: vec![],
             focused: true,
+            gilrs,
+            controller_settings,
+            cursor_position: winit::dpi::LogicalPosition::new(0.0, 0.0),
+            mouse_emulation_vec: Vec2::zero(),
         };
 
         this.fullscreen(settings.graphics.fullscreen);
@@ -477,6 +552,7 @@ impl Window {
         };
         let mut toggle_fullscreen = false;
         let mut take_screenshot = false;
+        let mut cursor_position = None;
 
         self.events_loop.poll_events(|event| {
             // Get events for ui.
@@ -556,6 +632,9 @@ impl Window {
                         *focused = state;
                         events.push(Event::Focused(state));
                     },
+                    glutin::WindowEvent::CursorMoved { position, .. } => {
+                        cursor_position = Some(position);
+                    },
                     _ => {},
                 },
                 glutin::Event::DeviceEvent { event, .. } => match event {
@@ -593,6 +672,10 @@ impl Window {
             }
         });
 
+        if let Some(pos) = cursor_position {
+            self.cursor_position = pos;
+        }
+
         if take_screenshot {
             self.take_screenshot(&settings);
         }
@@ -601,9 +684,217 @@ impl Window {
             self.toggle_fullscreen(settings);
         }
 
+        if let Some(gilrs) = &mut self.gilrs {
+            while let Some(event) = gilrs.next_event() {
+                fn handle_buttons(
+                    settings: &ControllerSettings,
+                    events: &mut Vec<Event>,
+                    button: &Button,
+                    is_pressed: bool,
+                ) {
+                    if let Some(evs) = settings.game_button_map.get(button) {
+                        for ev in evs {
+                            events.push(Event::InputUpdate(*ev, is_pressed));
+                        }
+                    }
+                    if let Some(evs) = settings.menu_button_map.get(button) {
+                        for ev in evs {
+                            events.push(Event::MenuInput(*ev, is_pressed));
+                        }
+                    }
+                }
+
+                match event.event {
+                    EventType::ButtonPressed(button, code)
+                    | EventType::ButtonRepeated(button, code) => {
+                        handle_buttons(
+                            &self.controller_settings,
+                            &mut events,
+                            &Button::from((button, code)),
+                            true,
+                        );
+                    },
+                    EventType::ButtonReleased(button, code) => {
+                        handle_buttons(
+                            &self.controller_settings,
+                            &mut events,
+                            &Button::from((button, code)),
+                            false,
+                        );
+                    },
+                    EventType::ButtonChanged(button, _value, code) => {
+                        if let Some(actions) = self
+                            .controller_settings
+                            .game_analog_button_map
+                            .get(&AnalogButton::from((button, code)))
+                        {
+                            for action in actions {
+                                match *action {}
+                            }
+                        }
+                        if let Some(actions) = self
+                            .controller_settings
+                            .menu_analog_button_map
+                            .get(&AnalogButton::from((button, code)))
+                        {
+                            for action in actions {
+                                match *action {}
+                            }
+                        }
+                    },
+
+                    EventType::AxisChanged(axis, value, code) => {
+                        let value = match self
+                            .controller_settings
+                            .inverted_axes
+                            .contains(&Axis::from((axis, code)))
+                        {
+                            true => value * -1.0,
+                            false => value,
+                        };
+
+                        let value = self
+                            .controller_settings
+                            .apply_axis_deadzone(&Axis::from((axis, code)), value);
+
+                        if self.cursor_grabbed {
+                            if let Some(actions) = self
+                                .controller_settings
+                                .game_axis_map
+                                .get(&Axis::from((axis, code)))
+                            {
+                                for action in actions {
+                                    match *action {
+                                        AxisGameAction::MovementX => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::MovementX(value),
+                                            ));
+                                        },
+                                        AxisGameAction::MovementY => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::MovementY(value),
+                                            ));
+                                        },
+                                        AxisGameAction::CameraX => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::CameraX(
+                                                    value
+                                                        * self.controller_settings.pan_sensitivity
+                                                            as f32
+                                                        / 100.0,
+                                                ),
+                                            ));
+                                        },
+                                        AxisGameAction::CameraY => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::CameraY(
+                                                    value
+                                                        * self.controller_settings.pan_sensitivity
+                                                            as f32
+                                                        / 100.0,
+                                                ),
+                                            ));
+                                        },
+                                    }
+                                }
+                            }
+                        } else if let Some(actions) = self
+                            .controller_settings
+                            .menu_axis_map
+                            .get(&Axis::from((axis, code)))
+                        {
+                            // TODO: possibly add sensitivity settings when this is used
+                            for action in actions {
+                                match *action {
+                                    AxisMenuAction::MoveX => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::MoveX(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::MoveY => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::MoveY(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::ScrollX => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::ScrollX(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::ScrollY => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::ScrollY(value),
+                                        ));
+                                    },
+                                }
+                            }
+                        }
+                    },
+                    EventType::Connected => {},
+                    EventType::Disconnected => {},
+                    EventType::Dropped => {},
+                }
+            }
+        }
+
+        // Mouse emulation for the menus, to be removed when a proper menu navigation
+        // system is available
+        if !self.cursor_grabbed {
+            events = events
+                .into_iter()
+                .filter_map(|event| match event {
+                    Event::AnalogMenuInput(input) => match input {
+                        AnalogMenuInput::MoveX(d) => {
+                            self.mouse_emulation_vec.x = d;
+                            None
+                        },
+                        AnalogMenuInput::MoveY(d) => {
+                            // This just has to be inverted for some reason
+                            self.mouse_emulation_vec.y = d * -1.0;
+                            None
+                        },
+                        _ => {
+                            let event = Event::AnalogMenuInput(input);
+                            Some(event)
+                        },
+                    },
+                    Event::MenuInput(input, state) => match input {
+                        MenuInput::Apply => Some(match state {
+                            true => Event::Ui(ui::Event(conrod_core::event::Input::Press(
+                                conrod_core::input::Button::Mouse(
+                                    conrod_core::input::state::mouse::Button::Left,
+                                ),
+                            ))),
+                            false => Event::Ui(ui::Event(conrod_core::event::Input::Release(
+                                conrod_core::input::Button::Mouse(
+                                    conrod_core::input::state::mouse::Button::Left,
+                                ),
+                            ))),
+                        }),
+                        _ => Some(event),
+                    },
+                    _ => Some(event),
+                })
+                .collect();
+            let sensitivity = self.controller_settings.mouse_emulation_sensitivity;
+            if self.mouse_emulation_vec != Vec2::zero() {
+                self.offset_cursor(self.mouse_emulation_vec * sensitivity as f32)
+                    .unwrap_or(());
+            }
+        }
         events
     }
 
+    /// Moves cursor by an offset
+    pub fn offset_cursor(&self, d: Vec2<f32>) -> Result<(), String> {
+        self.window
+            .window()
+            .set_cursor_position(winit::dpi::LogicalPosition::new(
+                d.x as f64 + self.cursor_position.x,
+                d.y as f64 + self.cursor_position.y,
+            ))
+    }
+
     pub fn swap_buffers(&self) -> Result<(), Error> {
         self.window
             .swap_buffers()

From 6625a356eff9ac82e6d5faab42e66a8fcb2950d2 Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Tue, 10 Mar 2020 21:04:13 +0000
Subject: [PATCH 36/41] Rebased on master and moved logout message to events

---
 server/src/events/player.rs |  9 ++++++++-
 server/src/sys/message.rs   | 21 ++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/server/src/events/player.rs b/server/src/events/player.rs
index 3237ee57dd..10d1ee78bf 100644
--- a/server/src/events/player.rs
+++ b/server/src/events/player.rs
@@ -7,7 +7,7 @@ use common::{
     sync::{Uid, UidAllocator},
 };
 use log::error;
-use specs::{saveload::MarkerAllocator, Builder, Entity as EcsEntity, WorldExt};
+use specs::{saveload::MarkerAllocator, Builder, Entity as EcsEntity, Join, WorldExt};
 
 pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
     let state = server.state_mut();
@@ -53,12 +53,19 @@ pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event
     }
 
     // Make sure to remove the player from the logged in list. (See AuthProvider)
+    // And send a disconnected message
     {
         let players = state.ecs().read_storage::<Player>();
         let mut accounts = state.ecs().write_resource::<AuthProvider>();
+        let mut clients = state.ecs().write_storage::<Client>();
 
         if let Some(player) = players.get(entity) {
             accounts.logout(player.uuid());
+
+            let msg = ServerMsg::broadcast(format!("{} went offline.", &player.alias));
+            for client in (&mut clients).join().filter(|c| c.is_registered()) {
+                client.notify(msg.clone());
+            }
         }
     }
     // Delete client entity
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 0274184af6..156e13b860 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -1,7 +1,7 @@
 use super::SysTimer;
 use crate::{auth_provider::AuthProvider, client::Client, CLIENT_TIMEOUT};
 use common::{
-    comp::{Admin, Body, CanBuild, Controller, ForceUpdate, Ori, Player, Pos, Stats, Vel},
+    comp::{Admin, CanBuild, Controller, ForceUpdate, Ori, Player, Pos, Stats, Vel},
     event::{EventBus, ServerEvent},
     msg::{
         validate_chat_msg, ChatMsgValidationError, ClientMsg, ClientState, PlayerListUpdate,
@@ -27,7 +27,6 @@ impl<'a> System<'a> for Sys {
         ReadExpect<'a, TerrainGrid>,
         Write<'a, SysTimer<Self>>,
         ReadStorage<'a, Uid>,
-        ReadStorage<'a, Body>,
         ReadStorage<'a, CanBuild>,
         ReadStorage<'a, Admin>,
         ReadStorage<'a, ForceUpdate>,
@@ -51,7 +50,6 @@ impl<'a> System<'a> for Sys {
             terrain,
             mut timer,
             uids,
-            bodies,
             can_build,
             admins,
             force_updates,
@@ -81,7 +79,6 @@ impl<'a> System<'a> for Sys {
         let mut new_players = Vec::new();
 
         for (entity, client) in (&entities, &mut clients).join() {
-            let mut disconnect = false;
             let new_msgs = client.postbox.new_messages();
 
             // Update client ping.
@@ -285,27 +282,13 @@ impl<'a> System<'a> for Sys {
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),
                     ClientMsg::Pong => {},
                     ClientMsg::Disconnect => {
-                        disconnect = true;
+                        client.postbox.send_message(ServerMsg::Disconnect);
                     },
                     ClientMsg::Terminate => {
                         server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                     },
                 }
             }
-
-            if disconnect {
-                if let (Some(player), Some(_)) = (
-                    players.get(entity),
-                    // It only shows a message if you had a body (not in char selection)
-                    bodies.get(entity),
-                ) {
-                    new_chat_msgs.push((
-                        None,
-                        ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
-                    ));
-                }
-                client.postbox.send_message(ServerMsg::Disconnect);
-            }
         }
 
         // Handle new players.

From 1437d51c678996ef7c6b0f77224b6639ba14d800 Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Tue, 10 Mar 2020 21:09:38 +0000
Subject: [PATCH 37/41] removed merge artifact

---
 server/src/sys/message.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 5931b3addf..156e13b860 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -287,9 +287,6 @@ impl<'a> System<'a> for Sys {
                     ClientMsg::Terminate => {
                         server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                     },
-                    ClientMsg::Terminate => {
-                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
-                    },
                 }
             }
         }

From 665795d1c95c9eda3aa707fe1862c057ca003eae Mon Sep 17 00:00:00 2001
From: Mckol <mckol363@gmail.com>
Date: Tue, 10 Mar 2020 23:31:26 +0100
Subject: [PATCH 38/41] Made the CI fail if Cargo.lock isn't up-to-date

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a93f8de07..788cecef48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ check:
     tags:
         - veloren-docker
     script:
-        - RUSTFLAGS="-D warnings" cargo check
+        - RUSTFLAGS="-D warnings" cargo check --locked
 
 code-quality:
     stage: check-compile

From f595dad1f8685927364429a1e25f07f35b04d69f Mon Sep 17 00:00:00 2001
From: Shane Handley <shanehandley@fastmail.com>
Date: Wed, 11 Mar 2020 15:39:46 +0900
Subject: [PATCH 39/41] Check for the mousedown state before trying to collect
 an item via secondary mouse click.

---
 voxygen/src/session.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 1d02998ccd..52421d3975 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -278,7 +278,7 @@ impl PlayState for SessionState {
                             .unwrap_or(false)
                         {
                             self.inputs.secondary.set_state(state);
-                        } else {
+                        } else if state {
                             if let Some(select_pos) = select_pos {
                                 client.collect_block(select_pos);
                             }

From 2864e7603a61657f0489cf84eabf5a128d3c80bb Mon Sep 17 00:00:00 2001
From: S Handley <shanehandley@fastmail.com>
Date: Wed, 11 Mar 2020 10:30:59 +0000
Subject: [PATCH 40/41] Add audio and chat message feedback when the player
 attempts to collect something while thier inventory is full.

---
 CHANGELOG.md                                  |   1 +
 assets/voxygen/audio/sfx.ron                  |   6 ++++
 .../audio/sfx/inventory/add_failed.wav        | Bin 0 -> 51216 bytes
 .../voxygen/audio/sfx/inventory/add_item.wav  | Bin 71196 -> 40140 bytes
 client/src/lib.rs                             |  18 +++++++++--
 common/src/comp/inventory/mod.rs              |   1 +
 server/src/events/inventory_manip.rs          |  29 +++++++++++-------
 7 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 assets/voxygen/audio/sfx/inventory/add_failed.wav

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74023e63c9..f0f8bc8c16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Game pauses when in singleplayer and pause menu
 - Added authentication system (to play on the official server register on https://account.veloren.net)
 - Added gamepad/controller support
+- Added player feedback when attempting to pickup an item with a full inventory
 
 ### Changed
 
diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron
index 2a8d79e5e2..9add266bf9 100644
--- a/assets/voxygen/audio/sfx.ron
+++ b/assets/voxygen/audio/sfx.ron
@@ -88,6 +88,12 @@
                 "voxygen.audio.sfx.inventory.consumable.food",
             ],
             threshold: 0.3,
+        ),
+        Inventory(CollectFailed): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_failed",
+            ],
+            threshold: 0.3,
         )
     }
 )
\ No newline at end of file
diff --git a/assets/voxygen/audio/sfx/inventory/add_failed.wav b/assets/voxygen/audio/sfx/inventory/add_failed.wav
new file mode 100644
index 0000000000000000000000000000000000000000..6bd5951281be668558eeb0336ebda1d69494dae8
GIT binary patch
literal 51216
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
F{|~&0&J+Lu

literal 0
HcmV?d00001

diff --git a/assets/voxygen/audio/sfx/inventory/add_item.wav b/assets/voxygen/audio/sfx/inventory/add_item.wav
index 3c6f68dd078ede9659b072c1dfd27eabd49837cd..df250bc0ede8a97ba7cf0873da4864405a58580a 100644
GIT binary patch
literal 40140
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
CkI-=d

literal 71196
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

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 8895ce60d4..6d7b6f7405 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -14,7 +14,9 @@ pub use specs::{
 
 use byteorder::{ByteOrder, LittleEndian};
 use common::{
-    comp::{self, ControlEvent, Controller, ControllerInputs, InventoryManip},
+    comp::{
+        self, ControlEvent, Controller, ControllerInputs, InventoryManip, InventoryUpdateEvent,
+    },
     event::{EventBus, SfxEvent, SfxEventItem},
     msg::{
         validate_chat_msg, ChatMsgValidationError, ClientMsg, ClientState, PlayerListUpdate,
@@ -689,7 +691,19 @@ impl Client {
                         }
                     },
                     ServerMsg::InventoryUpdate(inventory, event) => {
-                        self.state.write_component(self.entity, inventory);
+                        match event {
+                            InventoryUpdateEvent::CollectFailed => {
+                                frontend_events.push(Event::Chat {
+                                    message: String::from(
+                                        "Failed to collect item. Your inventory may be full!",
+                                    ),
+                                    chat_type: ChatType::Meta,
+                                })
+                            },
+                            _ => {
+                                self.state.write_component(self.entity, inventory);
+                            },
+                        }
 
                         self.state
                             .ecs()
diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs
index 1b79359eb8..6861e59d01 100644
--- a/common/src/comp/inventory/mod.rs
+++ b/common/src/comp/inventory/mod.rs
@@ -150,6 +150,7 @@ pub enum InventoryUpdateEvent {
     Swapped,
     Dropped,
     Collected,
+    CollectFailed,
     Possession,
     Debug,
 }
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index 62aed2d676..1973410290 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -61,17 +61,24 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
             let block = state.terrain().get(pos).ok().copied();
 
             if let Some(block) = block {
-                if block.is_collectible()
-                    && state
-                        .ecs()
-                        .read_storage::<comp::Inventory>()
-                        .get(entity)
-                        .map(|inv| !inv.is_full())
-                        .unwrap_or(false)
-                    && state.try_set_block(pos, Block::empty()).is_some()
-                {
-                    comp::Item::try_reclaim_from_block(block)
-                        .map(|item| state.give_item(entity, item));
+                let has_inv_space = state
+                    .ecs()
+                    .read_storage::<comp::Inventory>()
+                    .get(entity)
+                    .map(|inv| !inv.is_full())
+                    .unwrap_or(false);
+
+                if !has_inv_space {
+                    state.write_component(
+                        entity,
+                        comp::InventoryUpdate::new(comp::InventoryUpdateEvent::CollectFailed),
+                    );
+                } else {
+                    if block.is_collectible() && state.try_set_block(pos, Block::empty()).is_some()
+                    {
+                        comp::Item::try_reclaim_from_block(block)
+                            .map(|item| state.give_item(entity, item));
+                    }
                 }
             }
         },

From 5cbd62911800ce026c7747b130ad0f81f3d06321 Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Sun, 15 Mar 2020 09:02:56 +0100
Subject: [PATCH 41/41] fix: do not depend on hash file during runtime

---
 common/src/util/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/util/mod.rs b/common/src/util/mod.rs
index 83e1aee722..879c82af1e 100644
--- a/common/src/util/mod.rs
+++ b/common/src/util/mod.rs
@@ -1,8 +1,8 @@
 pub const GIT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/githash"));
 
 lazy_static::lazy_static! {
-    pub static ref GIT_HASH: &'static str = include_str!(concat!(env!("OUT_DIR"), "/githash")).split("/").nth(0).expect("failed to retrieve git_hash!");
-    pub static ref GIT_DATE: &'static str = include_str!(concat!(env!("OUT_DIR"), "/githash")).split("/").nth(1).expect("failed to retrieve git_date!");
+    pub static ref GIT_HASH: &'static str = GIT_VERSION.split("/").nth(0).expect("failed to retrieve git_hash!");
+    pub static ref GIT_DATE: &'static str = GIT_VERSION.split("/").nth(1).expect("failed to retrieve git_date!");
 }
 
 use vek::{Mat3, Rgb, Rgba, Vec3};