diff --git a/Cargo.lock b/Cargo.lock
index 43527b3c08..e0a2c094cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.11"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af0ac006645f86f20f6c6fa4dcaef920bf803df819123626f9440e35835e7d80"
+checksum = "7a933731feda8b460bdad9a9e43bb386baba6ec593d2bc19716ef3c75c09085c"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser 0.12.0",
@@ -20,11 +20,11 @@ checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff"
 
 [[package]]
 name = "addr2line"
-version = "0.15.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
- "gimli 0.24.0",
+ "gimli 0.23.0",
 ]
 
 [[package]]
@@ -47,20 +47,20 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
 [[package]]
 name = "ahash"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.2",
  "once_cell",
  "version_check 0.9.3",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -128,6 +128,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "anymap"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
+
 [[package]]
 name = "approx"
 version = "0.3.2"
@@ -146,15 +152,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "approx"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arr_macro"
 version = "0.1.3"
@@ -218,11 +215,11 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "792c2eca2af86c76ffd3e72ca564c33b5a5551d5ac3f4f87dce8c0b7c6434061"
 dependencies = [
- "ahash 0.7.4",
+ "ahash 0.7.2",
  "bincode",
  "crossbeam-channel",
  "log",
- "notify 4.0.17",
+ "notify 4.0.15",
  "parking_lot 0.11.1",
  "ron",
  "serde",
@@ -242,11 +239,11 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.50"
+version = "0.1.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
+checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -314,16 +311,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.60"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282"
+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide 0.4.4",
- "object 0.25.2",
+ "object 0.23.0",
  "rustc-demangle",
 ]
 
@@ -361,7 +357,7 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "regex",
  "rustc-hash",
@@ -391,9 +387,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bitvec"
-version = "0.22.3"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527"
+checksum = "8189f8b16586473db5323fa04837db548f1dcad33ac60618f0a44a97a4fdf74f"
 dependencies = [
  "funty",
  "radium",
@@ -420,9 +416,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "bstr"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -432,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
 [[package]]
 name = "bytemuck"
@@ -451,7 +447,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -492,18 +488,18 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cast"
-version = "0.2.6"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57cdfa5d50aad6cb4d44dcab6101a7f79925bd59d82ca42f38a9856a28865374"
+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
 dependencies = [
- "rustc_version 0.3.3",
+ "rustc_version",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
 dependencies = [
  "jobserver",
 ]
@@ -593,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.2.1"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8"
+checksum = "5123c6b97286809fea9e38d2c9bf530edbcb9fc0d8f8272c28b0c95f067fa92d"
 dependencies = [
  "error-code",
  "str-buf",
@@ -613,6 +609,15 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "clipboard_wayland"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61bcb8cde0387fde807b9b7af66ce8bd1665ef736e46e6e47fda82ea003e6ade"
+dependencies = [
+ "smithay-clipboard",
+]
+
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.0"
@@ -622,6 +627,16 @@ dependencies = [
  "smithay-clipboard",
 ]
 
+[[package]]
+name = "clipboard_x11"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40403aa5220e5cd303d32dc4248cac8aa92bf47e3ae31e0e2481081755a63ff1"
+dependencies = [
+ "thiserror",
+ "x11rb",
+]
+
 [[package]]
 name = "clipboard_x11"
 version = "0.3.1"
@@ -707,12 +722,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "comma"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96677551532ffe910f470bd767a9a7daf9ba53b1f5532e0891dba6c735f692e5"
-
 [[package]]
 name = "concurrent-queue"
 version = "1.2.2"
@@ -918,8 +927,8 @@ dependencies = [
  "lazy_static",
  "libc",
  "mach 0.3.2",
- "ndk",
- "ndk-glue",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
  "nix 0.20.0",
  "oboe",
  "parking_lot 0.11.1",
@@ -1041,28 +1050,14 @@ dependencies = [
  "itertools 0.9.0",
 ]
 
-[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel",
- "crossbeam-deque 0.8.0",
- "crossbeam-epoch 0.9.5",
- "crossbeam-queue",
- "crossbeam-utils 0.8.5",
-]
-
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -1083,8 +1078,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.5",
- "crossbeam-utils 0.8.5",
+ "crossbeam-epoch 0.9.3",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -1104,25 +1099,25 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
  "lazy_static",
- "memoffset 0.6.4",
+ "memoffset 0.6.3",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
+checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -1138,10 +1133,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
+ "autocfg",
  "cfg-if 1.0.0",
  "lazy_static",
 ]
@@ -1259,12 +1255,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c"
+checksum = "e9d6ddad5866bb2170686ed03f6839d31a76e5407d80b1c334a2c24618543ffa"
 dependencies = [
- "darling_core 0.12.4",
- "darling_macro 0.12.4",
+ "darling_core 0.12.3",
+ "darling_macro 0.12.3",
 ]
 
 [[package]]
@@ -1275,7 +1271,7 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "strsim 0.9.3",
  "syn 1.0.72",
@@ -1283,13 +1279,13 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
+checksum = "a9ced1fd13dc386d5a8315899de465708cf34ee2a6d9394654515214e67bb846"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "strsim 0.10.0",
  "syn 1.0.72",
@@ -1308,11 +1304,11 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
+checksum = "0a7a1445d54b2f9792e3b31a3e715feabbace393f38dc4ffd49d94ee9bc487d5"
 dependencies = [
- "darling_core 0.12.4",
+ "darling_core 0.12.3",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -1342,16 +1338,16 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
 
 [[package]]
 name = "deunicode"
-version = "1.3.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f37775d639f64aa16389eede0cbe6a70f56df4609d50d8b6858690d5d7bf8f2"
+checksum = "c0b7756d6eb729250618a3693b34b3311b282e12aeeee7970ae2a70997c03eb6"
 
 [[package]]
 name = "directories-next"
@@ -1474,7 +1470,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -1494,17 +1490,17 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19c52f9ec503c8a68dc04daf71a04b07e690c32ab1a8b68e33897f255269d47"
 dependencies = [
- "darling 0.12.4",
- "proc-macro2 1.0.27",
+ "darling 0.12.3",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
 
 [[package]]
 name = "error-code"
-version = "2.3.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5115567ac25674e0043e472be13d14e537f37ea8aa4bdc4aef0c89add1db1ff"
+checksum = "b49c94f66f2d2c5ee8685039e458b4e6c9f13af7c28736baf10ce42966a5ab52"
 dependencies = [
  "libc",
  "str-buf",
@@ -1521,9 +1517,9 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.6"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da96828553a086d7b18dcebfc579bd9628b016f86590d7453c115e490fa74b80"
+checksum = "536d206ede9fae5a338a1576623b04fd2459f6086e551d374ebf10e9b78bb4df"
 dependencies = [
  "num-traits",
 ]
@@ -1546,16 +1542,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
-[[package]]
-name = "fd-lock"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "fehler"
 version = "1.0.0"
@@ -1571,7 +1557,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -1584,7 +1570,7 @@ checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.2.8",
+ "redox_syscall 0.2.5",
  "winapi 0.3.9",
 ]
 
@@ -1658,6 +1644,16 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "fsevent"
 version = "0.4.0"
@@ -1668,6 +1664,16 @@ dependencies = [
  "fsevent-sys 2.0.1",
 ]
 
+[[package]]
+name = "fsevent"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97f347202c95c98805c216f9e1df210e8ebaec9fdb2365700a43c10797a35e63"
+dependencies = [
+ "bitflags",
+ "fsevent-sys 3.0.2",
+]
+
 [[package]]
 name = "fsevent-sys"
 version = "2.0.1"
@@ -1679,9 +1685,9 @@ dependencies = [
 
 [[package]]
 name = "fsevent-sys"
-version = "4.0.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c0e564d24da983c053beff1bb7178e237501206840a3e6bf4e267b9e8ae734a"
+checksum = "77a29c77f1ca394c3e73a9a5d24cfcabb734682d9634fc398f2204a63c994120"
 dependencies = [
  "libc",
 ]
@@ -1710,9 +1716,9 @@ checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e"
 
 [[package]]
 name = "futures"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1725,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1735,15 +1741,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
+checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1753,42 +1759,40 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
 dependencies = [
- "autocfg",
  "proc-macro-hack",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
 
 [[package]]
 name = "futures-task"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
 
 [[package]]
 name = "futures-util"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
 dependencies = [
- "autocfg",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -1863,9 +1867,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -2063,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.24.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "git2"
@@ -2116,7 +2120,7 @@ dependencies = [
  "glyph_brush_draw_cache",
  "glyph_brush_layout",
  "log",
- "ordered-float 2.5.1",
+ "ordered-float 2.1.1",
  "rustc-hash",
  "twox-hash",
 ]
@@ -2137,20 +2141,20 @@ dependencies = [
 
 [[package]]
 name = "glyph_brush_layout"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15cf18cf985bd942f05e14552b63c9d08f7d0ed1ec79a977eb9747c9e065f497"
+checksum = "10bc06d530bf20c1902f1b02799ab7372ff43f6119770c49b0bc3f21bd148820"
 dependencies = [
  "ab_glyph",
- "approx 0.5.0",
+ "approx 0.4.0",
  "xi-unicode",
 ]
 
 [[package]]
 name = "gpu-alloc"
-version = "0.4.7"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc1b6ca374e81862526786d9cb42357ce03706ed1b8761730caafd02ab91f3a"
+checksum = "bc76088804bb65a6f3b880bea9306fdaeffb25ebb453105fafa691282ee9fdba"
 dependencies = [
  "bitflags",
  "gpu-alloc-types",
@@ -2173,7 +2177,7 @@ checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2"
 dependencies = [
  "bitflags",
  "gpu-descriptor-types",
- "hashbrown 0.9.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2187,9 +2191,9 @@ dependencies = [
 
 [[package]]
 name = "guillotiere"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9253eedea82720b2bc91fe831c9ce3a31299955ed5eb19b9ed600a625b686212"
+checksum = "bc7cccefbf418f663e11e9500326f46a44273dc598210bbedc8bbe95e696531f"
 dependencies = [
  "euclid",
  "svg_fmt",
@@ -2197,9 +2201,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
 dependencies = [
  "bytes",
  "fnv",
@@ -2236,15 +2240,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
  "ahash 0.4.7",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.4",
  "rayon",
  "serde",
 ]
@@ -2255,7 +2250,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8"
 dependencies = [
- "hashbrown 0.9.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2272,9 +2267,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -2317,9 +2312,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737"
 dependencies = [
  "bytes",
  "http",
@@ -2328,15 +2323,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.4.1"
+version = "1.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589"
 
 [[package]]
 name = "httpdate"
-version = "1.0.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
 [[package]]
 name = "humantime"
@@ -2346,9 +2341,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.8"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34"
+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2387,13 +2382,13 @@ dependencies = [
 
 [[package]]
 name = "iced_core"
-version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.3.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 
 [[package]]
 name = "iced_futures"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.2.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 dependencies = [
  "futures",
  "log",
@@ -2402,8 +2397,8 @@ dependencies = [
 
 [[package]]
 name = "iced_graphics"
-version = "0.2.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.1.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 dependencies = [
  "bytemuck",
  "glam",
@@ -2415,8 +2410,8 @@ dependencies = [
 
 [[package]]
 name = "iced_native"
-version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.3.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2427,16 +2422,16 @@ dependencies = [
 
 [[package]]
 name = "iced_style"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.2.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 dependencies = [
  "iced_core",
 ]
 
 [[package]]
 name = "iced_winit"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
+version = "0.2.0"
+source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
 dependencies = [
  "iced_futures",
  "iced_graphics",
@@ -2444,7 +2439,7 @@ dependencies = [
  "log",
  "thiserror",
  "winapi 0.3.9",
- "window_clipboard",
+ "window_clipboard 0.1.4",
  "winit",
 ]
 
@@ -2456,9 +2451,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -2488,10 +2483,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
  "autocfg",
- "hashbrown 0.9.1",
+ "hashbrown",
  "serde",
 ]
 
+[[package]]
+name = "inline_tweak"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7033e97b20277cc0d043226d1940fa7719ff08d2305d1fc7421e53066d00eb4b"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "inotify"
 version = "0.7.1"
@@ -2505,9 +2509,9 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3"
+checksum = "d19f57db1baad9d09e43a3cd76dcf82ebdafd37d75c9498b87762dba77c93f15"
 dependencies = [
  "bitflags",
  "inotify-sys",
@@ -2603,9 +2607,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.22"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 dependencies = [
  "libc",
 ]
@@ -2618,9 +2622,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
 
 [[package]]
 name = "js-sys"
-version = "0.3.51"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2638,7 +2642,7 @@ dependencies = [
 [[package]]
 name = "keyboard-keynames"
 version = "0.1.0"
-source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc#9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc"
+source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c#a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c"
 dependencies = [
  "libc",
  "memmap",
@@ -2696,9 +2700,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.95"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
 
 [[package]]
 name = "libgit2-sys"
@@ -2777,9 +2781,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
 dependencies = [
  "cc",
  "libc",
@@ -2804,9 +2808,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
 dependencies = [
  "scopeguard",
 ]
@@ -2883,9 +2887,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memmap"
@@ -2908,9 +2912,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
+checksum = "397d1a6d6d0563c0f5462bbdae662cf6c784edf5e828e40c7257f85d82bf56dd"
 dependencies = [
  "libc",
 ]
@@ -2926,9 +2930,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
 dependencies = [
  "autocfg",
 ]
@@ -3029,18 +3033,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "mio-misc"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2"
-dependencies = [
- "crossbeam",
- "crossbeam-queue",
- "log",
- "mio 0.7.11",
-]
-
 [[package]]
 name = "miow"
 version = "0.2.2"
@@ -3110,6 +3102,18 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "ndk"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
+dependencies = [
+ "jni-sys",
+ "ndk-sys",
+ "num_enum 0.4.3",
+ "thiserror",
+]
+
 [[package]]
 name = "ndk"
 version = "0.3.0"
@@ -3118,10 +3122,24 @@ checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
 dependencies = [
  "jni-sys",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.5.1",
  "thiserror",
 ]
 
+[[package]]
+name = "ndk-glue"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.2.1",
+ "ndk-macro",
+ "ndk-sys",
+]
+
 [[package]]
 name = "ndk-glue"
 version = "0.3.0"
@@ -3131,7 +3149,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk",
+ "ndk 0.3.0",
  "ndk-macro",
  "ndk-sys",
 ]
@@ -3144,7 +3162,7 @@ checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
 dependencies = [
  "darling 0.10.2",
  "proc-macro-crate",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -3254,13 +3272,13 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "4.0.17"
+version = "4.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
+checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
 dependencies = [
  "bitflags",
  "filetime",
- "fsevent",
+ "fsevent 0.4.0",
  "fsevent-sys 2.0.1",
  "inotify 0.7.1",
  "libc",
@@ -3272,15 +3290,17 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.0.0-pre.9"
+version = "5.0.0-pre.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89869d77edd64db917d7903abeadc166f93686b342c56cc0ca51acb68441d09"
+checksum = "e5fd82b93434edb9c00ae65ee741e0e081cdc8c63346ab9f687935a629aaf4c3"
 dependencies = [
+ "anymap",
  "bitflags",
  "crossbeam-channel",
  "filetime",
- "fsevent-sys 4.0.0",
- "inotify 0.9.3",
+ "fsevent 2.0.2",
+ "fsevent-sys 3.0.2",
+ "inotify 0.9.2",
  "libc",
  "mio 0.7.11",
  "walkdir 2.3.2",
@@ -3371,7 +3391,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -3452,6 +3472,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
+dependencies = [
+ "derivative",
+ "num_enum_derive 0.4.3",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.5.1"
@@ -3459,7 +3489,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
 dependencies = [
  "derivative",
- "num_enum_derive",
+ "num_enum_derive 0.5.1",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.26",
+ "quote 1.0.9",
+ "syn 1.0.72",
 ]
 
 [[package]]
@@ -3469,7 +3511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -3525,22 +3567,19 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.25.2"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bc1d42047cf336f0f939c99e97183cf31551bf0f2865a2ec9c8d91fd4ffb5e"
-dependencies = [
- "memchr",
-]
+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 
 [[package]]
 name = "oboe"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d"
+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4"
 dependencies = [
  "jni",
- "ndk",
- "ndk-glue",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
  "num-derive",
  "num-traits",
  "oboe-sys",
@@ -3548,9 +3587,9 @@ dependencies = [
 
 [[package]]
 name = "oboe-sys"
-version = "0.4.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88e64835aa3f579c08d182526dc34e3907343d5b97e87b71a40ba5bca7aca9e"
+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103"
 dependencies = [
  "cc",
 ]
@@ -3578,9 +3617,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
 [[package]]
 name = "orbclient"
@@ -3590,7 +3629,7 @@ checksum = "0c976c5018e7f1db4359616d8b31ef8ae7d9649b11803c0b38fff67fd2999fc8"
 dependencies = [
  "libc",
  "raw-window-handle",
- "redox_syscall 0.2.8",
+ "redox_syscall 0.2.5",
  "sdl2",
  "sdl2-sys",
  "wasm-bindgen",
@@ -3608,9 +3647,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.5.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f100fcfb41e5385e0991f74981732049f9b896821542a219420491046baafdc2"
+checksum = "766f840da25490628d8e63e529cd21c014f6600c6b8517add12a6fa6167a6218"
 dependencies = [
  "num-traits",
 ]
@@ -3630,7 +3669,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a3c7a20e3f122223e68eef6ca58e39bc1ea8a1d83418ba4c2c1ba189d2ee355"
 dependencies = [
- "ttf-parser 0.12.1",
+ "ttf-parser 0.12.0",
 ]
 
 [[package]]
@@ -3660,7 +3699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.4",
+ "lock_api 0.4.3",
  "parking_lot_core 0.8.3",
 ]
 
@@ -3687,7 +3726,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.8",
+ "redox_syscall 0.2.5",
  "smallvec",
  "winapi 0.3.9",
 ]
@@ -3715,15 +3754,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
 [[package]]
 name = "petgraph"
 version = "0.4.13"
@@ -3745,20 +3775,20 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -3878,7 +3908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
  "version_check 0.9.3",
@@ -3890,7 +3920,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "version_check 0.9.3",
 ]
@@ -3918,11 +3948,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
- "unicode-xid 0.2.2",
+ "unicode-xid 0.2.1",
 ]
 
 [[package]]
@@ -3993,9 +4023,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047aa96ec7ee6acabad7a1318dff72e9aff8994316bf2166c9b94cbec78ca54c"
+checksum = "09027365a21874b71e1fbd9d31cb99bff8e11ba81cc9ef2b9425bb607e42d3b2"
 dependencies = [
  "bytes",
  "ct-logs",
@@ -4025,7 +4055,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
 ]
 
 [[package]]
@@ -4104,7 +4134,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.2",
 ]
 
 [[package]]
@@ -4160,9 +4190,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg",
  "crossbeam-deque 0.8.0",
@@ -4172,22 +4202,22 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque 0.8.0",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
  "lazy_static",
  "num_cpus",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b4fc1b81d685fcd442a86da2e2c829d9e353142633a8159f42bf28e7e94428"
+checksum = "4e80a701a04edd9cab874a3d59323bebe24c9a92dd602088c78da83732066d1b"
 dependencies = [
  "chrono",
  "pem",
@@ -4203,9 +4233,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
 dependencies = [
  "bitflags",
 ]
@@ -4216,8 +4246,8 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.3",
- "redox_syscall 0.2.8",
+ "getrandom 0.2.2",
+ "redox_syscall 0.2.5",
 ]
 
 [[package]]
@@ -4254,7 +4284,7 @@ name = "refinery-macros"
 version = "0.5.0"
 source = "git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "refinery-core",
  "regex",
@@ -4274,9 +4304,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4285,18 +4315,19 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
 dependencies = [
+ "byteorder",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
 
 [[package]]
 name = "region"
@@ -4342,9 +4373,9 @@ dependencies = [
 
 [[package]]
 name = "rodio"
-version = "0.14.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
 dependencies = [
  "cpal",
  "lewton",
@@ -4405,9 +4436,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.19"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
 
 [[package]]
 name = "rustc-hash"
@@ -4421,23 +4452,14 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
+ "semver",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.19.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
 dependencies = [
  "base64",
  "log",
@@ -4506,15 +4528,14 @@ dependencies = [
 
 [[package]]
 name = "rustyline"
-version = "8.2.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874"
+checksum = "b9e1b597fcd1eeb1d6b25b493538e5aa19629eb08932184b85fef931ba87e893"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
- "clipboard-win 4.2.1",
  "dirs-next",
- "fd-lock",
+ "fs2",
  "libc",
  "log",
  "memchr",
@@ -4576,9 +4597,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "sct"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
+checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 dependencies = [
  "ring",
  "untrusted",
@@ -4586,9 +4607,9 @@ dependencies = [
 
 [[package]]
 name = "sdl2"
-version = "0.34.5"
+version = "0.34.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deecbc3fa9460acff5a1e563e05cb5f31bba0aa0c214bb49a43db8159176d54b"
+checksum = "505d7a6ef5f96289a6ec50fc8b65ec75f5571f0aa94fa6ea230f6b228fa05d57"
 dependencies = [
  "bitflags",
  "lazy_static",
@@ -4599,9 +4620,9 @@ dependencies = [
 
 [[package]]
 name = "sdl2-sys"
-version = "0.34.5"
+version = "0.34.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a29aa21f175b5a41a6e26da572d5e5d1ee5660d35f9f9d0913e8a802098f74"
+checksum = "4cb164f53dbcad111de976bbf1f3083d3fcdeda88da9cfa281c70822720ee3da"
 dependencies = [
  "cfg-if 0.1.10",
  "cmake",
@@ -4641,16 +4662,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser",
 ]
 
 [[package]]
@@ -4659,20 +4671,11 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 dependencies = [
  "serde_derive",
 ]
@@ -4698,11 +4701,11 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -4720,11 +4723,11 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
+checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -4809,12 +4812,12 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "shred"
-version = "0.12.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb0210289d693217926314867c807e0b7b42f7e23c136adb31f8697f5bf242d3"
+checksum = "e3a9dff29ab65f4b7b4a5a38ca78e73b35eb8ffd7d4b5e5a77fc6936a1735eab"
 dependencies = [
  "arrayvec",
- "hashbrown 0.11.2",
+ "hashbrown",
  "mopa",
  "rayon",
  "shred-derive",
@@ -4828,7 +4831,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5404c36bd155e41a54276ab6aafedad2fb627e5e5849d36ec439c9ddc044a2f"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -4852,9 +4855,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39"
+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -4862,24 +4865,24 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "siphasher"
-version = "0.3.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27"
+checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
 
 [[package]]
 name = "slab"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "slotmap"
@@ -4955,11 +4958,11 @@ dependencies = [
 
 [[package]]
 name = "specs"
-version = "0.16.2"
-source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
+version = "0.16.1"
+source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496"
 dependencies = [
  "crossbeam-queue",
- "hashbrown 0.11.2",
+ "hashbrown",
  "hibitset",
  "log",
  "rayon",
@@ -4973,9 +4976,9 @@ dependencies = [
 [[package]]
 name = "specs-derive"
 version = "0.4.1"
-source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
+source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -4983,7 +4986,7 @@ dependencies = [
 [[package]]
 name = "specs-idvs"
 version = "0.1.1"
-source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=8be2abcddf8f524cb5876e8dd20a7e47cfaf7573#8be2abcddf8f524cb5876e8dd20a7e47cfaf7573"
+source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=b65fb220e94f5d3c9bc30074a076149763795556#b65fb220e94f5d3c9bc30074a076149763795556"
 dependencies = [
  "specs",
 ]
@@ -5059,7 +5062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
 dependencies = [
  "discard",
- "rustc_version 0.2.3",
+ "rustc_version",
  "serde",
  "serde_json",
  "stdweb-derive",
@@ -5074,7 +5077,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "serde",
  "serde_derive",
@@ -5088,7 +5091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "serde",
  "serde_derive",
@@ -5109,7 +5112,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "418bb14643aa55a7841d5303f72cf512cfb323b8cc221d51580500a1ca75206c"
 dependencies = [
- "lock_api 0.4.4",
+ "lock_api 0.4.3",
 ]
 
 [[package]]
@@ -5155,7 +5158,7 @@ checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -5173,7 +5176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
 dependencies = [
  "heck",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -5207,9 +5210,9 @@ version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
- "unicode-xid 0.2.2",
+ "unicode-xid 0.2.1",
 ]
 
 [[package]]
@@ -5220,9 +5223,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.35"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
+checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
 dependencies = [
  "filetime",
  "libc",
@@ -5244,7 +5247,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.3",
- "redox_syscall 0.2.8",
+ "redox_syscall 0.2.5",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -5269,20 +5272,20 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.25"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.25"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -5339,9 +5342,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.6.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975"
+checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
 dependencies = [
  "autocfg",
  "bytes",
@@ -5358,11 +5361,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -5380,9 +5383,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066"
+checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5391,9 +5394,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5420,9 +5423,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite",
@@ -5447,16 +5450,16 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.18"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
 dependencies = [
  "lazy_static",
 ]
@@ -5474,9 +5477,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
+checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -5493,9 +5496,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-tracy"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020d75c180d4d837163d5e718100bfc1b9311d4315c9d4d23492266d569da418"
+checksum = "36cc1807befda11213bd31e83798a6ab49078e00d5f1d403aac87fa51cbe3573"
 dependencies = [
  "tracing-core",
  "tracing-subscriber",
@@ -5504,18 +5507,18 @@ dependencies = [
 
 [[package]]
 name = "tracy-client"
-version = "0.12.3"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8088b69594669b5b4ea2bd90b04676fcd0480a8624a52056ea87c5eb3a66d8ae"
+checksum = "2713f161977973291f474d75535d67bb655dee54456874aff4c1724555ffe1d3"
 dependencies = [
  "tracy-client-sys",
 ]
 
 [[package]]
 name = "tracy-client-sys"
-version = "0.16.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6226e4e77f0d46ce7ebb0a4b1daa82790035248b75bbf605b932a1d7b3b22b6d"
+checksum = "47bee6f812f66f62b9d5f43c1c8f9f69afc9491e57dad0ea22544cbbc9851f29"
 dependencies = [
  "cc",
 ]
@@ -5544,9 +5547,9 @@ checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
 
 [[package]]
 name = "ttf-parser"
-version = "0.12.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc71742ead70703a55d184f82087302f2f9ffa3793e64db46a78bf75dd723f4"
+checksum = "85e00391c1f3d171490a3f8bd79999b0002ae38d3da0d6a3a306c754b053d71b"
 
 [[package]]
 name = "tui"
@@ -5592,12 +5595,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.5"
@@ -5609,9 +5606,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
 dependencies = [
  "tinyvec",
 ]
@@ -5636,9 +5633,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "unidiff"
@@ -5659,9 +5656,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5681,15 +5678,15 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.2",
  "serde",
 ]
 
 [[package]]
 name = "vcpkg"
-version = "0.2.13"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "vec_map"
@@ -5705,20 +5702,21 @@ dependencies = [
  "approx 0.4.0",
  "num-integer",
  "num-traits",
- "rustc_version 0.2.3",
+ "rustc_version",
  "serde",
  "static_assertions",
 ]
 
 [[package]]
 name = "veloren-client"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "async-channel",
  "authc",
  "byteorder",
  "clap",
- "hashbrown 0.11.2",
+ "futures-util",
+ "hashbrown",
  "image",
  "num 0.4.0",
  "quinn",
@@ -5743,24 +5741,24 @@ dependencies = [
 
 [[package]]
 name = "veloren-common"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "approx 0.4.0",
  "bitflags",
  "clap",
  "criterion",
  "crossbeam-channel",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
  "csv",
  "dot_vox",
  "enum-iterator",
- "hashbrown 0.11.2",
+ "hashbrown",
  "indexmap",
+ "inline_tweak",
  "lazy_static",
  "num-derive",
  "num-traits",
- "ordered-float 2.5.1",
- "petgraph 0.5.1",
+ "ordered-float 2.1.1",
  "rand 0.8.3",
  "rayon",
  "ron",
@@ -5785,7 +5783,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-assets"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "assets_manager",
  "dot_vox",
@@ -5799,7 +5797,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-base"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "directories-next",
  "tracing",
@@ -5808,7 +5806,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-ecs"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "float-cmp",
  "specs",
@@ -5818,7 +5816,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-frontend"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "termcolor",
  "tracing",
@@ -5831,11 +5829,11 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-net"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "bincode",
  "flate2",
- "hashbrown 0.11.2",
+ "hashbrown",
  "image",
  "num-traits",
  "serde",
@@ -5849,10 +5847,10 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-state"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "bincode",
- "hashbrown 0.11.2",
+ "hashbrown",
  "num_cpus",
  "rayon",
  "scopeguard",
@@ -5872,11 +5870,12 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-systems"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "indexmap",
- "ordered-float 2.5.1",
+ "inline_tweak",
+ "ordered-float 2.1.1",
  "rand 0.8.3",
  "rayon",
  "slab",
@@ -5891,12 +5890,12 @@ dependencies = [
 
 [[package]]
 name = "veloren-i18n"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "clap",
  "deunicode",
  "git2",
- "hashbrown 0.11.2",
+ "hashbrown",
  "ron",
  "serde",
  "tracing",
@@ -5917,7 +5916,7 @@ dependencies = [
  "crossbeam-channel",
  "futures-core",
  "futures-util",
- "hashbrown 0.11.2",
+ "hashbrown",
  "lazy_static",
  "lz-fear",
  "prometheus",
@@ -5943,7 +5942,7 @@ dependencies = [
  "bitflags",
  "bytes",
  "criterion",
- "hashbrown 0.11.2",
+ "hashbrown",
  "prometheus",
  "rand 0.8.3",
  "tokio",
@@ -5963,7 +5962,7 @@ dependencies = [
 name = "veloren-plugin-derive"
 version = "0.1.0"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -5980,14 +5979,14 @@ dependencies = [
 
 [[package]]
 name = "veloren-server"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "atomicwrites",
  "authc",
  "chrono",
  "crossbeam-channel",
  "futures-util",
- "hashbrown 0.11.2",
+ "hashbrown",
  "humantime",
  "itertools 0.10.0",
  "lazy_static",
@@ -6024,7 +6023,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-server-cli"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "ansi-parser",
  "clap",
@@ -6034,7 +6033,7 @@ dependencies = [
  "ron",
  "serde",
  "shell-words",
- "signal-hook 0.3.9",
+ "signal-hook 0.3.8",
  "structopt",
  "tokio",
  "tracing",
@@ -6048,13 +6047,12 @@ dependencies = [
 
 [[package]]
 name = "veloren-voxygen"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "backtrace",
  "bincode",
  "bytemuck",
  "chrono",
- "comma",
  "conrod_core",
  "conrod_winit",
  "copy_dir",
@@ -6062,7 +6060,7 @@ dependencies = [
  "cpal",
  "criterion",
  "crossbeam-channel",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils 0.8.3",
  "directories-next",
  "dispatch 0.1.4",
  "dot_vox",
@@ -6072,7 +6070,7 @@ dependencies = [
  "gilrs",
  "glyph_brush",
  "guillotiere",
- "hashbrown 0.11.2",
+ "hashbrown",
  "iced_native",
  "iced_winit",
  "image",
@@ -6082,7 +6080,7 @@ dependencies = [
  "native-dialog",
  "num 0.4.0",
  "num_cpus",
- "ordered-float 2.5.1",
+ "ordered-float 2.1.1",
  "profiling",
  "rand 0.8.3",
  "rayon",
@@ -6112,20 +6110,20 @@ dependencies = [
  "veloren-world",
  "wgpu",
  "wgpu-profiler",
- "window_clipboard",
+ "window_clipboard 0.2.0",
  "winit",
  "winres",
 ]
 
 [[package]]
 name = "veloren-voxygen-anim"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "bytemuck",
  "find_folder",
  "lazy_static",
  "libloading 0.7.0",
- "notify 5.0.0-pre.9",
+ "notify 5.0.0-pre.6",
  "tracing",
  "vek",
  "veloren-common",
@@ -6133,14 +6131,14 @@ dependencies = [
 
 [[package]]
 name = "veloren-voxygen-anim-dyn"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "veloren-voxygen-anim",
 ]
 
 [[package]]
 name = "veloren-world"
-version = "0.10.0"
+version = "0.9.0"
 dependencies = [
  "arr_macro",
  "assets_manager",
@@ -6152,7 +6150,7 @@ dependencies = [
  "enum-iterator",
  "flate2",
  "fxhash",
- "hashbrown 0.11.2",
+ "hashbrown",
  "image",
  "itertools 0.10.0",
  "lazy_static",
@@ -6161,7 +6159,7 @@ dependencies = [
  "noise",
  "num 0.4.0",
  "num-traits",
- "ordered-float 2.5.1",
+ "ordered-float 2.1.1",
  "packed_simd_2",
  "rand 0.8.3",
  "rand_chacha 0.3.0",
@@ -6249,9 +6247,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.74"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -6259,14 +6257,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.74"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
 dependencies = [
  "bumpalo",
  "lazy_static",
  "log",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
  "wasm-bindgen-shared",
@@ -6274,9 +6272,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.24"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1"
+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -6286,9 +6284,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.74"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
 dependencies = [
  "quote 1.0.9",
  "wasm-bindgen-macro-support",
@@ -6296,11 +6294,11 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.74"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
  "wasm-bindgen-backend",
@@ -6309,9 +6307,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.74"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
 
 [[package]]
 name = "wasmer"
@@ -6379,7 +6377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b86dcd2c3efdb8390728a2b56f762db07789aaa5aa872a9dc776ba3a7912ed"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "syn 1.0.72",
 ]
@@ -6393,7 +6391,7 @@ dependencies = [
  "backtrace",
  "bincode",
  "lazy_static",
- "memmap2 0.2.3",
+ "memmap2 0.2.2",
  "more-asserts",
  "rustc-demangle",
  "serde",
@@ -6478,7 +6476,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "indexmap",
  "libc",
- "memoffset 0.6.4",
+ "memoffset 0.6.3",
  "more-asserts",
  "region",
  "serde",
@@ -6618,7 +6616,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "030f56009d932bd9400bb472764fea8109be1b0fc482d9cd75496c943ac30328"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "xml-rs",
 ]
@@ -6629,7 +6627,7 @@ version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "xml-rs",
 ]
@@ -6687,7 +6685,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu-rs.git?rev=7486bdad64bb5d17b709ecccb41e063469efff88#7486bdad64bb5d17b709ecccb41e063469efff88"
 dependencies = [
  "arrayvec",
  "js-sys",
@@ -6707,7 +6705,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -6747,7 +6745,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0"
 dependencies = [
  "bitflags",
  "serde",
@@ -6817,22 +6815,34 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "window_clipboard"
-version = "0.2.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a4518b538a45ad39d138a8c3bea8f6b4452174aeb38143d1dd643a3a838ccc"
+checksum = "37cf16659e398a96f4ab8deff2b9db2ca0c3c5d6c1b59b1d577b7f888f0f03c6"
 dependencies = [
- "clipboard-win 4.2.1",
+ "clipboard-win 4.0.3",
  "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
+ "clipboard_wayland 0.1.2",
+ "clipboard_x11 0.2.0",
+ "raw-window-handle",
+]
+
+[[package]]
+name = "window_clipboard"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f6a6c83705a9008993d91151c1f5d249f5e87ef752b862ea968bd62f15202ab"
+dependencies = [
+ "clipboard-win 4.0.3",
+ "clipboard_macos",
+ "clipboard_wayland 0.2.0",
+ "clipboard_x11 0.3.1",
  "raw-window-handle",
 ]
 
 [[package]]
 name = "winit"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
+version = "0.24.0"
+source = "git+https://gitlab.com/veloren/winit.git?branch=macos-test-spiffed#488c511802dfd95ca54f6f76a38547c93c7b02c9"
 dependencies = [
  "bitflags",
  "cocoa",
@@ -6844,16 +6854,15 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio 0.7.11",
- "mio-misc",
- "ndk",
- "ndk-glue",
+ "mio 0.6.23",
+ "mio-extras",
+ "ndk 0.2.1",
+ "ndk-glue 0.2.1",
  "ndk-sys",
  "objc",
  "parking_lot 0.11.1",
  "percent-encoding",
  "raw-window-handle",
- "scopeguard",
  "serde",
  "smithay-client-toolkit",
  "wayland-client 0.28.5",
@@ -6900,9 +6909,9 @@ dependencies = [
 
 [[package]]
 name = "x11-clipboard"
-version = "0.5.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b397ace6e980510de59a4fe3d4c758dffab231d6d747ce9fa1aba6b6035d5f32"
+checksum = "e5e937afd03b64b7be4f959cc044e09260a47241b71e56933f37db097bf7859d"
 dependencies = [
  "xcb",
 ]
@@ -7009,9 +7018,9 @@ checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"
 
 [[package]]
 name = "yasna"
-version = "0.4.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75"
+checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb"
 dependencies = [
  "chrono",
 ]
diff --git a/common/Cargo.toml b/common/Cargo.toml
index ab7811d778..62006fa6c3 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -15,7 +15,7 @@ default = ["simd"]
 [dependencies]
 
 common-base = { package = "veloren-common-base", path = "base" }
-# inline_tweak = "1.0.8"
+inline_tweak = "1.0.8"
 
 # Serde
 serde = { version = "1.0.110", features = ["derive", "rc"] }
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index eb21faecdf..ee8fce1d25 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -736,18 +736,13 @@ impl Component for Body {
 }
 
 impl Body {
-    pub fn aerodynamic_forces(
-        &self,
-        ori: Option<&Ori>,
-        rel_flow: &Vel,
-        fluid_density: f32,
-    ) -> Vec3<f32> {
-        match (self, ori) {
-            (Body::BirdMedium(bird), Some(ori)) => bird_medium::FlyingBirdMedium::from((bird, ori))
+    pub fn aerodynamic_forces(&self, ori: &Ori, rel_flow: &Vel, fluid_density: f32) -> Vec3<f32> {
+        match self {
+            Body::BirdMedium(bird) => bird_medium::FlyingBirdMedium::from((bird, ori))
                 .aerodynamic_forces(rel_flow, fluid_density),
-            (Body::BirdLarge(bird), Some(ori)) => bird_large::FlyingBirdLarge::from((bird, ori))
+            Body::BirdLarge(bird) => bird_large::FlyingBirdLarge::from((bird, ori))
                 .aerodynamic_forces(rel_flow, fluid_density),
-            (Body::Dragon(not_bird), Some(ori)) => dragon::FlyingDragon::from((not_bird, ori))
+            Body::Dragon(not_bird) => dragon::FlyingDragon::from((not_bird, ori))
                 .aerodynamic_forces(rel_flow, fluid_density),
             _ => self.drag(rel_flow, fluid_density),
         }
@@ -767,8 +762,8 @@ impl Drag for Body {
         match self {
             // Cross-section, head/feet first
             Body::BipedLarge(_) | Body::BipedSmall(_) | Body::Golem(_) | Body::Humanoid(_) => {
-                const SCALE: f32 = 0.7;
-                let radius = self.dimensions().xy().map(|a| SCALE * a * 0.5);
+                // const SCALE: f32 = 0.7;
+                let radius = self.dimensions().xy().map(|a| inline_tweak::tweak!(0.6) * a * 0.5);
                 const CD: f32 = 0.7;
                 CD * PI * radius.x * radius.y
             },
diff --git a/common/src/comp/body/bird_large.rs b/common/src/comp/body/bird_large.rs
index ea332d0db7..2731cd9988 100644
--- a/common/src/comp/body/bird_large.rs
+++ b/common/src/comp/body/bird_large.rs
@@ -1,6 +1,6 @@
 use crate::{
     comp::{
-        fluid_dynamics::{Drag, WingShape, WingState, Glide},
+        fluid_dynamics::{Drag, Glide, WingShape, WingState},
         Ori,
     },
     make_case_elim, make_proj_elim,
diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs
index 06dd0cc0d8..f42d21702c 100644
--- a/common/src/comp/body/bird_medium.rs
+++ b/common/src/comp/body/bird_medium.rs
@@ -1,6 +1,6 @@
 use crate::{
     comp::{
-        fluid_dynamics::{Drag, WingShape, WingState, Glide},
+        fluid_dynamics::{Drag, Glide, WingShape, WingState},
         Ori,
     },
     make_case_elim, make_proj_elim,
diff --git a/common/src/comp/fluid_dynamics.rs b/common/src/comp/fluid_dynamics.rs
index 2f2335a4ed..3ba43134d1 100644
--- a/common/src/comp/fluid_dynamics.rs
+++ b/common/src/comp/fluid_dynamics.rs
@@ -137,8 +137,6 @@ pub trait Drag: Clone {
 }
 
 pub trait Glide: Drag {
-    const STALL_ANGLE: f32 = PI * 0.1;
-
     fn wing_shape(&self) -> &WingShape;
 
     fn planform_area(&self) -> f32;
@@ -147,67 +145,57 @@ pub trait Glide: Drag {
 
     fn is_gliding(&self) -> bool;
 
-    /// Total lift coefficient for a finite wing of symmetric aerofoil shape and
-    /// elliptical pressure distribution. (Multiplied by reference area.)
-    fn lift_coefficient(&self, angle_of_attack: f32) -> f32 {
-        let aoa_abs = angle_of_attack.abs();
-        self.planform_area()
-            * if self.is_gliding() { 1.0 } else { 0.2 }
-            * if aoa_abs <= Self::STALL_ANGLE {
-                self.wing_shape().lift_slope() * angle_of_attack
-            } else {
-                // This is when flow separation and turbulence starts to kick in.
-                // Going to just make something up (based on some data), as the alternative is
-                // to just throw your hands up and return 0
-                let aoa_s = angle_of_attack.signum();
-                let c_l_max = self.wing_shape().lift_slope() * Self::STALL_ANGLE;
-                let deg_45 = PI / 4.0;
-                if aoa_abs < deg_45 {
-                    // drop directly to 0.6 * max lift at stall angle
-                    // then climb back to max at 45°
-                    Lerp::lerp(0.6 * c_l_max, c_l_max, aoa_abs / deg_45) * aoa_s
-                } else {
-                    // let's just say lift goes down linearly again until we're at 90°
-                    Lerp::lerp(c_l_max, 0.0, (aoa_abs - deg_45) / deg_45) * aoa_s
-                }
-            }
-    }
-
-    /// Total drag coefficient (multiplied by reference area)
-    fn drag_coefficient(&self, aspect_ratio: f32, lift_coefficient: f32) -> f32 {
-        self.parasite_drag_coefficient() + induced_drag_coefficient(aspect_ratio, lift_coefficient)
-    }
-
     fn aerodynamic_forces(&self, rel_flow: &Vel, fluid_density: f32) -> Vec3<f32> {
-        let v_sq = rel_flow.0.magnitude_squared();
-        if v_sq < 0.1 {
-            // don't bother with miniscule forces
-            Vec3::zero()
+        if self.is_gliding() {
+            let ori = self.ori();
+            let planform_area = self.planform_area();
+            let parasite_drag_coefficient = self.parasite_drag_coefficient();
+
+            let f = |flow_v: Vec3<f32>, wing_shape: &WingShape| -> Vec3<f32> {
+                let v_sq = flow_v.magnitude_squared();
+                if v_sq < std::f32::EPSILON {
+                    Vec3::zero()
+                } else {
+                    let freestream_dir = Dir::new(flow_v / v_sq.sqrt());
+
+                    let ar = wing_shape.aspect_ratio();
+                    // aoa will be positive when we're pitched up and negative otherwise
+                    let aoa = angle_of_attack(ori, &freestream_dir);
+                    // c_l will be positive when aoa is positive (we have positive lift,
+                    // producing an upward force) and negative otherwise
+                    let c_l = lift_coefficient(
+                        planform_area,
+                        aoa,
+                        wing_shape.lift_slope(),
+                        wing_shape.stall_angle(),
+                    );
+
+                    let c_d = parasite_drag_coefficient + induced_drag_coefficient(ar, c_l);
+
+                    0.5 * fluid_density
+                        * v_sq
+                        * (c_l * *lift_dir(ori, ar, c_l, aoa) + c_d * *freestream_dir)
+                }
+            };
+
+            let wing_shape = self.wing_shape();
+            // lateral wind
+            f(
+                rel_flow.0.projected(&Plane::from(self.ori().look_dir())),
+                &wing_shape.with_aspect_ratio(1.0 / wing_shape.aspect_ratio()),
+            )
+            // longitudinal wind
+            + f(
+                rel_flow.0.projected(&Plane::from(self.ori().right())),
+                &wing_shape,
+            )
         } else {
-            let q = 0.5 * fluid_density * v_sq;
-            let rel_flow_dir = Dir::new(rel_flow.0 / v_sq.sqrt());
-            if self.is_gliding() {
-                let ori = self.ori();
-                let ar = self.wing_shape().aspect_ratio();
-                // aoa will be positive when we're pitched up and negative otherwise
-                let aoa = angle_of_attack(ori, &rel_flow_dir);
-                // c_l will be positive when aoa is positive (we have positive lift,
-                // producing an upward force) and negative otherwise
-                let c_l = self.lift_coefficient(aoa);
-
-                let lift = q * c_l * *lift_dir(ori, ar, c_l, aoa);
-                let drag = q * self.drag_coefficient(ar, c_l) * *rel_flow_dir;
-
-                lift + drag
-            } else {
-                q * self.parasite_drag_coefficient() * *rel_flow_dir
-            }
+            self.drag(rel_flow, fluid_density)
         }
     }
 }
 
-
-pub fn lift_dir(ori: &Ori, aspect_ratio: f32, lift_coefficient: f32, angle_of_attack: f32) -> Dir {
+fn lift_dir(ori: &Ori, aspect_ratio: f32, lift_coefficient: f32, angle_of_attack: f32) -> Dir {
     // lift dir will be orthogonal to the local relative flow vector. Local relative
     // flow is the resulting vector of (relative) freestream flow + downwash
     // (created by the vortices of the wing tips)
@@ -226,16 +214,45 @@ pub fn lift_dir(ori: &Ori, aspect_ratio: f32, lift_coefficient: f32, angle_of_at
 }
 
 /// Geometric angle of attack
-///
-/// # Note
-/// This ignores spanwise flow (i.e. we remove the spanwise flow component).
-/// With greater yaw comes greater loss of accuracy as more flow goes
-/// unaccounted for.
 pub fn angle_of_attack(ori: &Ori, rel_flow_dir: &Dir) -> f32 {
-    rel_flow_dir
-        .projected(&Plane::from(ori.right()))
-        .map(|flow_dir| PI / 2.0 - ori.up().angle_between(flow_dir.to_vec()))
-        .unwrap_or(0.0)
+    if inline_tweak::tweak!(true) {
+        PI / 2.0 - ori.up().angle_between(rel_flow_dir.to_vec())
+    } else {
+        rel_flow_dir
+            .projected(&Plane::from(ori.right()))
+            .map(|flow_dir| PI / 2.0 - ori.up().angle_between(flow_dir.to_vec()))
+            .unwrap_or(0.0)
+    }
+}
+
+/// Total lift coefficient for a finite wing of symmetric aerofoil shape and
+/// elliptical pressure distribution. (Multiplied by reference area.)
+fn lift_coefficient(
+    planform_area: f32,
+    angle_of_attack: f32,
+    lift_slope: f32,
+    stall_angle: f32,
+) -> f32 {
+    let aoa_abs = angle_of_attack.abs();
+    planform_area
+        * if aoa_abs <= stall_angle {
+            lift_slope * angle_of_attack
+        } else {
+            // This is when flow separation and turbulence starts to kick in.
+            // Going to just make something up (based on some data), as the alternative is
+            // to just throw your hands up and return 0
+            let aoa_s = angle_of_attack.signum();
+            let c_l_max = lift_slope * stall_angle;
+            let deg_45 = PI / 4.0;
+            if aoa_abs < deg_45 {
+                // drop directly to 0.6 * max lift at stall angle
+                // then climb back to max at 45°
+                Lerp::lerp(0.6 * c_l_max, c_l_max, aoa_abs / deg_45) * aoa_s
+            } else {
+                // let's just say lift goes down linearly again until we're at 90°
+                Lerp::lerp(c_l_max, 0.0, (aoa_abs - deg_45) / deg_45) * aoa_s
+            }
+        }
 }
 
 #[derive(Copy, Clone)]
@@ -254,7 +271,22 @@ pub enum WingShape {
 }
 
 impl WingShape {
-    pub fn aspect_ratio(&self) -> f32 {
+    pub const fn stall_angle(&self) -> f32 {
+        // PI/10 or 18°
+        0.3141592653589793
+    }
+
+    pub const fn with_aspect_ratio(self, aspect_ratio: f32) -> Self {
+        match self {
+            Self::Elliptical { .. } => Self::Elliptical { aspect_ratio },
+            Self::Swept { angle, .. } => Self::Swept {
+                aspect_ratio,
+                angle,
+            },
+        }
+    }
+
+    pub const fn aspect_ratio(&self) -> f32 {
         match self {
             Self::Elliptical { aspect_ratio } => *aspect_ratio,
             Self::Swept { aspect_ratio, .. } => *aspect_ratio,
@@ -318,7 +350,7 @@ impl WingShape {
 }
 
 /// Induced drag coefficient (drag due to lift)
-pub fn induced_drag_coefficient(aspect_ratio: f32, lift_coefficient: f32) -> f32 {
+fn induced_drag_coefficient(aspect_ratio: f32, lift_coefficient: f32) -> f32 {
     let ar = aspect_ratio;
     if ar > 25.0 {
         tracing::warn!(
diff --git a/common/src/consts.rs b/common/src/consts.rs
index 4cbaa9598e..e55fee68bc 100644
--- a/common/src/consts.rs
+++ b/common/src/consts.rs
@@ -2,7 +2,7 @@
 pub const MAX_PICKUP_RANGE: f32 = 8.0;
 pub const MAX_MOUNT_RANGE: f32 = 14.0;
 
-pub const GRAVITY: f32 = 25.0;
+pub const GRAVITY: f32 = 9.81;
 pub const FRIC_GROUND: f32 = 0.15;
 
 // Values for air taken from http://www-mdp.eng.cam.ac.uk/web/library/enginfo/aerothermal_dvd_only/aero/atmos/atmos.html
diff --git a/common/src/glider.rs b/common/src/glider.rs
new file mode 100644
index 0000000000..f36bd5594c
--- /dev/null
+++ b/common/src/glider.rs
@@ -0,0 +1,78 @@
+use crate::{
+    comp::{
+        fluid_dynamics::{Drag, Glide, WingShape},
+        Ori,
+    },
+    util::Dir,
+};
+use inline_tweak::tweak;
+use serde::{Deserialize, Serialize};
+use std::f32::consts::PI;
+use vek::*;
+
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Glider {
+    /// The aspect ratio is the ratio of the span squared to actual planform
+    /// area
+    pub wing_shape: WingShape,
+    pub planform_area: f32,
+    pub ori: Ori,
+}
+
+impl Glider {
+    /// A glider is modelled as an elliptical wing and has a span length
+    /// (distance from wing tip to wing tip) and a chord length (distance from
+    /// leading edge to trailing edge through its centre) measured in block
+    /// units.
+    ///
+    ///  https://en.wikipedia.org/wiki/Elliptical_wing
+    pub fn new(span_length: f32, chord_length: f32, ori: Ori) -> Self {
+        let planform_area = PI * chord_length * span_length * 0.25;
+        let aspect_ratio = span_length.powi(2) / planform_area;
+        Self {
+            wing_shape: WingShape::Elliptical { aspect_ratio },
+            planform_area,
+            ori,
+        }
+    }
+
+    pub fn roll(&mut self, angle_right: f32) { self.ori = self.ori.rolled_right(angle_right); }
+
+    pub fn pitch(&mut self, angle_up: f32) { self.ori = self.ori.pitched_up(angle_up); }
+
+    pub fn yaw(&mut self, angle_right: f32) { self.ori = self.ori.yawed_right(angle_right); }
+
+    pub fn slerp_roll_towards(&mut self, dir: Dir, s: f32) {
+        self.ori = self.ori.slerped_towards(
+            self.ori
+                .rolled_towards(if self.ori.up().dot(dir.to_vec()) < tweak!(0.0) {
+                    Quaternion::rotation_3d(PI, self.ori.right()) * dir
+                } else {
+                    dir
+                }),
+            s,
+        );
+    }
+
+    pub fn slerp_pitch_towards(&mut self, dir: Dir, s: f32) {
+        self.ori = self.ori.slerped_towards(self.ori.pitched_towards(dir), s);
+    }
+
+    pub fn slerp_yaw_towards(&mut self, dir: Dir, s: f32) {
+        self.ori = self.ori.slerped_towards(self.ori.yawed_towards(dir), s);
+    }
+}
+
+impl Drag for Glider {
+    fn parasite_drag_coefficient(&self) -> f32 { self.planform_area * 0.004 }
+}
+
+impl Glide for Glider {
+    fn wing_shape(&self) -> &WingShape { &self.wing_shape }
+
+    fn is_gliding(&self) -> bool { true }
+
+    fn planform_area(&self) -> f32 { self.planform_area }
+
+    fn ori(&self) -> &Ori { &self.ori }
+}
diff --git a/common/src/lib.rs b/common/src/lib.rs
index e554b84456..084e3e620c 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -44,6 +44,7 @@ pub mod explosion;
 pub mod figure;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod generation;
+pub mod glider;
 #[cfg(not(target_arch = "wasm32"))] pub mod grid;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod lottery;
@@ -87,5 +88,6 @@ pub use combat::{DamageKind, DamageSource};
 pub use comp::inventory::loadout_builder::LoadoutBuilder;
 #[cfg(not(target_arch = "wasm32"))]
 pub use explosion::{Explosion, RadiusEffect};
+pub use glider::Glider;
 #[cfg(not(target_arch = "wasm32"))]
 pub use skillset_builder::SkillSetBuilder;
diff --git a/common/src/states/glide.rs b/common/src/states/glide.rs
index 0ba59a47f6..f176493087 100644
--- a/common/src/states/glide.rs
+++ b/common/src/states/glide.rs
@@ -1,87 +1,103 @@
 use super::utils::handle_climb;
 use crate::{
-    comp::{
-        fluid_dynamics::{angle_of_attack, Drag, Glide, WingShape},
-        inventory::slot::EquipSlot,
-        CharacterState, Ori, StateUpdate, Vel,
-    },
+    comp::{inventory::slot::EquipSlot, CharacterState, ControllerInputs, Ori, StateUpdate, Vel},
+    glider::Glider,
     states::behavior::{CharacterBehavior, JoinData},
-    util::{Dir, Plane, Projection},
+    util::Dir,
 };
+use inline_tweak::tweak;
 use serde::{Deserialize, Serialize};
 use std::f32::consts::PI;
 use vek::*;
 
 const PITCH_SLOW_TIME: f32 = 0.5;
+const MAX_LIFT_DRAG_RATIO_AOA: f32 = PI * 0.04;
 
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Data {
-    /// The aspect ratio is the ratio of the span squared to actual planform
-    /// area
-    pub wing_shape: WingShape,
-    pub planform_area: f32,
-    pub ori: Ori,
-    last_vel: Vel,
+    pub glider: Glider,
+    last_ori: Ori,
     timer: f32,
     inputs_disabled: bool,
 }
 
 impl Data {
-    /// A glider is modelled as an elliptical wing and has a span length
-    /// (distance from wing tip to wing tip) and a chord length (distance from
-    /// leading edge to trailing edge through its centre) measured in block
-    /// units.
-    ///
-    ///  https://en.wikipedia.org/wiki/Elliptical_wing
-    pub fn new(span_length: f32, chord_length: f32, ori: Ori) -> Self {
-        let planform_area = PI * chord_length * span_length * 0.25;
-        let aspect_ratio = span_length.powi(2) / planform_area;
+    pub fn new(glider: Glider, ori: &Ori) -> Self {
         Self {
-            wing_shape: WingShape::Elliptical { aspect_ratio },
-            planform_area,
-            ori,
-            last_vel: Vel::zero(),
+            last_ori: *ori,
             timer: 0.0,
             inputs_disabled: true,
+            glider,
         }
     }
 
-    fn tgt_dir(&self, data: &JoinData) -> Dir {
-        let move_dir = if self.inputs_disabled {
-            Vec2::zero()
-        } else {
-            data.inputs.move_dir
-        };
-        let look_ori = Ori::from(data.inputs.look_dir);
-        look_ori
-            .yawed_right(PI / 3.0 * look_ori.right().xy().dot(move_dir))
-            .pitched_up(PI * 0.04)
-            .pitched_down(
-                data.inputs
-                    .look_dir
-                    .xy()
-                    .try_normalized()
-                    .map_or(0.0, |ld| {
-                        PI * 0.1 * ld.dot(move_dir) * self.timer.min(PITCH_SLOW_TIME)
-                            / PITCH_SLOW_TIME
-                    }),
-            )
-            .look_dir()
+    fn pitch_input(&self, inputs: &ControllerInputs) -> Option<f32> {
+        inputs
+            .look_dir
+            .xy()
+            .try_normalized()
+            .map(|look_dir2| -look_dir2.dot(inputs.move_dir))
+            .map(|pitch| pitch * self.pitch_modifier())
+            .filter(|pitch| pitch.abs() > std::f32::EPSILON)
     }
-}
 
-impl Drag for Data {
-    fn parasite_drag_coefficient(&self) -> f32 { self.planform_area * 0.004 }
-}
+    fn roll_input(&self, inputs: &ControllerInputs) -> Option<f32> {
+        Some(Ori::from(inputs.look_dir).right().xy().dot(inputs.move_dir) * self.roll_modifier())
+            .filter(|roll| roll.abs() > std::f32::EPSILON)
+    }
 
-impl Glide for Data {
-    fn wing_shape(&self) -> &WingShape { &self.wing_shape }
+    fn pitch_modifier(&self) -> f32 {
+        if self.inputs_disabled {
+            0.0
+        } else {
+            tweak!(1.0) * self.timer.min(PITCH_SLOW_TIME) / PITCH_SLOW_TIME
+        }
+    }
 
-    fn is_gliding(&self) -> bool { true }
+    fn roll_modifier(&self) -> f32 {
+        if self.inputs_disabled {
+            0.0
+        } else {
+            tweak!(1.0)
+        }
+    }
 
-    fn planform_area(&self) -> f32 { self.planform_area }
+    fn tgt_dir(&self, default_pitch: f32, max_pitch: f32, data: &JoinData) -> Dir {
+        let char_fw = data.ori.look_dir();
+        if data.inputs.look_dir.dot(*char_fw) > max_pitch.cos() {
+            Quaternion::rotation_3d(default_pitch, Ori::from(data.inputs.look_dir).right())
+                * data.inputs.look_dir
+        } else {
+            char_fw
+                .cross(*data.inputs.look_dir)
+                .try_normalized()
+                .map(|axis| Quaternion::rotation_3d(max_pitch, axis) * char_fw)
+                .unwrap_or_else(|| data.ori.up())
+        }
+    }
 
-    fn ori(&self) -> &Ori { &self.ori }
+    fn tgt_up(&self, max_roll: f32, tgt_dir: &Dir, flow_dir: &Dir, data: &JoinData) -> Dir {
+        let char_up = data.ori.up();
+        Dir::from_unnormalized(tgt_dir.to_vec() + flow_dir.to_vec())
+            .map(|tgt_lift_dir| {
+                tgt_lift_dir.slerped_to(
+                    -*flow_dir,
+                    Dir::from_unnormalized(data.vel.0)
+                        .map_or(0.0, |moving_dir| moving_dir.dot(flow_dir.to_vec()).max(0.0)),
+                )
+            })
+            .and_then(|d| {
+                if d.dot(*char_up) > max_roll.cos() {
+                    Some(d)
+                } else {
+                    char_up
+                        .cross(*d)
+                        .try_normalized()
+                        .map(|axis| Quaternion::rotation_3d(max_roll, axis) * char_up)
+                }
+            })
+            .unwrap_or(char_up)
+    }
 }
 
 impl CharacterBehavior for Data {
@@ -100,104 +116,79 @@ impl CharacterBehavior for Data {
             update.character = CharacterState::Idle;
             update.ori = update.ori.to_horizontal();
         } else if !handle_climb(&data, &mut update) {
+            // Tweaks
+            let def_pitch = MAX_LIFT_DRAG_RATIO_AOA * tweak!(2.0);
+            let max_pitch = tweak!(0.2) * PI;
+            let max_roll = tweak!(0.30) * PI;
+            let inputs_rate = tweak!(4.0);
+            let look_pitch_rate = tweak!(5.0);
+            let autoroll_rate = tweak!(5.0);
+            let rot_with_char = tweak!(false);
+            let yaw_correction_rate = tweak!(1.0);
+            let char_yaw_follow_rate = tweak!(2.0);
+            // ----
+
             let air_flow = data
                 .physics
                 .in_fluid
                 .map(|fluid| fluid.relative_flow(data.vel))
-                .unwrap_or_default();
+                .unwrap_or_else(|| Vel(Vec3::unit_z()));
+            let flow_dir = Dir::from_unnormalized(air_flow.0).unwrap_or_else(Dir::up);
+            let tgt_dir = self.tgt_dir(def_pitch, max_pitch, data);
 
-            let inputs_disabled = self.inputs_disabled && !data.inputs.move_dir.is_approx_zero();
+            let char_up = data.ori.up();
 
-            let ori = {
-                let slerp_s = {
-                    let angle = self.ori.look_dir().angle_between(*data.inputs.look_dir);
-                    let rate = 0.4 * PI / angle;
-                    (data.dt.0 * rate).min(1.0)
+            let mut glider = self.glider;
+
+            if rot_with_char {
+                glider.ori = glider
+                    .ori
+                    .prerotated(self.last_ori.up().rotation_between(char_up));
+            }
+
+            {
+                let glider_up = glider.ori.up();
+                let d = glider_up.dot(*char_up);
+                let cap = |max_ang: f32| -> Option<f32> {
+                    (d - max_ang.cos()).is_sign_positive().then_some(max_ang)
                 };
 
-                Dir::from_unnormalized(air_flow.0)
-                    .map(|flow_dir| {
-                        let tgt_dir = self.tgt_dir(data);
-                        let tgt_dir_ori = Ori::from(tgt_dir);
-                        let tgt_dir_up = tgt_dir_ori.up();
-                        // The desired up vector of our glider.
-                        // We begin by projecting the flow dir on the plane with the normal of
-                        // our tgt_dir to get an idea of how it will hit the glider
-                        let tgt_up = flow_dir
-                            .projected(&Plane::from(tgt_dir))
-                            .map(|d| {
-                                let d = if d.dot(*tgt_dir_up).is_sign_negative() {
-                                    // when the final direction of flow is downward we don't roll
-                                    // upside down but instead mirror the target up vector
-                                    Quaternion::rotation_3d(PI, *tgt_dir_ori.right()) * d
-                                } else {
-                                    d
-                                };
-                                // slerp from untilted up towards the direction by a factor of
-                                // lateral wind to prevent overly reactive adjustments
-                                let lateral_wind_speed =
-                                    air_flow.0.projected(&self.ori.right()).magnitude();
-                                tgt_dir_up.slerped_to(d, lateral_wind_speed / 15.0)
-                            })
-                            .unwrap_or_else(Dir::up);
-                        let global_roll = tgt_dir_up.rotation_between(tgt_up);
-                        let global_pitch = angle_of_attack(&tgt_dir_ori, &flow_dir)
-                            * self.timer.min(PITCH_SLOW_TIME)
-                            / PITCH_SLOW_TIME;
+                if let Some(roll_input) = self.roll_input(data.inputs) {
+                    if (d - max_roll.cos()).is_sign_positive()
+                        || (glider.ori.right().dot(*char_up).is_sign_positive()
+                            == roll_input.is_sign_positive())
+                    {
+                        glider.roll(data.dt.0 * inputs_rate * roll_input * max_roll);
+                    }
+                } else {
+                    glider.slerp_roll_towards(
+                        self.tgt_up(max_roll, &tgt_dir, &flow_dir, data),
+                        autoroll_rate * data.dt.0,
+                    );
+                }
 
-                        self.ori.slerped_towards(
-                            tgt_dir_ori.prerotated(global_roll).pitched_up(global_pitch),
-                            slerp_s,
-                        )
-                    })
-                    .unwrap_or_else(|| self.ori.slerped_towards(self.ori.uprighted(), slerp_s))
-            };
+                if let Some(pitch_input) = self.pitch_input(data.inputs) {
+                    if (d - max_pitch.cos()).is_sign_positive()
+                        || (glider.ori.look_dir().dot(*char_up).is_sign_negative()
+                            == pitch_input.is_sign_positive())
+                    {
+                        glider.pitch(data.dt.0 * inputs_rate * pitch_input * max_pitch);
+                    }
+                }
+                glider.slerp_pitch_towards(tgt_dir, look_pitch_rate * data.dt.0);
+            }
 
-            update.ori = {
-                let slerp_s = {
-                    let angle = data.ori.look_dir().angle_between(*data.inputs.look_dir);
-                    let rate = 0.2 * data.body.base_ori_rate() * PI / angle;
-                    (data.dt.0 * rate).min(1.0)
-                };
+            glider.slerp_yaw_towards(-flow_dir, data.dt.0 * yaw_correction_rate);
+            update.ori = data.ori.slerped_towards(
+                data.ori.yawed_towards(glider.ori.look_dir()),
+                data.dt.0 * char_yaw_follow_rate,
+            );
 
-                let rot_from_drag = {
-                    let speed_factor =
-                        air_flow.0.magnitude_squared().min(40_f32.powi(2)) / 40_f32.powi(2);
-
-                    Quaternion::rotation_3d(
-                        -PI / 2.0 * speed_factor,
-                        ori.up()
-                            .cross(air_flow.0)
-                            .try_normalized()
-                            .unwrap_or_else(|| *data.ori.right()),
-                    )
-                };
-
-                let rot_from_accel = {
-                    let accel = data.vel.0 - self.last_vel.0;
-                    let accel_factor = accel.magnitude_squared().min(1.0) / 1.0;
-
-                    Quaternion::rotation_3d(
-                        PI / 2.0 * accel_factor * if data.physics.on_ground { -1.0 } else { 1.0 },
-                        ori.up()
-                            .cross(accel)
-                            .try_normalized()
-                            .unwrap_or_else(|| *data.ori.right()),
-                    )
-                };
-
-                update.ori.slerped_towards(
-                    ori.to_horizontal()
-                        .prerotated(rot_from_drag * rot_from_accel),
-                    slerp_s,
-                )
-            };
             update.character = CharacterState::Glide(Self {
-                ori,
-                last_vel: *data.vel,
+                last_ori: update.ori,
                 timer: self.timer + data.dt.0,
-                inputs_disabled,
-                ..*self
+                inputs_disabled: self.inputs_disabled && !data.inputs.move_dir.is_approx_zero(),
+                glider,
             });
         } else {
             update.ori = update.ori.to_horizontal();
diff --git a/common/src/states/glide_wield.rs b/common/src/states/glide_wield.rs
index 56d2001cf6..8bf2f65e54 100644
--- a/common/src/states/glide_wield.rs
+++ b/common/src/states/glide_wield.rs
@@ -1,6 +1,7 @@
 use super::utils::*;
 use crate::{
     comp::{slot::EquipSlot, CharacterState, InventoryAction, StateUpdate},
+    glider::Glider,
     states::{
         behavior::{CharacterBehavior, JoinData},
         glide,
@@ -21,11 +22,12 @@ impl CharacterBehavior for Data {
 
         // If not on the ground while wielding glider enter gliding state
         if !data.physics.on_ground {
-            update.character = CharacterState::Glide(glide::Data::new(
+            let glider = Glider::new(
                 data.body.dimensions().z * 3.0,
                 data.body.dimensions().z / 3.0,
                 *data.ori,
-            ));
+            );
+            update.character = CharacterState::Glide(glide::Data::new(glider, data.ori));
         }
         if data
             .physics
diff --git a/common/systems/Cargo.toml b/common/systems/Cargo.toml
index 23cc60178e..776552786b 100644
--- a/common/systems/Cargo.toml
+++ b/common/systems/Cargo.toml
@@ -30,4 +30,4 @@ slab = "0.4.2"
 specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
 
 # Tweak running code
-# inline_tweak = { version = "1.0.8", features = ["release_tweak"] }
+inline_tweak = { version = "1.0.8", features = ["release_tweak"] }
diff --git a/common/systems/src/phys.rs b/common/systems/src/phys.rs
index eda32efbb6..c37abc24a7 100644
--- a/common/systems/src/phys.rs
+++ b/common/systems/src/phys.rs
@@ -11,11 +11,12 @@ use common::{
     resources::DeltaTime,
     terrain::{Block, TerrainGrid},
     uid::Uid,
-    util::{Projection, SpatialGrid},
+    util::{Dir, Projection, SpatialGrid},
     vol::{BaseVol, ReadVol},
 };
 use common_base::{prof_span, span};
 use common_ecs::{Job, Origin, ParMode, Phase, PhysicsMetrics, System};
+use inline_tweak::tweak;
 use rayon::iter::ParallelIterator;
 use specs::{
     shred::{ResourceId, World},
@@ -38,18 +39,59 @@ fn fluid_density(height: f32, fluid: &Fluid) -> Density {
     Density(fluid.density().0 * immersion + AIR_DENSITY * (1.0 - immersion))
 }
 
+fn integrate_glider_forces(
+    dt: &DeltaTime,
+    dv: Vec3<f32>,
+    vel: &mut Vel,
+    ori: &mut Ori,
+    mass: &Mass,
+    character_state: &CharacterState,
+    rel_wind: &Vel,
+) -> Option<()> {
+    let glider = match character_state {
+        CharacterState::Glide(glider) => Some(glider.glider),
+        _ => None,
+    }?;
+
+    let dv_ = Some(dt.0 * glider.aerodynamic_forces(&rel_wind, AIR_DENSITY))
+        .filter(|imp| !imp.is_approx_zero())
+        .map(|imp| imp / mass.0 - dv)?;
+
+    vel.0 += dv_;
+
+    {
+        let glider_dir = ori.up();
+        let glider_dist = tweak!(2.5);
+        let glider_pos = *glider_dir * glider_dist;
+        if let Some(rot) = Dir::from_unnormalized(glider_pos + dv_)
+            .map(|u| {
+                let s = glider_dir.dot(*u).powf(tweak!(10.0) * dt.0);
+                glider_dir.slerped_to(
+                    u,
+                    tweak!(-0.7) + tweak!(1.0) * s.max(0.0) + tweak!(0.0) * s.min(0.0),
+                )
+            })
+            .map(|u| glider_dir.rotation_between(u))
+        {
+            *ori = ori.prerotated(rot);
+        }
+    }
+
+    Some(())
+}
+
 #[allow(clippy::too_many_arguments)]
 fn integrate_forces(
     dt: &DeltaTime,
-    mut vel: Vel,
-    ori: Option<&Ori>,
+    vel: &mut Vel,
+    ori: &mut Ori,
     body: &Body,
     character_state: Option<&CharacterState>,
     density: &Density,
     mass: &Mass,
     fluid: &Fluid,
     gravity: f32,
-) -> Vel {
+) {
     let dim = body.dimensions();
     let height = dim.z;
     let rel_flow = fluid.relative_flow(&vel);
@@ -60,15 +102,7 @@ fn integrate_forces(
     // Aerodynamic/hydrodynamic forces
     if !rel_flow.0.is_approx_zero() {
         debug_assert!(!rel_flow.0.map(|a| a.is_nan()).reduce_or());
-        let aerodynamic_forces = body.aerodynamic_forces(ori, &rel_flow, fluid_density.0)
-            + match character_state {
-                Some(CharacterState::Glide(glider)) => {
-                    glider.aerodynamic_forces(&rel_flow, fluid_density.0)
-                },
-                _ => Vec3::zero(),
-            };
-        // let impulse = dt.0 * body.aerodynamic_forces(ori, &rel_flow,
-        // fluid_density.0);
+        let aerodynamic_forces = body.aerodynamic_forces(ori, &rel_flow, fluid_density.0);
         debug_assert!(!aerodynamic_forces.map(|a| a.is_nan()).reduce_or());
         if !aerodynamic_forces.is_approx_zero() {
             let new_v = vel.0 + dt.0 * aerodynamic_forces / mass.0;
@@ -84,6 +118,9 @@ fn integrate_forces(
             } else {
                 vel.0 = new_v;
             }
+            character_state.and_then(|cs| {
+                integrate_glider_forces(dt, new_v - vel.0, vel, ori, mass, cs, &rel_flow)
+            });
         };
         debug_assert!(!vel.0.map(|a| a.is_nan()).reduce_or());
     };
@@ -91,8 +128,6 @@ fn integrate_forces(
     // Hydrostatic/aerostatic forces
     // modify gravity to account for the effective density as a result of buoyancy
     vel.0.z -= dt.0 * gravity * (density.0 - fluid_density.0) / density.0;
-
-    vel
 }
 
 fn calc_z_limit(
@@ -571,7 +606,11 @@ impl<'a> PhysicsData<'a> {
 
         // Apply movement inputs
         span!(guard, "Apply movement");
-        let (positions, velocities) = (&write.positions, &mut write.velocities);
+        let (positions, velocities, orientations) = (
+            &write.positions,
+            &mut write.velocities,
+            &mut write.orientations,
+        );
 
         // First pass: update velocity using air resistance and gravity for each entity.
         // We do this in a first pass because it helps keep things more stable for
@@ -584,7 +623,7 @@ impl<'a> PhysicsData<'a> {
             read.character_states.maybe(),
             &write.physics_states,
             &read.masses,
-            write.orientations.maybe(),
+            orientations,
             &read.densities,
             !&read.mountings,
         )
@@ -627,9 +666,9 @@ impl<'a> PhysicsData<'a> {
                                 vel.0.z -= dt.0 * GRAVITY;
                             },
                             Some(fluid) => {
-                                vel.0 = integrate_forces(
+                                integrate_forces(
                                     &dt,
-                                    *vel,
+                                    vel,
                                     ori,
                                     body,
                                     character_state,
@@ -637,8 +676,7 @@ impl<'a> PhysicsData<'a> {
                                     mass,
                                     &fluid,
                                     GRAVITY,
-                                )
-                                .0
+                                );
                             },
                         }
                     }
@@ -679,7 +717,6 @@ impl<'a> PhysicsData<'a> {
             &read.colliders,
             positions,
             velocities,
-            orientations,
             read.bodies.maybe(),
             read.character_states.maybe(),
             &mut write.physics_states,
@@ -702,7 +739,6 @@ impl<'a> PhysicsData<'a> {
                     collider,
                     pos,
                     vel,
-                    _ori,
                     body,
                     character_state,
                     mut physics_state,
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 5174bb0330..1cd7ac6aac 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1491,7 +1491,7 @@ impl FigureMgr {
                         CharacterState::Glide(data) => {
                             anim::character::GlidingAnimation::update_skeleton(
                                 &target_base,
-                                (rel_vel, ori, data.ori.into(), time, state.acc_vel),
+                                (rel_vel, ori, data.glider.ori.into(), time, state.acc_vel),
                                 state.state_time,
                                 &mut state_animation_rate,
                                 skeleton_attr,