diff --git a/Cargo.lock b/Cargo.lock
index 03ac60355..e94e43f42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
+checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.10.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.14.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9"
+checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -47,23 +47,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.13.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "arrayvec",
  "once_cell",
  "paste",
- "windows 0.44.0",
+ "windows 0.48.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.12.4"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31"
+checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -86,17 +86,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -104,27 +93,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "alsa"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
+checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
 dependencies = [
  "alsa-sys",
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "nix 0.24.3",
 ]
@@ -141,12 +137,12 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
 dependencies = [
  "android-properties",
- "bitflags",
+ "bitflags 1.3.2",
  "cc",
  "jni-sys",
  "libc",
@@ -154,7 +150,7 @@ dependencies = [
  "ndk",
  "ndk-context",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.6.1",
 ]
 
 [[package]]
@@ -165,9 +161,9 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
 
 [[package]]
 name = "android_log-sys"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
 
 [[package]]
 name = "android_system_properties"
@@ -186,9 +182,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "approx"
@@ -199,31 +195,11 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "arboard"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
-dependencies = [
- "clipboard-win",
- "core-graphics",
- "image",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "once_cell",
- "parking_lot",
- "thiserror",
- "winapi",
- "x11rb",
-]
-
 [[package]]
 name = "arrayvec"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "ash"
@@ -231,14 +207,14 @@ version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -247,38 +223,32 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499"
 dependencies = [
  "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand",
+ "fastrand 2.0.1",
  "futures-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.4.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
+checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
 
 [[package]]
 name = "atty"
@@ -286,7 +256,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi",
  "libc",
  "winapi",
 ]
@@ -299,15 +269,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -319,58 +289,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
-name = "bevy"
-version = "0.10.1"
+name = "base64"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396"
-dependencies = [
- "bevy_internal",
-]
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
-name = "bevy-inspector-egui"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af"
-dependencies = [
- "bevy-inspector-egui-derive",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_egui",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
- "egui",
- "image",
- "once_cell",
- "pretty-type-name",
- "smallvec",
-]
-
-[[package]]
-name = "bevy-inspector-egui-derive"
-version = "0.18.1"
+name = "bevy"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35"
+checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
+ "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169"
+checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -380,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0dc19f21846ebf8ba4d96617c2517b5119038774aa5dbbaf1bff122332b359c"
+checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -391,6 +328,7 @@ dependencies = [
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
+ "bevy_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -398,13 +336,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a"
+checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_reflect",
+ "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
  "wasm-bindgen",
@@ -413,11 +352,12 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540"
+checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68"
 dependencies = [
  "anyhow",
+ "async-channel",
  "bevy_app",
  "bevy_diagnostic",
  "bevy_ecs",
@@ -428,7 +368,7 @@ dependencies = [
  "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
- "fastrand",
+ "fastrand 1.9.0",
  "js-sys",
  "notify",
  "parking_lot",
@@ -441,13 +381,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b9f9b87b0d094268ce52bb75ff346ae0054573f7acc5d66bf032e2c88f748d"
+checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749"
 dependencies = [
  "anyhow",
  "bevy_app",
  "bevy_asset",
+ "bevy_derive",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
@@ -460,9 +401,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e"
+checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -476,12 +417,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8"
+checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_core",
  "bevy_derive",
  "bevy_ecs",
  "bevy_math",
@@ -489,27 +431,27 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags",
+ "bitflags 2.4.0",
  "radsort",
  "serde",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992"
+checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34"
+checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -522,9 +464,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586"
+checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -537,39 +479,27 @@ dependencies = [
  "fixedbitset",
  "rustc-hash",
  "serde",
+ "thiserror",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78"
+checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "bevy_egui"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f"
-dependencies = [
- "arboard",
- "bevy",
- "egui",
- "thread_local",
- "webbrowser",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e"
+checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -577,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_framepace"
-version = "0.12.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1825c5a485aa2a2ffd91cc1faa1f4d621c804a893ead88cafedbe1ed6c51d34"
+checksum = "07d7576b5cd203ad30feb8df8993236599cb06b24b672d8aa904caeb278b6f87"
 dependencies = [
  "bevy",
  "spin_sleep",
@@ -587,25 +517,48 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6"
+checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
+ "bevy_log",
+ "bevy_time",
  "bevy_utils",
  "gilrs",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_gizmos"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2707632208617c3660ea7a1d2ef2ccc84b59f217c2f01a1d0abe81db4ae7bbde"
+checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41"
 dependencies = [
  "anyhow",
- "base64",
+ "base64 0.13.1",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
@@ -624,14 +577,16 @@ dependencies = [
  "bevy_utils",
  "gltf",
  "percent-encoding",
+ "serde",
+ "serde_json",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532"
+checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -644,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7"
+checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -659,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3"
+checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -674,6 +629,7 @@ dependencies = [
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_gilrs",
+ "bevy_gizmos",
  "bevy_gltf",
  "bevy_hierarchy",
  "bevy_input",
@@ -697,9 +653,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7"
+checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -713,20 +669,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9"
+checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "rustc-hash",
+ "syn 2.0.38",
  "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a"
+checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b"
 dependencies = [
  "glam",
  "serde",
@@ -734,37 +691,38 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb"
+checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_mod_billboard"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e35ebb02257425f4c9b54c4c71795ea91d78c1c1b08e9a4bdeb55eb5665dc4"
+checksum = "1461d2d757cb3ee6a8f6f5cf5589b7bf00752e2f03d633598b297b5e87f4e65b"
 dependencies = [
  "bevy",
- "bitflags",
+ "bitflags 2.4.0",
 ]
 
 [[package]]
 name = "bevy_mod_raycast"
-version = "0.8.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc98a75743120396c8f3e3b47bfeb7f3d39248c46a625972005e51ca4d110a2a"
+checksum = "75e5d9c1d97ce48b74078ff9261b4d7df3986c8f79ae48f71ab92885ecb8f04a"
 dependencies = [
  "bevy",
+ "crossbeam-channel",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27"
+checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -777,22 +735,23 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags",
+ "bitflags 2.4.0",
  "bytemuck",
+ "naga_oil",
  "radsort",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de"
+checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48"
+checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -805,28 +764,29 @@ dependencies = [
  "parking_lot",
  "serde",
  "smallvec",
+ "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad"
+checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83"
+checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -847,16 +807,18 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags",
+ "bitflags 2.4.0",
+ "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
  "futures-lite",
  "hexasphere",
  "image",
+ "js-sys",
  "ktx2",
  "naga",
- "once_cell",
+ "naga_oil",
  "parking_lot",
  "regex",
  "ruzstd",
@@ -864,27 +826,29 @@ dependencies = [
  "smallvec",
  "thiserror",
  "thread_local",
+ "wasm-bindgen",
+ "web-sys",
  "wgpu",
  "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc"
+checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631"
+checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -904,18 +868,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_screen_diagnostics"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca1cd2cc12f5ad29e7a737580d6a21fb2817733ab3fb81aa228cc94f204e63f"
+checksum = "00f51148d9ce56d2fcd677b9e99c149d2c49119d2cf4244f4c1100dfc003d288"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_sprite"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410"
+checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -928,7 +892,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags",
+ "bitflags 2.4.0",
  "bytemuck",
  "fixedbitset",
  "guillotiere",
@@ -938,24 +902,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955"
+checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
  "futures-lite",
- "once_cell",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995188f59dc06da3fc951e1f58a105cde2c817d5330ae67ddc0a140f46482f6b"
+checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -976,9 +939,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef"
+checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -991,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0"
+checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1005,9 +968,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb597aeed4e1bf5e6913879c3e22a7d50a843b822a7f71a4a80ebdfdf79e68d4"
+checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1035,14 +998,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066"
+checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7"
 dependencies = [
- "ahash 0.7.6",
+ "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown",
+ "hashbrown 0.14.1",
  "instant",
  "petgraph",
  "thiserror",
@@ -1052,20 +1015,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2"
+checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda"
+checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1079,9 +1042,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253"
+checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1092,10 +1055,10 @@ dependencies = [
  "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
+ "bevy_tasks",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "once_cell",
  "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
@@ -1104,11 +1067,11 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.68.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "cexpr",
  "clang-sys",
  "lazy_static",
@@ -1119,7 +1082,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1143,6 +1106,15 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -1170,41 +1142,41 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cast"
@@ -1214,11 +1186,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -1291,7 +1264,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -1300,9 +1273,9 @@ version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "clap_lex",
- "indexmap",
+ "indexmap 1.9.3",
  "textwrap",
 ]
 
@@ -1315,17 +1288,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "clipboard-win"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
-dependencies = [
- "error-code",
- "str-buf",
- "winapi",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1360,9 +1322,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1383,6 +1345,21 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
 
+[[package]]
+name = "const_soft_float"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
+
+[[package]]
+name = "constgebra"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
+dependencies = [
+ "const_soft_float",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1417,7 +1394,7 @@ version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
  "foreign-types",
@@ -1426,13 +1403,12 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
- "foreign-types",
  "libc",
 ]
 
@@ -1442,16 +1418,16 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation-sys 0.6.2",
  "coreaudio-sys",
 ]
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
+checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d"
 dependencies = [
  "bindgen",
 ]
@@ -1502,7 +1478,7 @@ dependencies = [
  "ciborium",
  "clap",
  "criterion-plot",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -1523,7 +1499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.10.5",
 ]
 
 [[package]]
@@ -1556,7 +1532,7 @@ dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
+ "memoffset",
  "scopeguard",
 ]
 
@@ -1575,8 +1551,8 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
- "bitflags",
- "libloading",
+ "bitflags 1.3.2",
+ "libloading 0.7.4",
  "winapi",
 ]
 
@@ -1587,13 +1563,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
-name = "debug_tools"
-version = "0.0.2"
-dependencies = [
- "bevy",
- "bevy-inspector-egui",
- "leafwing-input-manager",
-]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "derive_more"
@@ -1620,40 +1593,11 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
-[[package]]
-name = "ecolor"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "egui"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
-dependencies = [
- "ahash 0.8.3",
- "epaint",
- "nohash-hasher",
-]
-
 [[package]]
 name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "emath"
-version = "0.21.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
-dependencies = [
- "bytemuck",
-]
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "emergence_game"
@@ -1675,13 +1619,12 @@ dependencies = [
  "bevy_mod_raycast",
  "bevy_screen_diagnostics",
  "criterion",
- "debug_tools",
  "derive_more",
  "emergence_macros",
- "hashbrown",
+ "hashbrown 0.14.1",
  "hexx",
- "indexmap",
- "itertools",
+ "indexmap 1.9.3",
+ "itertools 0.10.5",
  "leafwing-input-manager",
  "leafwing_abilities",
  "noisy_bevy",
@@ -1705,9 +1648,9 @@ dependencies = [
 
 [[package]]
 name = "encase"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
+checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1717,59 +1660,39 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
+checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
+checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
-name = "epaint"
-version = "0.21.0"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
-dependencies = [
- "ab_glyph",
- "ahash 0.8.3",
- "atomic_refcell",
- "bytemuck",
- "ecolor",
- "emath",
- "nohash-hasher",
- "parking_lot",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "error-code"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
-
 [[package]]
 name = "euclid"
 version = "0.22.9"
@@ -1794,6 +1717,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.0"
@@ -1805,13 +1734,13 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall",
  "windows-sys 0.48.0",
 ]
 
@@ -1823,12 +1752,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1852,15 +1781,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -1888,7 +1808,7 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
@@ -1897,25 +1817,6 @@ dependencies = [
  "waker-fn",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1944,9 +1845,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd745b0cb1a207756e8fabacf5623066ad6aa543ea0be4bab34e897e6bbe24f9"
+checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
 dependencies = [
  "core-foundation",
  "io-kit-sys",
@@ -1954,25 +1855,25 @@ dependencies = [
  "libc",
  "libudev-sys",
  "log",
- "nix 0.26.2",
+ "nix 0.26.4",
  "uuid",
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.48.0",
+ "windows 0.51.1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "glam"
-version = "0.23.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1986,9 +1887,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -1998,9 +1899,9 @@ dependencies = [
 
 [[package]]
 name = "gltf"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fe8d5192923fbd783c15e74627de8e27c97e1e3dec22bf54515a407249febf"
+checksum = "ad2dcfb6dd7a66f9eb3d181a29dcfb22d146b0bcdc2e1ed1713cbf03939a88ea"
 dependencies = [
  "byteorder",
  "gltf-json",
@@ -2009,21 +1910,21 @@ dependencies = [
 
 [[package]]
 name = "gltf-derive"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec223c88f017861193ae128239aff8fbc4478f38a036d9d7b2ce10a52b46b1f2"
+checksum = "f2cbcea5dd47e7ad4e9ee6f040384fcd7204bbf671aa4f9e7ca7dfc9bfa1de20"
 dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "gltf-json"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1ba7523fcf32541f4aec96e13024c255d928eab3223f99ab945045f2a6de18"
+checksum = "7d5b810806b78dde4b71a95cc0e6fdcab34c4c617da3574df166f9987be97d03"
 dependencies = [
  "gltf-derive",
  "serde",
@@ -2048,7 +1949,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "gpu-alloc-types",
 ]
 
@@ -2058,7 +1959,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2076,24 +1977,30 @@ dependencies = [
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
+checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
 ]
 
+[[package]]
+name = "grid"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
+
 [[package]]
 name = "guillotiere"
 version = "0.6.2"
@@ -2115,22 +2022,29 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
- "ahash 0.7.6",
+ "ahash",
+ "allocator-api2",
  "rayon",
  "serde",
 ]
 
 [[package]]
 name = "hassle-rs"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "com-rs",
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "thiserror",
  "widestring",
  "winapi",
@@ -2145,23 +2059,14 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hexasphere"
-version = "8.1.0"
+version = "9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
+checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
 dependencies = [
+ "constgebra",
  "glam",
- "once_cell",
 ]
 
 [[package]]
@@ -2172,38 +2077,19 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "hexx"
-version = "0.7.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "640f1ca455caa01b6e7af6a636e48e62171d9910eb5e94985a8f26818fcaac87"
+checksum = "efba26523cc89cb9636d5e117cf9abebd8f1a3366deddfe392a563c018928c9b"
 dependencies = [
  "glam",
  "serde",
 ]
 
-[[package]]
-name = "home"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2211,7 +2097,6 @@ dependencies = [
  "num-rational",
  "num-traits",
  "png",
- "tiff",
 ]
 
 [[package]]
@@ -2221,7 +2106,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
@@ -2236,7 +2131,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "inotify-sys",
  "libc",
 ]
@@ -2281,11 +2176,20 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jni"
@@ -2315,22 +2219,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
@@ -2339,19 +2227,13 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-
 [[package]]
 name = "js-sys"
 version = "0.3.64"
@@ -2368,15 +2250,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "pkg-config",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -2384,11 +2266,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
 ]
 
@@ -2398,7 +2280,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2415,14 +2297,14 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "leafwing-input-manager"
-version = "0.9.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca8bb439a17e3a964829170cd0252ad54d25a22cb9eb07ec888a7c923d94e05"
+checksum = "b56a6f71e8f5beefc8d3841ffa6ea9bbb1123956fa7c75fd673e69b65a8ca62f"
 dependencies = [
  "bevy",
  "derive_more",
  "fixedbitset",
- "itertools",
+ "itertools 0.11.0",
  "leafwing_input_manager_macros",
  "once_cell",
  "petitset",
@@ -2431,9 +2313,9 @@ dependencies = [
 
 [[package]]
 name = "leafwing_abilities"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6c0475e3676c4d0d31e61020c756b79b262484a87e76caef368128c0148338c"
+checksum = "1930cd3cba93e895a3837965c9591c600eddd09c703d90a289c663413747c8f6"
 dependencies = [
  "bevy",
  "derive_more",
@@ -2480,9 +2362,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
@@ -2494,11 +2376,21 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libudev-sys"
@@ -2522,9 +2414,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "mach2"
@@ -2550,23 +2442,14 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -2583,7 +2466,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -2597,15 +2480,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -2630,18 +2504,17 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.11.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
 dependencies = [
  "bit-set",
- "bitflags",
+ "bitflags 1.3.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap",
+ "indexmap 1.9.3",
  "log",
  "num-traits",
- "petgraph",
  "pp-rs",
  "rustc-hash",
  "spirv",
@@ -2650,16 +2523,36 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "naga_oil"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
+dependencies = [
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap 1.9.3",
+ "naga",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.6.29",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "unicode-ident",
+]
+
 [[package]]
 name = "ndk"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.5.11",
  "raw-window-handle",
  "thiserror",
 ]
@@ -2685,35 +2578,27 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.6.5",
 ]
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "static_assertions",
 ]
 
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
 [[package]]
 name = "noisy_bevy"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c1cf42b345c23c91f034e11750156005a9d154cc8a3d0d73a68b9a092af45ac"
+checksum = "5764cd2689c1d998b3c79ab1b6c4dcb0faae31c407e652b4a87d11416eb4018c"
 dependencies = [
  "bevy",
 ]
@@ -2730,20 +2615,21 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.2.0"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
+ "log",
  "mio",
  "walkdir",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2799,31 +2685,30 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.15.0"
+name = "num_enum"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "hermit-abi 0.2.6",
- "libc",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.6.1",
 ]
 
 [[package]]
@@ -2839,24 +2724,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "objc"
-version = "0.2.7"
+name = "num_enum_derive"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
- "malloc_buf",
- "objc_exception",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
 ]
 
 [[package]]
-name = "objc-foundation"
-version = "0.1.1"
+name = "objc"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
- "block",
- "objc",
- "objc_id",
+ "malloc_buf",
+ "objc_exception",
 ]
 
 [[package]]
@@ -2894,20 +2780,11 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
 [[package]]
 name = "object"
-version = "0.30.4"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -2958,11 +2835,11 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "orbclient"
-version = "0.3.45"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
 dependencies = [
- "redox_syscall 0.3.5",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -2988,9 +2865,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
 
 [[package]]
 name = "parking_lot"
@@ -3010,16 +2887,16 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "peeking_take_while"
@@ -3035,12 +2912,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 2.0.2",
 ]
 
 [[package]]
@@ -3054,9 +2931,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pkg-config"
@@ -3066,9 +2943,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plotters"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -3079,30 +2956,30 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "png"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3120,12 +2997,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "pretty-type-name"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -3138,24 +3009,24 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.8"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3220,9 +3091,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -3230,14 +3101,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -3246,33 +3115,25 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.1",
+ "regex-syntax 0.8.1",
 ]
 
 [[package]]
@@ -3284,6 +3145,17 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.1",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -3292,15 +3164,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "rodio"
@@ -3314,13 +3186,14 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64",
- "bitflags",
+ "base64 0.21.4",
+ "bitflags 2.4.0",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -3346,19 +3219,20 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100"
+checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
 dependencies = [
  "byteorder",
+ "thiserror-core",
  "twox-hash",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "same-file"
@@ -3371,41 +3245,41 @@ dependencies = [
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.97"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -3414,30 +3288,30 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -3453,9 +3327,18 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
 dependencies = [
  "serde",
 ]
@@ -3476,7 +3359,7 @@ version = "0.2.0+1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "num-traits",
 ]
 
@@ -3486,12 +3369,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "svg_fmt"
 version = "0.4.1"
@@ -3511,9 +3388,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3522,9 +3399,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.28.4"
+version = "0.29.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
+checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5"
 dependencies = [
  "cfg-if",
  "core-foundation-sys 0.8.4",
@@ -3536,20 +3413,21 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.3.12"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3540ec65df399929a04a485feb50144475735920cc47eaf8eba09c70b1df4055"
+checksum = "c488aa2bf4bb0cafed312e0876b79a591e3cfa47391f842b7198f9a56547561b"
 dependencies = [
  "arrayvec",
+ "grid",
  "num-traits",
  "slotmap",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
 dependencies = [
  "winapi-util",
 ]
@@ -3562,22 +3440,42 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
+[[package]]
+name = "thiserror-core"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
+dependencies = [
+ "thiserror-core-impl",
+]
+
+[[package]]
+name = "thiserror-core-impl"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3590,17 +3488,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tiff"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
-dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
-]
-
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -3628,17 +3515,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.10"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.2",
  "toml_datetime",
  "winnow",
 ]
@@ -3657,13 +3544,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3718,9 +3605,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.19.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746"
+checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
 
 [[package]]
 name = "twox-hash"
@@ -3732,32 +3619,17 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -3765,22 +3637,11 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "url"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
 [[package]]
 name = "uuid"
-version = "1.3.4"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
  "getrandom",
  "serde",
@@ -3806,15 +3667,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -3847,7 +3708,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -3881,7 +3742,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3913,34 +3774,11 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webbrowser"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6"
-dependencies = [
- "core-foundation",
- "home",
- "jni 0.21.1",
- "log",
- "ndk-context",
- "objc",
- "raw-window-handle",
- "url",
- "web-sys",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-
 [[package]]
 name = "wgpu"
-version = "0.15.1"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
 dependencies = [
  "arrayvec",
  "cfg-if",
@@ -3962,20 +3800,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags",
+ "bitflags 2.4.0",
  "codespan-reporting",
- "fxhash",
  "log",
  "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -3985,20 +3823,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.15.4"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags",
+ "bitflags 2.4.0",
  "block",
  "core-graphics-types",
  "d3d12",
  "foreign-types",
- "fxhash",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -4007,7 +3844,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading",
+ "libloading 0.8.1",
  "log",
  "metal",
  "naga",
@@ -4017,6 +3854,7 @@ dependencies = [
  "range-alloc",
  "raw-window-handle",
  "renderdoc-sys",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
@@ -4027,20 +3865,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "js-sys",
  "web-sys",
 ]
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -4060,18 +3898,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -4088,8 +3917,6 @@ version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
 dependencies = [
- "windows-implement",
- "windows-interface",
  "windows-targets 0.42.2",
 ]
 
@@ -4108,14 +3935,35 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.44.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4124,9 +3972,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.44.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4148,7 +3996,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4168,17 +4016,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -4189,9 +4037,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4201,9 +4049,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4213,9 +4061,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4225,9 +4073,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4237,9 +4085,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4249,9 +4097,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4261,18 +4109,18 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winit"
-version = "0.28.6"
+version = "0.28.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg_aliases",
  "core-foundation",
  "core-graphics",
@@ -4287,7 +4135,7 @@ dependencies = [
  "orbclient",
  "percent-encoding",
  "raw-window-handle",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "wasm-bindgen",
  "wayland-scanner",
  "web-sys",
@@ -4297,9 +4145,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.4.7"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
 dependencies = [
  "memchr",
 ]
@@ -4315,28 +4163,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
-dependencies = [
- "gethostname",
- "nix 0.24.3",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
-dependencies = [
- "nix 0.24.3",
-]
-
 [[package]]
 name = "xi-unicode"
 version = "0.3.0"
@@ -4345,21 +4171,21 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.14"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
 
 [[package]]
 name = "xshell"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962c039b3a7b16cf4e9a4248397c6585c07547412e7d6a6e035389a802dcfe90"
+checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad"
 dependencies = [
  "xshell-macros",
 ]
 
 [[package]]
 name = "xshell-macros"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c"
+checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e"
diff --git a/Cargo.toml b/Cargo.toml
index 35b1c34c8..efc3193b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,7 @@
 [workspace]
 resolver = "2"
 
-members = [
-    "emergence_game",
-    "emergence_lib",
-    "emergence_macros",
-    "tools/ci",
-    "tools/debug_tools",
-]
+members = ["emergence_game", "emergence_lib", "emergence_macros", "tools/ci"]
 default-members = ["emergence_game", "emergence_lib"]
 
 # Enable max optimizations for dependencies, but not for our code:
diff --git a/emergence_game/Cargo.toml b/emergence_game/Cargo.toml
index 3afbd5b19..08078905c 100644
--- a/emergence_game/Cargo.toml
+++ b/emergence_game/Cargo.toml
@@ -11,6 +11,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.10"
-bevy_framepace = "0.12.0"
+bevy = "0.11"
+bevy_framepace = "0.13.0"
 emergence_lib = { path = "../emergence_lib", version = "0.1.0" }
diff --git a/emergence_game/src/main.rs b/emergence_game/src/main.rs
index c7975b118..f70818e4e 100644
--- a/emergence_game/src/main.rs
+++ b/emergence_game/src/main.rs
@@ -15,13 +15,13 @@ fn main() {
             ..Default::default()
         }))
         // This is turned on and off in the world gen state management code.
-        .add_plugin(FramepacePlugin)
-        .add_plugin(emergence_lib::asset_management::AssetManagementPlugin)
-        .add_plugin(emergence_lib::simulation::SimulationPlugin {
+        .add_plugins(FramepacePlugin)
+        .add_plugins(emergence_lib::asset_management::AssetManagementPlugin)
+        .add_plugins(emergence_lib::simulation::SimulationPlugin {
             gen_config: GenerationConfig::standard(),
         })
-        .add_plugin(emergence_lib::player_interaction::InteractionPlugin)
-        .add_plugin(emergence_lib::graphics::GraphicsPlugin)
-        .add_plugin(emergence_lib::ui::UiPlugin)
+        .add_plugins(emergence_lib::player_interaction::InteractionPlugin)
+        .add_plugins(emergence_lib::graphics::GraphicsPlugin)
+        .add_plugins(emergence_lib::ui::UiPlugin)
         .run();
 }
diff --git a/emergence_lib/Cargo.toml b/emergence_lib/Cargo.toml
index 2b2b55704..983f15ffc 100644
--- a/emergence_lib/Cargo.toml
+++ b/emergence_lib/Cargo.toml
@@ -7,33 +7,30 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-# If this feature is enabled, egui will have priority over actions when processing inputs
-debug_tools = ['dep:debug_tools']
-
 [dependencies]
-bevy = "0.10"
-bevy_mod_billboard = "0.3"
-rand = { version="0.8", features=["small_rng"] }
+bevy = "0.11"
+bevy_mod_billboard = "0.4"
+rand = { version = "0.8", features = ["small_rng"] }
 rand_distr = "0.4"
-noisy_bevy = "0.3"
-leafwing-input-manager = "0.9"
+noisy_bevy = "0.4"
+leafwing-input-manager = "0.10"
 emergence_macros = { path = "../emergence_macros", version = "0.6" }
 indexmap = "1.9"
-debug_tools = { path = "../tools/debug_tools", optional = true }
 petitset = "0.2"
-serde = "1.0.152"
-leafwing_abilities = "0.4.0"
+serde = "1.0"
+leafwing_abilities = "0.5.0"
 derive_more = "0.99.17"
-hexx = { version = "0.7", features = ["ser_de"] }
-bevy_mod_raycast = "0.8"
+hexx = { version = "0.10", features = ["ser_de"] }
+bevy_mod_raycast = "0.14"
 itertools = "0.10.5"
-bevy_screen_diagnostics = "0.2"
+bevy_screen_diagnostics = "0.3"
 anyhow = "1.0.69"
 serde_json = "1.0.94"
-hashbrown = { version = "0.12", features = ["rayon"] }
+# This must match the version specified in the bevy_utils crate
+# See: https://crates.io/crates/bevy_utils/dependencies
+hashbrown = { version = "0.14", features = ["rayon"] }
 rayon = "1.7.0"
-bevy_framepace = "0.12.0"
+bevy_framepace = "0.13.0"
 
 [dev-dependencies]
 criterion = "0.4"
diff --git a/emergence_lib/benches/water.rs b/emergence_lib/benches/water.rs
index 444f32978..cff17cbbd 100644
--- a/emergence_lib/benches/water.rs
+++ b/emergence_lib/benches/water.rs
@@ -43,15 +43,13 @@ fn criterion_benchmark(c: &mut Criterion) {
     app.insert_resource(InGameTime::default());
     app.insert_resource(FixedTime::new(Duration::from_secs_f32(1. / 30.)));
 
-    app.add_system(update_water_depth);
+    app.add_systems(FixedUpdate, update_water_depth);
     // Run once to make sure system caches are populated
     app.update();
 
     c.bench_function("compute_water_depth", |b| b.iter(|| app.update()));
 
-    let mut schedule = Schedule::default();
-    schedule.add_system(horizontal_water_movement);
-    app.world.add_schedule(schedule, CoreSchedule::Outer);
+    app.add_systems(FixedUpdate, horizontal_water_movement);
 
     c.bench_function("lateral_water_movement", |b| b.iter(|| app.update()));
 }
diff --git a/emergence_lib/src/asset_management/manifest/identifier.rs b/emergence_lib/src/asset_management/manifest/identifier.rs
index 3a9a45173..d7c7c56a6 100644
--- a/emergence_lib/src/asset_management/manifest/identifier.rs
+++ b/emergence_lib/src/asset_management/manifest/identifier.rs
@@ -78,7 +78,7 @@ impl<T> Eq for Id<T> {}
 
 impl<T> PartialOrd for Id<T> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.value.partial_cmp(&other.value)
+        Some(self.cmp(other))
     }
 }
 
@@ -96,10 +96,7 @@ impl<T> Hash for Id<T> {
 
 impl<T> Clone for Id<T> {
     fn clone(&self) -> Self {
-        Self {
-            value: self.value,
-            _phantom: PhantomData,
-        }
+        *self
     }
 }
 
diff --git a/emergence_lib/src/asset_management/manifest/loader.rs b/emergence_lib/src/asset_management/manifest/loader.rs
index fb9082bde..66c42d097 100644
--- a/emergence_lib/src/asset_management/manifest/loader.rs
+++ b/emergence_lib/src/asset_management/manifest/loader.rs
@@ -7,6 +7,7 @@ use std::{
 
 use bevy::{
     asset::{AssetLoader, LoadContext, LoadedAsset},
+    reflect::TypePath,
     utils::BoxedFuture,
 };
 
@@ -19,7 +20,7 @@ use super::Manifest;
 ///
 /// The processing will primarily remove the string IDs and replace them by numbers.
 pub trait IsRawManifest:
-    std::fmt::Debug + TypeUuid + Send + Sync + for<'de> Deserialize<'de> + 'static
+    std::fmt::Debug + TypePath + TypeUuid + Send + Sync + for<'de> Deserialize<'de> + 'static
 {
     /// The file extension of this manifest type.
     ///
@@ -80,7 +81,7 @@ where
 {
     fn default() -> Self {
         Self {
-            _phantom_manifest: PhantomData::default(),
+            _phantom_manifest: PhantomData,
         }
     }
 }
diff --git a/emergence_lib/src/asset_management/manifest/plugin.rs b/emergence_lib/src/asset_management/manifest/plugin.rs
index cbcead4ac..6e5dde668 100644
--- a/emergence_lib/src/asset_management/manifest/plugin.rs
+++ b/emergence_lib/src/asset_management/manifest/plugin.rs
@@ -2,7 +2,7 @@
 
 use std::marker::PhantomData;
 
-use bevy::prelude::*;
+use bevy::{prelude::*, reflect::TypePath};
 
 use crate::asset_management::{AssetCollectionExt, AssetState, Loadable};
 
@@ -27,7 +27,7 @@ where
     /// Create a new raw manifest plugin.
     pub(crate) fn new() -> Self {
         Self {
-            _phantom_data: PhantomData::default(),
+            _phantom_data: PhantomData,
         }
     }
 }
@@ -46,12 +46,12 @@ where
         app.init_asset_loader::<RawManifestLoader<M>>()
             .add_asset::<M>()
             .add_asset_collection::<RawManifestHandle<M>>()
-            .add_system(
-                detect_manifest_creation::<M>
-                    .in_set(DetectManifestCreationSet)
-                    .in_schedule(OnExit(AssetState::LoadManifests)),
+            .add_systems(
+                OnExit(AssetState::LoadManifests),
+                detect_manifest_creation::<M>.in_set(DetectManifestCreationSet),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 detect_manifest_modification::<M>
                     .run_if(resource_exists::<Manifest<M::Marker, M::Data>>()),
             );
@@ -62,7 +62,7 @@ where
 ///
 /// This is necessary to stop the asset from being discarded.
 #[derive(Debug, Clone, Resource)]
-pub struct RawManifestHandle<M>
+pub struct RawManifestHandle<M: TypePath>
 where
     M: IsRawManifest,
 {
@@ -72,7 +72,7 @@ where
     handle: Handle<M>,
 }
 
-impl<M> Loadable for RawManifestHandle<M>
+impl<M: TypePath> Loadable for RawManifestHandle<M>
 where
     M: IsRawManifest,
 {
@@ -95,7 +95,7 @@ where
 }
 
 /// Wait for the manifest to be fully loaded and then process it.
-pub fn detect_manifest_creation<M>(
+pub fn detect_manifest_creation<M: TypePath>(
     mut commands: Commands,
     raw_manifest_handle: Res<RawManifestHandle<M>>,
     raw_manifests: Res<Assets<M>>,
@@ -103,7 +103,10 @@ pub fn detect_manifest_creation<M>(
     M: IsRawManifest,
 {
     let Some(raw_manifest) = raw_manifests.get(&raw_manifest_handle.handle) else {
-        error!("Raw manifest for {} created, but asset not available!", M::path().display());
+        error!(
+            "Raw manifest for {} created, but asset not available!",
+            M::path().display()
+        );
         return;
     };
 
@@ -114,7 +117,7 @@ pub fn detect_manifest_creation<M>(
 }
 
 /// Update the manifest after the asset has been changed.
-fn detect_manifest_modification<M>(
+fn detect_manifest_modification<M: TypePath>(
     mut ev_asset: EventReader<AssetEvent<M>>,
     raw_manifests: Res<Assets<M>>,
     mut manifest: ResMut<Manifest<M::Marker, M::Data>>,
diff --git a/emergence_lib/src/asset_management/mod.rs b/emergence_lib/src/asset_management/mod.rs
index be6659544..187433e7d 100644
--- a/emergence_lib/src/asset_management/mod.rs
+++ b/emergence_lib/src/asset_management/mod.rs
@@ -31,14 +31,19 @@ impl Plugin for AssetManagementPlugin {
     fn build(&self, app: &mut App) {
         app.add_state::<AssetState>()
             .init_resource::<AssetsToLoad>()
-            .add_system(check_manifests_loaded.run_if(in_state(AssetState::LoadManifests)))
-            .add_system(check_assets_loaded.run_if(in_state(AssetState::LoadAssets)))
+            .add_systems(
+                Update,
+                check_manifests_loaded.run_if(in_state(AssetState::LoadManifests)),
+            )
+            .add_systems(
+                Update,
+                check_assets_loaded.run_if(in_state(AssetState::LoadAssets)),
+            )
             // This is needed to ensure that the manifest resources are actually created in time for AssetState::Loading
             // BLOCKED: this can be removed in Bevy 0.11, as schedules will automatically flush the commands.
-            .add_system(
-                apply_system_buffers
-                    .after(DetectManifestCreationSet)
-                    .in_schedule(OnExit(AssetState::LoadManifests)),
+            .add_systems(
+                OnExit(AssetState::LoadManifests),
+                apply_deferred.after(DetectManifestCreationSet),
             );
     }
 }
@@ -166,11 +171,12 @@ impl AssetCollectionExt for App {
         info!("Adding asset collection: {}", std::any::type_name::<T>());
 
         // Begin the loading process
-        self.add_system(T::initialize.in_schedule(OnEnter(T::STAGE)));
-        self.add_system(T::register_assets_to_load.in_schedule(OnEnter(T::STAGE)));
-
+        self.add_systems(
+            OnEnter(T::STAGE),
+            (T::initialize, T::register_assets_to_load),
+        );
         // Poll each asset collection
-        self.add_system(T::check_loaded.run_if(in_state(T::STAGE)));
+        self.add_systems(Update, T::check_loaded.run_if(in_state(T::STAGE)));
 
         self
     }
diff --git a/emergence_lib/src/construction/ghosts.rs b/emergence_lib/src/construction/ghosts.rs
index 54250dc98..6013ccd19 100644
--- a/emergence_lib/src/construction/ghosts.rs
+++ b/emergence_lib/src/construction/ghosts.rs
@@ -38,13 +38,13 @@ pub struct GhostPlugin;
 impl Plugin for GhostPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<GhostHandles>().add_systems(
+            FixedUpdate,
             (
                 validate_ghost_structures,
                 ghost_structure_signals.after(validate_ghost_structures),
                 ghost_structure_lifecycle.after(validate_ghost_structures),
             )
-                .in_set(SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+                .in_set(SimulationSet),
         );
     }
 }
@@ -76,7 +76,7 @@ impl FromWorld for GhostHandles {
 }
 
 /// A marker component that indicates that a structure or terrain element is planned to be built, rather than actually existing.
-#[derive(Reflect, FromReflect, Component, Clone, Copy, Debug)]
+#[derive(Reflect, Component, Clone, Copy, Debug)]
 pub(crate) struct Ghost;
 
 /// A marker component indicating that this structure should be rendered in a transparent style.
diff --git a/emergence_lib/src/construction/mod.rs b/emergence_lib/src/construction/mod.rs
index fbbfc7397..9f1c1d426 100644
--- a/emergence_lib/src/construction/mod.rs
+++ b/emergence_lib/src/construction/mod.rs
@@ -23,19 +23,18 @@ pub(crate) struct ConstructionPlugin;
 
 impl Plugin for ConstructionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ghosts::GhostPlugin)
-            .add_plugin(zoning::ZoningPlugin)
+        app.add_plugins(ghosts::GhostPlugin)
+            .add_plugins(zoning::ZoningPlugin)
             // Must run after crafting emitters in order to wipe out their signals
-            .add_system(
+            .add_systems(
+                FixedUpdate,
                 set_emitter_for_structures_to_be_demolished
                     .after(crate::crafting::set_crafting_emitter)
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                    .in_set(SimulationSet),
             )
             .add_systems(
-                (terraforming_lifecycle, terraforming_signals)
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                FixedUpdate,
+                (terraforming_lifecycle, terraforming_signals).in_set(SimulationSet),
             );
     }
 }
diff --git a/emergence_lib/src/construction/terraform.rs b/emergence_lib/src/construction/terraform.rs
index 3a09fa9a7..f9a0e4fdf 100644
--- a/emergence_lib/src/construction/terraform.rs
+++ b/emergence_lib/src/construction/terraform.rs
@@ -227,7 +227,7 @@ struct TerraformCommand {
 }
 
 impl Command for TerraformCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let map_geometry = world.resource::<MapGeometry>();
         let starting_height = map_geometry.get_height(self.hex).unwrap();
         let final_height = self.action.final_height(starting_height);
@@ -299,7 +299,7 @@ struct CancelTerraformCommand {
 }
 
 impl Command for CancelTerraformCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let map_geometry = world.resource::<MapGeometry>();
         let terrain_entity = map_geometry.get_terrain(self.hex).unwrap();
         let mut terraforming_action = world.get_mut::<TerraformingAction>(terrain_entity).unwrap();
@@ -326,7 +326,7 @@ struct ApplyTerraformingCommand {
 }
 
 impl Command for ApplyTerraformingCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         // Just using system state makes satisfying the borrow checker a lot easier
         let mut system_state = SystemState::<(
             ResMut<MapGeometry>,
diff --git a/emergence_lib/src/construction/zoning.rs b/emergence_lib/src/construction/zoning.rs
index 10fd4e9c1..53a94225a 100644
--- a/emergence_lib/src/construction/zoning.rs
+++ b/emergence_lib/src/construction/zoning.rs
@@ -22,13 +22,14 @@ pub(super) struct ZoningPlugin;
 impl Plugin for ZoningPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
+            Update,
             (mark_for_demolition, set_zoning)
                 .in_set(InteractionSystem::ApplyZoning)
                 .in_set(PlayerModifiesWorld)
                 .after(InteractionSystem::SelectTiles)
                 .after(InteractionSystem::SetClipboard),
         )
-        .add_system(cleanup_previews.after(set_zoning));
+        .add_systems(Update, cleanup_previews.after(set_zoning));
     }
 }
 
diff --git a/emergence_lib/src/crafting/mod.rs b/emergence_lib/src/crafting/mod.rs
index 5b2af1f03..bcaada31a 100644
--- a/emergence_lib/src/crafting/mod.rs
+++ b/emergence_lib/src/crafting/mod.rs
@@ -40,9 +40,10 @@ pub(crate) struct CraftingPlugin;
 
 impl Plugin for CraftingPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ManifestPlugin::<RawItemManifest>::new())
-            .add_plugin(ManifestPlugin::<RawRecipeManifest>::new())
+        app.add_plugins(ManifestPlugin::<RawItemManifest>::new())
+            .add_plugins(ManifestPlugin::<RawRecipeManifest>::new())
             .add_systems(
+                FixedUpdate,
                 (
                     progress_crafting,
                     gain_energy_when_crafting_completes.after(progress_crafting),
@@ -53,8 +54,7 @@ impl Plugin for CraftingPlugin {
                     set_storage_emitter.before(InteractionSystem::ApplyZoning),
                     clear_empty_storage_slots,
                 )
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                    .in_set(SimulationSet),
             );
     }
 }
diff --git a/emergence_lib/src/crafting/recipe.rs b/emergence_lib/src/crafting/recipe.rs
index 06af4fa97..7336c9a36 100644
--- a/emergence_lib/src/crafting/recipe.rs
+++ b/emergence_lib/src/crafting/recipe.rs
@@ -11,7 +11,7 @@ use crate::{
     organisms::energy::Energy,
 };
 use bevy::prelude::*;
-use bevy::reflect::{FromReflect, Reflect, TypeUuid};
+use bevy::reflect::{Reflect, TypePath, TypeUuid};
 use bevy::utils::HashMap;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -20,7 +20,7 @@ use std::{fmt::Display, time::Duration};
 use super::item_tags::ItemTag;
 
 /// The marker type for [`Id<Recipe>`](super::Id).
-#[derive(Reflect, FromReflect, Clone, Copy, PartialEq, Eq)]
+#[derive(Reflect, Clone, Copy, PartialEq, Eq)]
 pub struct Recipe;
 
 /// Stores the read-only definitions for all recipes.
@@ -373,7 +373,7 @@ impl<T: Display + PartialOrd> Display for Threshold<T> {
 }
 
 /// The [`RecipeManifest`] as seen in the manifest file.
-#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, TypePath, PartialEq)]
 #[uuid = "c711b30c-c3ff-4b86-92d0-f1aff2ec7818"]
 pub struct RawRecipeManifest {
     /// The data for each item.
diff --git a/emergence_lib/src/enum_iter.rs b/emergence_lib/src/enum_iter.rs
index 3993c6837..c9e4187b6 100644
--- a/emergence_lib/src/enum_iter.rs
+++ b/emergence_lib/src/enum_iter.rs
@@ -33,7 +33,7 @@ pub struct EnumIter<A: IterableEnum> {
     index: usize,
     /// Marker used to keep track of which `IterableEnum` this `EnumIter` iterates through.
     ///
-    /// For more information, see [`PhantomData`](std::marker::PhantomData).
+    /// For more information, see [`PhantomData`].
     _phantom: PhantomData<A>,
 }
 
@@ -61,7 +61,7 @@ impl<A: IterableEnum> Default for EnumIter<A> {
     fn default() -> Self {
         EnumIter {
             index: 0,
-            _phantom: PhantomData::default(),
+            _phantom: PhantomData,
         }
     }
 }
diff --git a/emergence_lib/src/geometry/indexing.rs b/emergence_lib/src/geometry/indexing.rs
index bd389a96c..7b2ccdef0 100644
--- a/emergence_lib/src/geometry/indexing.rs
+++ b/emergence_lib/src/geometry/indexing.rs
@@ -595,7 +595,9 @@ impl MapGeometry {
             return;
         }
 
-        let Some(litter_entity) = self.remove_litter(*original_voxel_pos) else { return; };
+        let Some(litter_entity) = self.remove_litter(*original_voxel_pos) else {
+            return;
+        };
         let final_voxel_pos = self.find_litter_location(proposed_voxel_pos);
 
         self.add_litter(final_voxel_pos, InventoryState::Full, litter_entity)
diff --git a/emergence_lib/src/geometry/mod.rs b/emergence_lib/src/geometry/mod.rs
index ce40d6bba..ff873c878 100644
--- a/emergence_lib/src/geometry/mod.rs
+++ b/emergence_lib/src/geometry/mod.rs
@@ -21,4 +21,6 @@ pub(crate) const MAP_LAYOUT: HexLayout = HexLayout {
     orientation: hexx::HexOrientation::Flat,
     origin: hexx::Vec2::ZERO,
     hex_size: hexx::Vec2::ONE,
+    invert_x: false,
+    invert_y: false,
 };
diff --git a/emergence_lib/src/graphics/atmosphere.rs b/emergence_lib/src/graphics/atmosphere.rs
index 1f14d4f70..e23c12392 100644
--- a/emergence_lib/src/graphics/atmosphere.rs
+++ b/emergence_lib/src/graphics/atmosphere.rs
@@ -12,7 +12,7 @@ pub(super) struct AtmospherePlugin;
 
 impl Plugin for AtmospherePlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(animate_sky_color);
+        app.add_systems(Update, animate_sky_color);
     }
 }
 
@@ -25,7 +25,15 @@ fn animate_sky_color(
     clear_color.0 = match in_game_time.time_of_day() {
         TimeOfDay::Day => weather.get().sky_color(),
         TimeOfDay::Night => {
-            let Color::Hsla { hue, saturation, lightness, alpha } = weather.get().sky_color() else { panic!("Expected HSL color") };
+            let Color::Hsla {
+                hue,
+                saturation,
+                lightness,
+                alpha,
+            } = weather.get().sky_color()
+            else {
+                panic!("Expected HSL color")
+            };
             Color::Hsla {
                 hue,
                 saturation,
diff --git a/emergence_lib/src/graphics/lighting.rs b/emergence_lib/src/graphics/lighting.rs
index d53dadbe5..0ef4a4071 100644
--- a/emergence_lib/src/graphics/lighting.rs
+++ b/emergence_lib/src/graphics/lighting.rs
@@ -19,8 +19,8 @@ impl Plugin for LightingPlugin {
             color: LIGHT_STARS,
         })
         // Need to wait for the player camera to spawn
-        .add_startup_system(spawn_celestial_bodies.in_base_set(StartupSet::PostStartup))
-        .add_systems((animate_celestial_body_transform,));
+        .add_systems(PostStartup, spawn_celestial_bodies)
+        .add_systems(Update, (animate_celestial_body_transform,));
     }
 }
 
diff --git a/emergence_lib/src/graphics/mod.rs b/emergence_lib/src/graphics/mod.rs
index cb4349be1..78798e77d 100644
--- a/emergence_lib/src/graphics/mod.rs
+++ b/emergence_lib/src/graphics/mod.rs
@@ -29,16 +29,15 @@ struct GraphicsSet;
 
 impl Plugin for GraphicsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(LightingPlugin)
-            .add_plugin(AtmospherePlugin)
-            .add_plugin(WaterRenderingPlugin)
-            .add_plugin(OverlayPlugin)
-            .add_system(render_litter_piles.in_set(GraphicsSet))
+        app.add_plugins(LightingPlugin)
+            .add_plugins(AtmospherePlugin)
+            .add_plugins(WaterRenderingPlugin)
+            .add_plugins(OverlayPlugin)
+            .add_systems(Update, render_litter_piles.in_set(GraphicsSet))
             // Run these after Update to avoid panics due to despawned entities
-            .add_systems(
-                (inherit_materials, remove_ghostly_shadows).in_base_set(CoreSet::PostUpdate),
-            )
+            .add_systems(PostUpdate, (inherit_materials, remove_ghostly_shadows))
             .configure_set(
+                Update,
                 GraphicsSet
                     .run_if(in_state(AssetState::FullyLoaded))
                     .run_if(in_state(WorldGenState::Complete)),
diff --git a/emergence_lib/src/graphics/overlay.rs b/emergence_lib/src/graphics/overlay.rs
index dc599b77f..86b7ae785 100644
--- a/emergence_lib/src/graphics/overlay.rs
+++ b/emergence_lib/src/graphics/overlay.rs
@@ -7,6 +7,7 @@ use crate::{
     geometry::Volume,
     graphics::palette::infovis::{NEUTRAL_INFOVIS_COLOR, OVERLAY_ALPHA},
     light::{shade::ReceivedLight, Illuminance},
+    terrain::terrain_manifest::TerrainManifest,
     water::FlowVelocity,
 };
 use bevy::{
@@ -36,6 +37,7 @@ impl Plugin for OverlayPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<TileOverlay>()
             .add_systems(
+                Update,
                 (
                     set_overlay_material,
                     set_overlay_height,
@@ -45,10 +47,9 @@ impl Plugin for OverlayPlugin {
                 )
                     .in_set(GraphicsSet),
             )
-            .add_system(
-                spawn_overlay_entities
-                    .in_base_set(CoreSet::PreUpdate)
-                    .in_set(GraphicsSet),
+            .add_systems(
+                Update,
+                spawn_overlay_entities.run_if(resource_exists::<TerrainManifest>()),
             );
     }
 }
@@ -207,13 +208,25 @@ fn generate_color_gradient(color_low: Color, color_high: Color, n_steps: usize)
         // Linearly interpolate the colors in the color ramp between SIGNAL_OVERLAY_LOW and SIGNAL_OVERLAY_HIGH
         // Make sure to use HSLA colorspace to avoid weird artifacts
         let t = i as f32 / (n_steps - 1) as f32;
-        let Color::Hsla { hue: low_hue, saturation: low_saturation, lightness: low_lightness, alpha: low_alpha } = color_low else {
-         panic!("Expected HSLA color for `color_low`");
-    };
+        let Color::Hsla {
+            hue: low_hue,
+            saturation: low_saturation,
+            lightness: low_lightness,
+            alpha: low_alpha,
+        } = color_low
+        else {
+            panic!("Expected HSLA color for `color_low`");
+        };
 
-        let Color::Hsla { hue: high_hue, saturation: high_saturation, lightness: high_lightness, alpha: high_alpha } = color_high else {
-        panic!("Expected HSLA color for `color_high`");
-    };
+        let Color::Hsla {
+            hue: high_hue,
+            saturation: high_saturation,
+            lightness: high_lightness,
+            alpha: high_alpha,
+        } = color_high
+        else {
+            panic!("Expected HSLA color for `color_high`");
+        };
 
         let hue = low_hue * (1.0 - t) + high_hue * t;
         let saturation = low_saturation * (1.0 - t) + high_saturation * t;
diff --git a/emergence_lib/src/graphics/water.rs b/emergence_lib/src/graphics/water.rs
index d3069abc5..7633ca171 100644
--- a/emergence_lib/src/graphics/water.rs
+++ b/emergence_lib/src/graphics/water.rs
@@ -14,8 +14,8 @@ pub(super) struct WaterRenderingPlugin;
 
 impl Plugin for WaterRenderingPlugin {
     fn build(&self, app: &mut App) {
-        app.add_startup_system(init_water_handles)
-            .add_system(render_water.in_set(GraphicsSet));
+        app.add_systems(Startup, init_water_handles)
+            .add_systems(Update, render_water.in_set(GraphicsSet));
     }
 }
 
diff --git a/emergence_lib/src/items/item_manifest.rs b/emergence_lib/src/items/item_manifest.rs
index c34409ccc..bcb4bd539 100644
--- a/emergence_lib/src/items/item_manifest.rs
+++ b/emergence_lib/src/items/item_manifest.rs
@@ -1,7 +1,7 @@
 //! Defines write-only data for each variety of item.
 
 use bevy::{
-    reflect::{FromReflect, Reflect, TypeUuid},
+    reflect::{Reflect, TypePath, TypeUuid},
     utils::HashMap,
 };
 use serde::{Deserialize, Serialize};
@@ -13,7 +13,7 @@ use crate::{
 };
 
 /// The marker type for [`Id<Item>`](super::Id).
-#[derive(Reflect, FromReflect, Clone, Copy, PartialEq, Eq)]
+#[derive(Reflect, Clone, Copy, PartialEq, Eq)]
 pub struct Item;
 /// Stores the read-only definitions for all items.
 pub type ItemManifest = Manifest<Item, ItemData>;
@@ -131,7 +131,7 @@ impl From<RawItemData> for ItemData {
 }
 
 /// The [`ItemManifest`] as seen in the manifest file.
-#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, TypePath, PartialEq)]
 #[uuid = "cd9f4571-b0c4-4641-8d27-1c9c5ad4c812"]
 pub struct RawItemManifest {
     /// The data for each item.
diff --git a/emergence_lib/src/lib.rs b/emergence_lib/src/lib.rs
index 46b8c366f..440456a6b 100644
--- a/emergence_lib/src/lib.rs
+++ b/emergence_lib/src/lib.rs
@@ -50,15 +50,15 @@ pub mod testing {
     /// Just the game logic and simulation
     pub fn simulation_app(gen_config: GenerationConfig) -> App {
         let mut app = minimal_app();
-        app.add_plugin(SimulationPlugin { gen_config });
+        app.add_plugins(SimulationPlugin { gen_config });
         app
     }
 
     /// Test users interacting with the app
     pub fn interaction_app(gen_config: GenerationConfig) -> App {
         let mut app = simulation_app(gen_config);
-        app.add_plugin(bevy::input::InputPlugin)
-            .add_plugin(crate::player_interaction::InteractionPlugin);
+        app.add_plugins(bevy::input::InputPlugin)
+            .add_plugins(crate::player_interaction::InteractionPlugin);
         app
     }
 }
diff --git a/emergence_lib/src/light/mod.rs b/emergence_lib/src/light/mod.rs
index 57d43c1f5..d2fe97e47 100644
--- a/emergence_lib/src/light/mod.rs
+++ b/emergence_lib/src/light/mod.rs
@@ -24,10 +24,10 @@ pub(super) struct LightPlugin;
 impl Plugin for LightPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<TotalLight>().add_systems(
+            FixedUpdate,
             (compute_light, compute_shade, compute_received_light)
                 .chain()
-                .in_set(SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+                .in_set(SimulationSet),
         );
     }
 }
diff --git a/emergence_lib/src/litter.rs b/emergence_lib/src/litter.rs
index 2967e57b0..e685a9cbc 100644
--- a/emergence_lib/src/litter.rs
+++ b/emergence_lib/src/litter.rs
@@ -262,10 +262,15 @@ pub(super) fn carry_floating_litter_with_current(
                 if let Some(direction) = litter_drift.direction {
                     let new_voxel_pos = voxel_pos.neighbor(direction);
                     let source_height = water_depth.surface_height(voxel_pos.height());
-                    let Ok(target_entity) = map_geometry.get_terrain(new_voxel_pos.hex) else { continue };
+                    let Ok(target_entity) = map_geometry.get_terrain(new_voxel_pos.hex) else {
+                        continue;
+                    };
 
                     let Ok((target_tile_pos, target_water_depth)) =
-                        water_height_query.get(target_entity) else { continue };
+                        water_height_query.get(target_entity)
+                    else {
+                        continue;
+                    };
                     let target_height = target_water_depth.surface_height(target_tile_pos.height());
 
                     // Verify that we're not trying to deposit goods up a cliff or waterfall
@@ -311,7 +316,7 @@ struct SpawnLitterCommand {
 }
 
 impl Command for SpawnLitterCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let item_manifest = world.resource::<ItemManifest>();
 
         let litter = Litter::new(self.item, item_manifest);
diff --git a/emergence_lib/src/organisms/lifecycle.rs b/emergence_lib/src/organisms/lifecycle.rs
index 42aff38dd..2e2151586 100644
--- a/emergence_lib/src/organisms/lifecycle.rs
+++ b/emergence_lib/src/organisms/lifecycle.rs
@@ -298,7 +298,9 @@ pub(super) fn sprout_seeds(
 
         for item_slot in litter.contents.iter_mut() {
             let item_id = item_slot.item_id();
-            let Some(organism_id) = item_manifest.get(item_id).seed else { continue };
+            let Some(organism_id) = item_manifest.get(item_id).seed else {
+                continue;
+            };
 
             // Generate a random facing now, so we can verify that the new organism fits.
             let facing = Facing::random(rng);
@@ -322,7 +324,9 @@ pub(super) fn sprout_seeds(
             }
 
             // Make sure we can actually remove the item from the slot.
-            let Ok(()) = item_slot.remove_all_or_nothing(1) else { continue };
+            let Ok(()) = item_slot.remove_all_or_nothing(1) else {
+                continue;
+            };
 
             match organism_id {
                 OrganismId::Structure(structure_id) => {
diff --git a/emergence_lib/src/organisms/mod.rs b/emergence_lib/src/organisms/mod.rs
index c33de5e1c..f6a993a10 100644
--- a/emergence_lib/src/organisms/mod.rs
+++ b/emergence_lib/src/organisms/mod.rs
@@ -161,6 +161,7 @@ pub struct OrganismPlugin;
 impl Plugin for OrganismPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
+            FixedUpdate,
             (
                 consume_energy,
                 kill_organisms_when_out_of_energy,
@@ -169,8 +170,7 @@ impl Plugin for OrganismPlugin {
                 sprout_seeds,
                 manage_oxygen,
             )
-                .in_set(SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+                .in_set(SimulationSet),
         );
     }
 }
diff --git a/emergence_lib/src/organisms/vegetative_reproduction.rs b/emergence_lib/src/organisms/vegetative_reproduction.rs
index 20ca08ba6..19d5cff0d 100644
--- a/emergence_lib/src/organisms/vegetative_reproduction.rs
+++ b/emergence_lib/src/organisms/vegetative_reproduction.rs
@@ -94,8 +94,11 @@ pub(super) fn vegetative_spread(
         // PERF: we should just be returning a Vec<VoxelPos> or an [Option<VoxelPos; 6] here and allocating once
         let empty_neighbors = map_geometry.empty_neighbors(voxel_pos);
         let Some(tile_to_spawn_in) = empty_neighbors
-			// Just skip this organism if there are no empty neighbors
-            .choose(&mut rng) else { continue };
+            // Just skip this organism if there are no empty neighbors
+            .choose(&mut rng)
+        else {
+            continue;
+        };
 
         let clipboard_data = ClipboardData {
             structure_id,
diff --git a/emergence_lib/src/player_interaction/camera.rs b/emergence_lib/src/player_interaction/camera.rs
index ebe0ee912..aee9fa490 100644
--- a/emergence_lib/src/player_interaction/camera.rs
+++ b/emergence_lib/src/player_interaction/camera.rs
@@ -30,15 +30,17 @@ pub(super) struct CameraPlugin;
 
 impl Plugin for CameraPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup_camera.in_schedule(OnEnter(WorldGenState::Complete)))
-            .add_system(mousewheel_zoom.before(zoom))
-            .add_system(zoom)
-            .add_system(
+        app.add_systems(OnEnter(WorldGenState::Complete), setup_camera)
+            .add_systems(Update, mousewheel_zoom.before(zoom))
+            .add_systems(Update, zoom)
+            .add_systems(
+                Update,
                 drag_camera
                     .before(set_camera_inclination)
                     .before(rotate_camera),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 set_camera_focus
                     // Allow users to break out of CameraMode::Follow by moving the camera manually
                     .before(rotate_camera)
@@ -46,10 +48,16 @@ impl Plugin for CameraPlugin {
                     // Avoid jittering when the camera is following a unit
                     .after(drag_camera),
             )
-            .add_system(set_camera_inclination.before(InteractionSystem::MoveCamera))
-            .add_system(rotate_camera.before(InteractionSystem::MoveCamera))
-            .add_system(pan_camera.before(InteractionSystem::MoveCamera))
-            .add_system(move_camera_to_goal.in_set(InteractionSystem::MoveCamera));
+            .add_systems(
+                Update,
+                set_camera_inclination.before(InteractionSystem::MoveCamera),
+            )
+            .add_systems(Update, rotate_camera.before(InteractionSystem::MoveCamera))
+            .add_systems(Update, pan_camera.before(InteractionSystem::MoveCamera))
+            .add_systems(
+                Update,
+                move_camera_to_goal.in_set(InteractionSystem::MoveCamera),
+            );
     }
 }
 
@@ -257,7 +265,9 @@ fn drag_camera(
     time: Res<Time>,
 ) {
     if actions.pressed(PlayerAction::DragCamera) {
-        let Ok(mut settings) = camera_query.get_single_mut() else { return };
+        let Ok(mut settings) = camera_query.get_single_mut() else {
+            return;
+        };
         let rotation_rate = settings.rotation_speed.delta(time.delta()) * settings.drag_ratio;
         let inclination_rate = settings.inclination_speed.delta(time.delta()) * settings.drag_ratio;
 
@@ -277,7 +287,9 @@ fn set_camera_inclination(
     actions: Res<ActionState<PlayerAction>>,
     time: Res<Time>,
 ) {
-    let Ok(mut settings) = camera_query.get_single_mut() else { return };
+    let Ok(mut settings) = camera_query.get_single_mut() else {
+        return;
+    };
 
     let delta = if actions.pressed(PlayerAction::TiltCameraUp) {
         settings.inclination_speed.delta(time.delta())
@@ -298,7 +310,9 @@ fn zoom(
     actions: Res<ActionState<PlayerAction>>,
     time: Res<Time>,
 ) {
-    let Ok((mut focus, mut settings)) = camera_query.get_single_mut() else { return; };
+    let Ok((mut focus, mut settings)) = camera_query.get_single_mut() else {
+        return;
+    };
 
     let delta_zoom = match (
         actions.pressed(PlayerAction::ZoomIn),
@@ -323,7 +337,9 @@ fn set_camera_focus(
     unit_query: Query<&Transform>,
     mut camera_query: Query<(&mut CameraFocus, &mut CameraSettings), With<Camera3d>>,
 ) {
-    let Ok((mut focus, mut settings)) = camera_query.get_single_mut() else { return; };
+    let Ok((mut focus, mut settings)) = camera_query.get_single_mut() else {
+        return;
+    };
 
     // Snap to selected object
     if actions.pressed(PlayerAction::CenterCameraOnSelection)
@@ -368,7 +384,9 @@ fn pan_camera(
     actions: Res<ActionState<PlayerAction>>,
     maybe_map_geometry: Option<Res<MapGeometry>>,
 ) {
-    let Ok((transform, mut focus, mut settings)) = camera_query.get_single_mut() else { return; };
+    let Ok((transform, mut focus, mut settings)) = camera_query.get_single_mut() else {
+        return;
+    };
 
     // Pan
     if actions.pressed(PlayerAction::Pan) {
@@ -410,7 +428,9 @@ fn rotate_camera(
     actions: Res<ActionState<PlayerAction>>,
     time: Res<Time>,
 ) {
-    let Ok(mut settings) = camera_query.get_single_mut() else { return };
+    let Ok(mut settings) = camera_query.get_single_mut() else {
+        return;
+    };
 
     let delta = settings.rotation_speed.delta(time.delta());
 
@@ -430,7 +450,9 @@ fn rotate_camera(
 fn move_camera_to_goal(
     mut query: Query<(&mut Transform, &CameraFocus, &CameraSettings), With<Camera3d>>,
 ) {
-    let Ok((mut transform, focus, settings)) = query.get_single_mut() else { return; };
+    let Ok((mut transform, focus, settings)) = query.get_single_mut() else {
+        return;
+    };
 
     // Replace the previous transform
     *transform = compute_camera_transform(focus, settings.facing, settings.inclination);
diff --git a/emergence_lib/src/player_interaction/clipboard.rs b/emergence_lib/src/player_interaction/clipboard.rs
index 254d9c92e..1e5518b49 100644
--- a/emergence_lib/src/player_interaction/clipboard.rs
+++ b/emergence_lib/src/player_interaction/clipboard.rs
@@ -22,14 +22,19 @@ impl Plugin for ClipboardPlugin {
         app.init_resource::<Tool>()
             // We're running this before we select tiles to deliberately introduce a one-frame delay,
             // ensuring that users need to double click to clear the clipboard as well.
-            .add_system(clear_clipboard.before(InteractionSystem::SelectTiles))
-            .add_system(
+            .add_systems(
+                Update,
+                clear_clipboard.before(InteractionSystem::SelectTiles),
+            )
+            .add_systems(
+                Update,
                 copy_selection
                     .in_set(InteractionSystem::SetClipboard)
                     .after(InteractionSystem::ComputeCursorPos)
                     .after(InteractionSystem::SelectTiles),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 rotate_selection
                     .in_set(InteractionSystem::SetClipboard)
                     .after(copy_selection),
diff --git a/emergence_lib/src/player_interaction/mod.rs b/emergence_lib/src/player_interaction/mod.rs
index 8824f94bf..c16013411 100644
--- a/emergence_lib/src/player_interaction/mod.rs
+++ b/emergence_lib/src/player_interaction/mod.rs
@@ -23,19 +23,20 @@ pub struct InteractionPlugin;
 
 impl Plugin for InteractionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(InputManagerPlugin::<PlayerAction>::default())
+        app.add_plugins(InputManagerPlugin::<PlayerAction>::default())
             .init_resource::<ActionState<PlayerAction>>()
             .insert_resource(PlayerAction::default_input_map())
-            .add_plugin(camera::CameraPlugin)
-            .add_plugin(picking::PickingPlugin)
-            .add_plugin(selection::SelectionPlugin)
-            .add_plugin(clipboard::ClipboardPlugin)
-            .configure_set(PlayerModifiesWorld.run_if(in_state(WorldGenState::Complete)));
-
-        #[cfg(feature = "debug_tools")]
-        app.add_plugin(debug_tools::DebugToolsPlugin);
+            .add_plugins(camera::CameraPlugin)
+            .add_plugins(picking::PickingPlugin)
+            .add_plugins(selection::SelectionPlugin)
+            .add_plugins(clipboard::ClipboardPlugin)
+            .configure_set(
+                Update,
+                PlayerModifiesWorld.run_if(in_state(WorldGenState::Complete)),
+            );
+
         for variant in InteractionSystem::variants() {
-            app.configure_set(variant.run_if(in_state(WorldGenState::Complete)));
+            app.configure_set(Update, variant.run_if(in_state(WorldGenState::Complete)));
         }
     }
 }
@@ -64,7 +65,7 @@ pub struct PlayerModifiesWorld;
 /// Actions that the player can take to modify the game world or their view of it.
 ///
 /// This should only store actions that need a dedicated keybinding.
-#[derive(Actionlike, Clone, Debug)]
+#[derive(Actionlike, Reflect, Clone, Debug)]
 pub(crate) enum PlayerAction {
     /// Pause or unpause the game.
     TogglePause,
diff --git a/emergence_lib/src/player_interaction/picking.rs b/emergence_lib/src/player_interaction/picking.rs
index adbabc051..f2a41391b 100644
--- a/emergence_lib/src/player_interaction/picking.rs
+++ b/emergence_lib/src/player_interaction/picking.rs
@@ -13,15 +13,15 @@ pub(super) struct PickingPlugin;
 impl Plugin for PickingPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<CursorPos>()
-            .add_plugin(DefaultRaycastingPlugin::<PickableVoxel>::default())
-            .add_plugin(DefaultRaycastingPlugin::<Unit>::default())
-            .add_system(
-                update_raycast_with_cursor
-                    .before(RaycastSystem::BuildRays::<PickableVoxel>)
-                    .in_base_set(CoreSet::First),
+            .add_plugins(DefaultRaycastingPlugin::<PickableVoxel>::default())
+            .add_plugins(DefaultRaycastingPlugin::<Unit>::default())
+            .add_systems(
+                First,
+                update_raycast_with_cursor.before(RaycastSystem::BuildRays::<PickableVoxel>),
             )
-            .add_system(move_cursor_manually.in_base_set(CoreSet::PreUpdate))
-            .add_system(
+            .add_systems(PreUpdate, move_cursor_manually)
+            .add_systems(
+                Update,
                 update_cursor_pos
                     .in_set(InteractionSystem::ComputeCursorPos)
                     .after(InteractionSystem::MoveCamera),
@@ -91,7 +91,7 @@ fn update_raycast_with_cursor(
 }
 
 /// A marker that's used to identify meshes and sources for raycasting.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Reflect, FromReflect)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Reflect)]
 pub(crate) struct PickableVoxel;
 
 /// Updates the location of the cursor and what it is hovering over
@@ -105,8 +105,9 @@ fn update_cursor_pos(
     unit_query: Query<Entity, With<Id<Unit>>>,
     mut cursor_moved_events: EventReader<CursorMoved>,
 ) {
-    let Ok((voxel_raycast, unit_raycast)) =
-        camera_query.get_single() else { return; };
+    let Ok((voxel_raycast, unit_raycast)) = camera_query.get_single() else {
+        return;
+    };
 
     cursor_pos.voxel_pos =
         if let Some((entity, _intersection_data)) = voxel_raycast.get_nearest_intersection() {
diff --git a/emergence_lib/src/player_interaction/selection.rs b/emergence_lib/src/player_interaction/selection.rs
index 4652b2ee1..213768a1b 100644
--- a/emergence_lib/src/player_interaction/selection.rs
+++ b/emergence_lib/src/player_interaction/selection.rs
@@ -24,17 +24,19 @@ impl Plugin for SelectionPlugin {
         app.init_resource::<CurrentSelection>()
             .init_resource::<SelectionState>()
             .init_resource::<HoveredTiles>()
-            .add_system(
+            .add_systems(
+                Update,
                 set_selection
                     .in_set(InteractionSystem::SelectTiles)
                     .after(InteractionSystem::ComputeCursorPos),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 set_tile_interactions
                     .in_set(InteractionSystem::SelectTiles)
                     .after(set_selection),
             )
-            .add_system(update_selection_radius);
+            .add_systems(Update, update_selection_radius);
     }
 }
 
@@ -174,7 +176,7 @@ impl HoveredTiles {
             }
         };
 
-        self.hovered = HashSet::from_iter(hex_vec.into_iter());
+        self.hovered = HashSet::from_iter(hex_vec);
     }
 }
 
@@ -557,7 +559,9 @@ fn set_selection(
     let cursor_pos = &*cursor_pos;
     let map_geometry = &*map_geometry;
 
-    let Some(hovered_tile) = cursor_pos.maybe_voxel_pos() else {return};
+    let Some(hovered_tile) = cursor_pos.maybe_voxel_pos() else {
+        return;
+    };
 
     // Compute how we should handle the selection based on the actions of the player
     selection_state.compute(&tool, actions, hovered_tile);
diff --git a/emergence_lib/src/signals.rs b/emergence_lib/src/signals.rs
index 91ec48d7a..6d33381ea 100644
--- a/emergence_lib/src/signals.rs
+++ b/emergence_lib/src/signals.rs
@@ -40,11 +40,11 @@ pub(crate) struct SignalsPlugin;
 impl Plugin for SignalsPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<Signals>().add_systems(
+            FixedUpdate,
             (emit_signals, diffuse_signals, degrade_signals)
                 .chain()
                 .in_set(ManageSignals)
-                .in_set(SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+                .in_set(SimulationSet),
         );
     }
 }
diff --git a/emergence_lib/src/simulation/mod.rs b/emergence_lib/src/simulation/mod.rs
index 98173a3f6..8c913f560 100644
--- a/emergence_lib/src/simulation/mod.rs
+++ b/emergence_lib/src/simulation/mod.rs
@@ -18,7 +18,6 @@ use crate::units::UnitsPlugin;
 use crate::water::WaterPlugin;
 use crate::world_gen::{GenerationConfig, GenerationPlugin, WorldGenState};
 use bevy::core::FrameCount;
-use bevy::ecs::schedule::{LogLevel, ScheduleBuildSettings};
 use bevy::prelude::*;
 
 pub mod rng;
@@ -35,37 +34,34 @@ impl Plugin for SimulationPlugin {
     fn build(&self, app: &mut App) {
         info!("Building simulation plugin...");
         app.insert_resource(GlobalRng::new(self.gen_config.seed))
-            .add_system(sync_rotation_to_facing)
-            .edit_schedule(CoreSchedule::FixedUpdate, |schedule| {
-                schedule.configure_set(
-                    SimulationSet
-                        .run_if(in_state(PauseState::Playing))
-                        .run_if(in_state(AssetState::FullyLoaded))
-                        .run_if(world_gen_ready)
-                        .run_if(max_ticks_not_reached),
-                );
-                schedule.add_system(update_ticks_this_frame.run_if(max_ticks_not_reached));
-
-                schedule.set_build_settings(ScheduleBuildSettings {
-                    ambiguity_detection: LogLevel::Warn,
-                    ..Default::default()
-                });
-            })
+            .add_systems(FixedUpdate, sync_rotation_to_facing)
+            .configure_set(
+                FixedUpdate,
+                SimulationSet
+                    .run_if(in_state(PauseState::Playing))
+                    .run_if(in_state(AssetState::FullyLoaded))
+                    .run_if(world_gen_ready)
+                    .run_if(max_ticks_not_reached),
+            )
+            .add_systems(
+                Update,
+                update_ticks_this_frame.run_if(max_ticks_not_reached),
+            )
             .insert_resource(TicksThisFrame { current: 0, max: 3 })
-            .add_plugin(GenerationPlugin {
+            .add_plugins(GenerationPlugin {
                 config: self.gen_config.clone(),
             })
-            .add_plugin(CraftingPlugin)
-            .add_plugin(ConstructionPlugin)
-            .add_plugin(StructuresPlugin)
-            .add_plugin(TerrainPlugin)
-            .add_plugin(OrganismPlugin)
-            .add_plugin(UnitsPlugin)
-            .add_plugin(SignalsPlugin)
-            .add_plugin(TemporalPlugin)
-            .add_plugin(LightPlugin)
-            .add_plugin(WaterPlugin)
-            .add_plugin(WeatherPlugin);
+            .add_plugins(CraftingPlugin)
+            .add_plugins(ConstructionPlugin)
+            .add_plugins(StructuresPlugin)
+            .add_plugins(TerrainPlugin)
+            .add_plugins(OrganismPlugin)
+            .add_plugins(UnitsPlugin)
+            .add_plugins(SignalsPlugin)
+            .add_plugins(TemporalPlugin)
+            .add_plugins(LightPlugin)
+            .add_plugins(WaterPlugin)
+            .add_plugins(WeatherPlugin);
     }
 }
 
@@ -82,7 +78,7 @@ enum PauseState {
 /// Simulation systems.
 ///
 /// These:
-/// - are run in [`CoreSchedule::FixedUpdate`]
+/// - are run in [`FixedUpdate`]
 /// - only run in [`PauseState::Playing`]
 /// - only run in [`AssetState::FullyLoaded`]
 #[derive(SystemSet, PartialEq, Eq, Hash, Debug, Clone)]
@@ -119,5 +115,6 @@ fn max_ticks_not_reached(frame_count: Res<FrameCount>, ticks: Res<TicksThisFrame
 
 /// Ensures that simulation systems do not run until world gen is ready for them.
 fn world_gen_ready(world_gen_state: Res<State<WorldGenState>>) -> bool {
-    world_gen_state.0 == WorldGenState::Complete || world_gen_state.0 == WorldGenState::BurningIn
+    *world_gen_state.get() == WorldGenState::Complete
+        || *world_gen_state.get() == WorldGenState::BurningIn
 }
diff --git a/emergence_lib/src/simulation/time.rs b/emergence_lib/src/simulation/time.rs
index 2e8345702..9b8dfc77e 100644
--- a/emergence_lib/src/simulation/time.rs
+++ b/emergence_lib/src/simulation/time.rs
@@ -24,16 +24,16 @@ impl Plugin for TemporalPlugin {
         app.add_state::<PauseState>()
             .insert_resource(FixedTime::new_from_secs(1.0 / 30.))
             .add_systems(
+                FixedUpdate,
                 (
                     advance_in_game_time,
                     move_celestial_bodies,
                     record_elapsed_time_for_lifecycles,
                 )
                     .chain()
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                    .in_set(SimulationSet),
             )
-            .add_system(pause_game)
+            .add_systems(Update, pause_game)
             .init_resource::<InGameTime>();
     }
 }
@@ -198,7 +198,7 @@ fn pause_game(
     player_actions: Res<ActionState<PlayerAction>>,
 ) {
     if player_actions.just_pressed(PlayerAction::TogglePause) {
-        next_pause_state.set(match current_pause_state.0 {
+        next_pause_state.set(match current_pause_state.get() {
             PauseState::Paused => PauseState::Playing,
             PauseState::Playing => PauseState::Paused,
         });
diff --git a/emergence_lib/src/simulation/weather.rs b/emergence_lib/src/simulation/weather.rs
index 1ccabf119..acec68980 100644
--- a/emergence_lib/src/simulation/weather.rs
+++ b/emergence_lib/src/simulation/weather.rs
@@ -15,9 +15,8 @@ pub(crate) struct WeatherPlugin;
 impl Plugin for WeatherPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<CurrentWeather>().add_systems(
-            (set_daily_weather,)
-                .in_set(super::SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+            FixedUpdate,
+            (set_daily_weather,).in_set(super::SimulationSet),
         );
     }
 }
diff --git a/emergence_lib/src/structures/commands.rs b/emergence_lib/src/structures/commands.rs
index d8b13be07..7abb31698 100644
--- a/emergence_lib/src/structures/commands.rs
+++ b/emergence_lib/src/structures/commands.rs
@@ -107,7 +107,7 @@ struct SpawnStructureCommand {
 }
 
 impl Command for SpawnStructureCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let geometry = world.resource::<MapGeometry>();
         // Check that the tile is within the bounds of the map
         if !geometry.is_valid(self.center.hex) {
@@ -269,14 +269,16 @@ struct DespawnStructureCommand {
 }
 
 impl Command for DespawnStructureCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let map_geometry = world.resource::<MapGeometry>();
-        let Some(structure_entity) = map_geometry.get_structure(self.center) else { return; };
+        let Some(structure_entity) = map_geometry.get_structure(self.center) else {
+            return;
+        };
 
         let facing = *world.entity(structure_entity).get::<Facing>().unwrap();
-        let Some(&structure_id) = world
-            .entity(structure_entity)
-            .get::<Id<Structure>>() else { return; };
+        let Some(&structure_id) = world.entity(structure_entity).get::<Id<Structure>>() else {
+            return;
+        };
         let structure_manifest = world.resource::<StructureManifest>();
         let structure_data = structure_manifest.get(structure_id);
         let footprint = structure_data.footprint.clone();
@@ -304,7 +306,7 @@ struct SpawnStructureGhostCommand {
 }
 
 impl Command for SpawnStructureGhostCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let structure_id = self.data.structure_id;
         let map_geometry = world.resource::<MapGeometry>();
 
@@ -402,9 +404,11 @@ struct DespawnGhostCommand {
 }
 
 impl Command for DespawnGhostCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let map_geometry = world.resource::<MapGeometry>();
-        let Some(ghost_entity) = map_geometry.get_ghost_structure(self.voxel_pos) else { return; };
+        let Some(ghost_entity) = map_geometry.get_ghost_structure(self.voxel_pos) else {
+            return;
+        };
 
         let facing = *world.entity(ghost_entity).get::<Facing>().unwrap();
         let center = *world.entity(ghost_entity).get::<VoxelPos>().unwrap();
@@ -429,7 +433,7 @@ struct SpawnStructurePreviewCommand {
 }
 
 impl Command for SpawnStructurePreviewCommand {
-    fn write(self, world: &mut World) {
+    fn apply(self, world: &mut World) {
         let structure_id = self.data.structure_id;
         let map_geometry = world.resource::<MapGeometry>();
 
diff --git a/emergence_lib/src/structures/logistic_buildings.rs b/emergence_lib/src/structures/logistic_buildings.rs
index ed30306c8..48afe406d 100644
--- a/emergence_lib/src/structures/logistic_buildings.rs
+++ b/emergence_lib/src/structures/logistic_buildings.rs
@@ -32,9 +32,8 @@ pub(super) struct LogisticsPlugin;
 impl Plugin for LogisticsPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
-            (release_items, absorb_items, logistic_buildings_signals)
-                .in_set(SimulationSet)
-                .in_schedule(CoreSchedule::FixedUpdate),
+            FixedUpdate,
+            (release_items, absorb_items, logistic_buildings_signals).in_set(SimulationSet),
         );
     }
 }
diff --git a/emergence_lib/src/structures/mod.rs b/emergence_lib/src/structures/mod.rs
index 46ad50436..76ee0279e 100644
--- a/emergence_lib/src/structures/mod.rs
+++ b/emergence_lib/src/structures/mod.rs
@@ -35,8 +35,8 @@ pub(super) struct StructuresPlugin;
 
 impl Plugin for StructuresPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ManifestPlugin::<RawStructureManifest>::new())
-            .add_plugin(LogisticsPlugin)
+        app.add_plugins(ManifestPlugin::<RawStructureManifest>::new())
+            .add_plugins(LogisticsPlugin)
             .add_asset_collection::<StructureHandles>();
     }
 }
diff --git a/emergence_lib/src/structures/structure_manifest.rs b/emergence_lib/src/structures/structure_manifest.rs
index bb8212956..5e6dd2442 100644
--- a/emergence_lib/src/structures/structure_manifest.rs
+++ b/emergence_lib/src/structures/structure_manifest.rs
@@ -12,7 +12,7 @@ use crate::{
     water::roots::RootZone,
 };
 use bevy::{
-    reflect::{FromReflect, Reflect, TypeUuid},
+    reflect::{Reflect, TypePath, TypeUuid},
     utils::HashMap,
 };
 use serde::{Deserialize, Serialize};
@@ -20,7 +20,7 @@ use serde::{Deserialize, Serialize};
 use super::Footprint;
 
 /// The marker type for [`Id<Structure>`](super::Id).
-#[derive(Reflect, FromReflect, Clone, Copy, PartialEq, Eq)]
+#[derive(Reflect, Clone, Copy, PartialEq, Eq)]
 pub struct Structure;
 /// Stores the read-only definitions for all structures.
 pub type StructureManifest = Manifest<Structure, StructureData>;
@@ -274,7 +274,7 @@ impl StructureManifest {
 }
 
 /// The [`StructureManifest`] as seen in the manifest file.
-#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, TypePath, PartialEq)]
 #[uuid = "77ddfe49-be99-4fea-bbba-0c085821f6b8"]
 pub struct RawStructureManifest {
     /// The data for each structure.
diff --git a/emergence_lib/src/terrain/mod.rs b/emergence_lib/src/terrain/mod.rs
index 4ff9024e9..456cbe9c1 100644
--- a/emergence_lib/src/terrain/mod.rs
+++ b/emergence_lib/src/terrain/mod.rs
@@ -31,9 +31,10 @@ pub(crate) struct TerrainPlugin;
 
 impl Plugin for TerrainPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ManifestPlugin::<RawTerrainManifest>::new())
+        app.add_plugins(ManifestPlugin::<RawTerrainManifest>::new())
             .add_asset_collection::<TerrainHandles>()
             .add_systems(
+                FixedUpdate,
                 (
                     respond_to_height_changes,
                     make_litter_float.after(respond_to_height_changes),
@@ -49,8 +50,7 @@ impl Plugin for TerrainPlugin {
                         .after(carry_floating_litter_with_current)
                         .in_set(LitterEmitters),
                 )
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                    .in_set(SimulationSet),
             );
     }
 }
diff --git a/emergence_lib/src/terrain/terrain_manifest.rs b/emergence_lib/src/terrain/terrain_manifest.rs
index b1a281a9d..cb2d3a49c 100644
--- a/emergence_lib/src/terrain/terrain_manifest.rs
+++ b/emergence_lib/src/terrain/terrain_manifest.rs
@@ -1,7 +1,7 @@
 //! Defines write-only data for each variety of terrain.
 
 use bevy::{
-    reflect::{FromReflect, Reflect, TypeUuid},
+    reflect::{Reflect, TypePath, TypeUuid},
     utils::HashMap,
 };
 use serde::{Deserialize, Serialize};
@@ -15,7 +15,7 @@ use crate::{
 };
 
 /// The marker type for [`Id<Terrain>`](super::Id).
-#[derive(Reflect, FromReflect, Clone, Copy, PartialEq, Eq)]
+#[derive(Reflect, Clone, Copy, PartialEq, Eq)]
 pub struct Terrain;
 /// Stores the read-only definitions for all items.
 pub type TerrainManifest = Manifest<Terrain, TerrainData>;
@@ -60,7 +60,7 @@ impl Default for TerrainData {
 }
 
 /// The [`TerrainManifest`] as seen in the manifest file.
-#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, TypePath, PartialEq)]
 #[uuid = "8d6b3b65-9b11-42a9-a795-f95b06653070"]
 pub struct RawTerrainManifest {
     /// The data for each item.
diff --git a/emergence_lib/src/ui/cursor.rs b/emergence_lib/src/ui/cursor.rs
index 57285ab10..77de17ab2 100644
--- a/emergence_lib/src/ui/cursor.rs
+++ b/emergence_lib/src/ui/cursor.rs
@@ -14,8 +14,8 @@ pub(super) struct CursorPlugin;
 
 impl Plugin for CursorPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(track_cursor.pipe(ignore))
-            .add_system(set_cursor.run_if(in_state(AssetState::FullyLoaded)));
+        app.add_systems(Update, track_cursor.pipe(ignore))
+            .add_systems(Update, set_cursor.run_if(in_state(AssetState::FullyLoaded)));
     }
 }
 
@@ -46,7 +46,8 @@ fn set_cursor(
         commands.spawn((
             ImageBundle {
                 style: Style {
-                    size: Size::new(Val::Px(CHOICE_ICON_SIZE), Val::Px(CHOICE_ICON_SIZE)),
+                    width: Val::Px(CHOICE_ICON_SIZE),
+                    height: Val::Px(CHOICE_ICON_SIZE),
                     position_type: PositionType::Absolute,
                     ..Default::default()
                 },
@@ -56,7 +57,7 @@ fn set_cursor(
                 },
                 ..Default::default()
             },
-            Cursor::default(),
+            Cursor,
         ));
     }
 }
@@ -69,11 +70,8 @@ fn track_cursor(
     let window = window_query.get_single().ok()?;
     let mut cursor_style = cursor_query.get_single_mut().ok()?;
     let mouse_position = window.cursor_position()?;
-    cursor_style.position = UiRect {
-        // Center the cursor icon on the mouse position
-        left: Val::Px(mouse_position.x - CHOICE_ICON_SIZE / 2.),
-        bottom: Val::Px(mouse_position.y - CHOICE_ICON_SIZE / 2.),
-        ..Default::default()
-    };
+    // Center the cursor icon on the mouse position
+    cursor_style.left = Val::Px(mouse_position.x - CHOICE_ICON_SIZE / 2.);
+    cursor_style.bottom = Val::Px(mouse_position.y - CHOICE_ICON_SIZE / 2.);
     Some(())
 }
diff --git a/emergence_lib/src/ui/mod.rs b/emergence_lib/src/ui/mod.rs
index a106d6337..08a945887 100644
--- a/emergence_lib/src/ui/mod.rs
+++ b/emergence_lib/src/ui/mod.rs
@@ -56,16 +56,16 @@ impl Plugin for UiPlugin {
         .add_asset_collection::<Icons<TerraformingTool>>()
         .add_asset_collection::<Icons<CraftingProgress>>()
         .add_asset_collection::<Icons<GoalKind>>()
-        .add_startup_system(setup_ui.in_base_set(StartupSet::PreStartup))
-        .add_plugin(ScreenDiagnosticsPlugin::default())
-        .add_plugin(ScreenFrameDiagnosticsPlugin)
-        .add_plugin(CursorPlugin)
-        .add_plugin(SelectionDetailsPlugin)
-        .add_plugin(ProductionStatisticsPlugin)
-        .add_plugin(StatusPlugin)
-        .add_plugin(OverlayMenuPlugin)
-        .add_plugin(SelectStructurePlugin)
-        .add_plugin(SelectTerraformingPlugin);
+        .add_systems(PreStartup, setup_ui)
+        .add_plugins(ScreenDiagnosticsPlugin::default())
+        .add_plugins(ScreenFrameDiagnosticsPlugin)
+        .add_plugins(CursorPlugin)
+        .add_plugins(SelectionDetailsPlugin)
+        .add_plugins(ProductionStatisticsPlugin)
+        .add_plugins(StatusPlugin)
+        .add_plugins(OverlayMenuPlugin)
+        .add_plugins(SelectStructurePlugin)
+        .add_plugins(SelectTerraformingPlugin);
     }
 }
 
@@ -83,7 +83,8 @@ fn setup_ui(mut commands: Commands) {
     commands
         .spawn(NodeBundle {
             style: Style {
-                size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(100.),
                 justify_content: JustifyContent::SpaceBetween,
                 ..default()
             },
@@ -96,7 +97,8 @@ fn setup_ui(mut commands: Commands) {
                     style: Style {
                         flex_direction: FlexDirection::Column,
                         justify_content: JustifyContent::SpaceBetween,
-                        size: Size::new(Val::Px(200.), Val::Percent(100.)),
+                        width: Val::Px(200.),
+                        height: Val::Percent(100.),
                         ..default()
                     },
                     ..default()
@@ -109,7 +111,8 @@ fn setup_ui(mut commands: Commands) {
                 NodeBundle {
                     style: Style {
                         flex_direction: FlexDirection::Column,
-                        size: Size::new(Val::Px(400.), Val::Percent(100.)),
+                        width: Val::Px(400.),
+                        height: Val::Percent(100.),
                         ..default()
                     },
                     ..default()
diff --git a/emergence_lib/src/ui/overlay.rs b/emergence_lib/src/ui/overlay.rs
index 63b08b168..ddca00990 100644
--- a/emergence_lib/src/ui/overlay.rs
+++ b/emergence_lib/src/ui/overlay.rs
@@ -20,9 +20,12 @@ pub(super) struct OverlayMenuPlugin;
 
 impl Plugin for OverlayMenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(select_overlay)
-            .add_startup_system(setup_overlay_menu)
-            .add_system(update_signal_type_display.run_if(in_state(AssetState::FullyLoaded)));
+        app.add_systems(Update, select_overlay)
+            .add_systems(Startup, setup_overlay_menu)
+            .add_systems(
+                Update,
+                update_signal_type_display.run_if(in_state(AssetState::FullyLoaded)),
+            );
     }
 }
 
@@ -99,10 +102,8 @@ fn setup_overlay_menu(
     let legend_entity = commands
         .spawn(ImageBundle {
             style: Style {
-                size: Size::new(
-                    Val::Px(TileOverlay::LEGEND_WIDTH as f32),
-                    Val::Px(TileOverlay::N_COLORS as f32),
-                ),
+                width: Val::Px(TileOverlay::LEGEND_WIDTH as f32),
+                height: Val::Px(TileOverlay::N_COLORS as f32),
                 ..Default::default()
             },
             image: UiImage {
diff --git a/emergence_lib/src/ui/production_statistics.rs b/emergence_lib/src/ui/production_statistics.rs
index d18650c1d..17b0d647a 100644
--- a/emergence_lib/src/ui/production_statistics.rs
+++ b/emergence_lib/src/ui/production_statistics.rs
@@ -27,10 +27,14 @@ impl Plugin for ProductionStatisticsPlugin {
         app.init_resource::<Census>()
             .init_resource::<ItemCount>()
             .add_systems(
+                Update,
                 (census, update_item_count).distributive_run_if(in_state(WorldGenState::Complete)),
             )
-            .add_startup_system(spawn_production_statistics_menu)
-            .add_system(update_production_statistics.run_if(in_state(WorldGenState::Complete)));
+            .add_systems(Startup, spawn_production_statistics_menu)
+            .add_systems(
+                Update,
+                update_production_statistics.run_if(in_state(WorldGenState::Complete)),
+            );
     }
 }
 
diff --git a/emergence_lib/src/ui/select_structure.rs b/emergence_lib/src/ui/select_structure.rs
index 86766fe6c..15befa83b 100644
--- a/emergence_lib/src/ui/select_structure.rs
+++ b/emergence_lib/src/ui/select_structure.rs
@@ -27,11 +27,13 @@ impl Plugin for SelectStructurePlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<AvailableChoices<Id<Structure>>>()
             .add_systems(
+                Update,
                 (update_structure_choices, spawn_hex_menu::<Id<Structure>>)
                     .chain()
                     .distributive_run_if(in_state(AssetState::FullyLoaded)),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 select_hex
                     .pipe(handle_selection)
                     .run_if(resource_exists::<HexMenuArrangement<Id<Structure>>>()),
diff --git a/emergence_lib/src/ui/select_terraforming.rs b/emergence_lib/src/ui/select_terraforming.rs
index 786c0a093..742a32837 100644
--- a/emergence_lib/src/ui/select_terraforming.rs
+++ b/emergence_lib/src/ui/select_terraforming.rs
@@ -24,6 +24,7 @@ impl Plugin for SelectTerraformingPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<AvailableChoices<TerraformingTool>>()
             .add_systems(
+                Update,
                 (
                     update_terraforming_choices,
                     spawn_hex_menu::<TerraformingTool>,
@@ -31,7 +32,8 @@ impl Plugin for SelectTerraformingPlugin {
                     .distributive_run_if(in_state(AssetState::FullyLoaded))
                     .chain(),
             )
-            .add_system(
+            .add_systems(
+                Update,
                 select_hex
                     .pipe(handle_selection)
                     .run_if(resource_exists::<HexMenuArrangement<TerraformingTool>>()),
diff --git a/emergence_lib/src/ui/selection_details.rs b/emergence_lib/src/ui/selection_details.rs
index 6e1b0bda3..3b9438cea 100644
--- a/emergence_lib/src/ui/selection_details.rs
+++ b/emergence_lib/src/ui/selection_details.rs
@@ -35,8 +35,9 @@ pub(super) struct SelectionDetailsPlugin;
 impl Plugin for SelectionDetailsPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<SelectionDetails>()
-            .add_startup_system(populate_selection_panel)
-            .add_system(
+            .add_systems(Startup, populate_selection_panel)
+            .add_systems(
+                Update,
                 get_details
                     .pipe(clear_details_on_error)
                     .after(InteractionSystem::SelectTiles)
@@ -44,8 +45,11 @@ impl Plugin for SelectionDetailsPlugin {
                     .run_if(in_state(AssetState::FullyLoaded))
                     .run_if(in_state(WorldGenState::Complete)),
             )
-            .add_system(change_camera_mode.after(update_selection_details))
-            .add_system(update_selection_details.run_if(in_state(AssetState::FullyLoaded)));
+            .add_systems(Update, change_camera_mode.after(update_selection_details))
+            .add_systems(
+                Update,
+                update_selection_details.run_if(in_state(AssetState::FullyLoaded)),
+            );
     }
 }
 
@@ -87,7 +91,8 @@ fn populate_selection_panel(
         .spawn((
             NodeBundle {
                 style: Style {
-                    size: Size::new(Val::Percent(100.), Val::Px(500.)),
+                    width: Val::Percent(100.),
+                    height: Val::Px(500.),
                     flex_direction: FlexDirection::Column,
                     padding: UiRect::all(Val::Px(10.)),
                     ..default()
@@ -264,7 +269,8 @@ fn populate_details<T: Component + Default>(
         .spawn((
             TextBundle {
                 style: Style {
-                    size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                    width: Val::Percent(100.),
+                    height: Val::Percent(100.),
                     flex_direction: FlexDirection::Column,
                     ..default()
                 },
diff --git a/emergence_lib/src/ui/status.rs b/emergence_lib/src/ui/status.rs
index 35b62033c..cc473139a 100644
--- a/emergence_lib/src/ui/status.rs
+++ b/emergence_lib/src/ui/status.rs
@@ -27,10 +27,13 @@ pub(super) struct StatusPlugin;
 impl Plugin for StatusPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<StatusVisualization>()
-            .add_system(add_status_displays.before(display_status))
-            .add_system(cycle_status_visualization.before(display_status))
-            .add_system(display_status.run_if(in_state(AssetState::FullyLoaded)))
-            .add_plugin(BillboardPlugin);
+            .add_systems(Update, add_status_displays.before(display_status))
+            .add_systems(Update, cycle_status_visualization.before(display_status))
+            .add_systems(
+                Update,
+                display_status.run_if(in_state(AssetState::FullyLoaded)),
+            )
+            .add_plugins(BillboardPlugin);
     }
 }
 
diff --git a/emergence_lib/src/ui/wheel_menu.rs b/emergence_lib/src/ui/wheel_menu.rs
index 98e2ce99f..f61c2158f 100644
--- a/emergence_lib/src/ui/wheel_menu.rs
+++ b/emergence_lib/src/ui/wheel_menu.rs
@@ -164,6 +164,8 @@ pub(super) fn spawn_hex_menu<D: Choice>(
                         x: CHOICE_ICON_SIZE,
                         y: CHOICE_ICON_SIZE,
                     },
+                    invert_x: false,
+                    invert_y: false,
                 },
             };
 
@@ -241,13 +243,11 @@ impl HexMenuIconBundle {
                 flip_y: false,
             },
             style: Style {
-                position: UiRect {
-                    left: Val::Px(screen_pos.x),
-                    bottom: Val::Px(screen_pos.y),
-                    ..Default::default()
-                },
+                left: Val::Px(screen_pos.x),
+                bottom: Val::Px(screen_pos.y),
                 position_type: PositionType::Absolute,
-                size: Size::new(Val::Px(layout.hex_size.x), Val::Px(layout.hex_size.y)),
+                width: Val::Px(layout.hex_size.x),
+                height: Val::Px(layout.hex_size.y),
                 ..Default::default()
             },
             // Render above the background
@@ -296,13 +296,11 @@ impl HexMenuBackgroundBundle {
                 flip_y: false,
             },
             style: Style {
-                position: UiRect {
-                    left: Val::Px(screen_pos.x),
-                    bottom: Val::Px(screen_pos.y),
-                    ..Default::default()
-                },
+                left: Val::Px(screen_pos.x),
+                bottom: Val::Px(screen_pos.y),
                 position_type: PositionType::Absolute,
-                size: Size::new(Val::Px(width), Val::Px(height)),
+                width: Val::Px(width),
+                height: Val::Px(height),
                 ..Default::default()
             },
             // Render below the icon
diff --git a/emergence_lib/src/units/mod.rs b/emergence_lib/src/units/mod.rs
index b1e31276d..4b9a5c31d 100644
--- a/emergence_lib/src/units/mod.rs
+++ b/emergence_lib/src/units/mod.rs
@@ -248,9 +248,10 @@ pub(crate) enum UnitSystem {
 pub struct UnitsPlugin;
 impl Plugin for UnitsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ManifestPlugin::<RawUnitManifest>::new())
+        app.add_plugins(ManifestPlugin::<RawUnitManifest>::new())
             .add_asset_collection::<UnitHandles>()
             .add_systems(
+                FixedUpdate,
                 (
                     actions::advance_action_timer.in_set(UnitSystem::AdvanceTimers),
                     actions::start_actions
@@ -276,8 +277,7 @@ impl Plugin for UnitsPlugin {
                     basic_needs::check_for_oxygen.after(basic_needs::check_for_hunger),
                     age::aging,
                 )
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
+                    .in_set(SimulationSet),
             );
     }
 }
diff --git a/emergence_lib/src/units/unit_manifest.rs b/emergence_lib/src/units/unit_manifest.rs
index 29cc628d1..7b663a497 100644
--- a/emergence_lib/src/units/unit_manifest.rs
+++ b/emergence_lib/src/units/unit_manifest.rs
@@ -1,7 +1,7 @@
 //! Defines write-only data for each variety of unit.
 
 use bevy::{
-    reflect::{FromReflect, Reflect, TypeUuid},
+    reflect::{Reflect, TypePath, TypeUuid},
     utils::HashMap,
 };
 use serde::{Deserialize, Serialize};
@@ -16,7 +16,7 @@ use crate::{
 use super::{basic_needs::RawDiet, Manifest};
 
 /// The marker type for [`Id<Unit>`](super::Id).
-#[derive(Reflect, FromReflect, Clone, Copy, PartialEq, Eq)]
+#[derive(Reflect, Clone, Copy, PartialEq, Eq)]
 pub struct Unit;
 /// Stores the read-only definitions for all units.
 pub type UnitManifest = Manifest<Unit, UnitData>;
@@ -88,7 +88,7 @@ impl From<RawUnitData> for UnitData {
 }
 
 /// The [`UnitManifest`] as seen in the manifest file.
-#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TypeUuid, TypePath, PartialEq)]
 #[uuid = "c8f6e1a1-20a0-4629-8df1-2e1fa313fcb9"]
 pub struct RawUnitManifest {
     /// The data for each item.
diff --git a/emergence_lib/src/water/mod.rs b/emergence_lib/src/water/mod.rs
index c69828913..284f1d6d8 100644
--- a/emergence_lib/src/water/mod.rs
+++ b/emergence_lib/src/water/mod.rs
@@ -147,50 +147,55 @@ impl Plugin for WaterPlugin {
         app.insert_resource(WaterConfig::IN_GAME)
             .init_resource::<Ocean>();
 
-        app.edit_schedule(CoreSchedule::FixedUpdate, |schedule| {
-            schedule
-                .configure_sets(
-                    (
-                        WaterSet::VerticalWaterMovement,
-                        WaterSet::HorizontalWaterMovement,
-                        WaterSet::Synchronization,
-                    )
-                        .in_set(SimulationSet)
-                        .chain(),
-                )
-                .add_system(
-                    cache_water_volume
-                        .before(WaterSet::VerticalWaterMovement)
-                        // This needs to respect pausing
-                        .in_set(SimulationSet),
-                )
-                .add_systems(
-                    (
-                        tides,
-                        produce_water_from_emitters,
-                        precipitation,
-                        // This system pulls in a ton of dependencies, so it's best to fail silently when they don't exist
-                        // to allow for integration testing of water behavior.
-                        draw_water_from_roots
-                            .run_if(resource_exists::<StructureManifest>())
-                            .run_if(resource_exists::<ItemManifest>()),
-                        evaporation,
-                    )
-                        .chain()
-                        .in_set(WaterSet::VerticalWaterMovement),
-                )
-                .add_system(
-                    // It is important that the computed height of the water is accurate before we start moving it around.
-                    update_water_depth
-                        .after(WaterSet::VerticalWaterMovement)
-                        .before(WaterSet::HorizontalWaterMovement)
-                        .in_set(SimulationSet),
-                )
-                .add_system(horizontal_water_movement.in_set(WaterSet::HorizontalWaterMovement))
-                .add_systems(
-                    (add_water_emitters, update_water_depth).in_set(WaterSet::Synchronization),
-                );
-        });
+        app.configure_sets(
+            FixedUpdate,
+            (
+                WaterSet::VerticalWaterMovement,
+                WaterSet::HorizontalWaterMovement,
+                WaterSet::Synchronization,
+            )
+                .in_set(SimulationSet)
+                .chain(),
+        )
+        .add_systems(
+            FixedUpdate,
+            cache_water_volume
+                .before(WaterSet::VerticalWaterMovement)
+                // This needs to respect pausing
+                .in_set(SimulationSet),
+        )
+        .add_systems(
+            FixedUpdate,
+            (
+                tides,
+                produce_water_from_emitters,
+                precipitation,
+                // This system pulls in a ton of dependencies, so it's best to fail silently when they don't exist
+                // to allow for integration testing of water behavior.
+                draw_water_from_roots
+                    .run_if(resource_exists::<StructureManifest>())
+                    .run_if(resource_exists::<ItemManifest>()),
+                evaporation,
+            )
+                .chain()
+                .in_set(WaterSet::VerticalWaterMovement),
+        )
+        .add_systems(
+            FixedUpdate,
+            // It is important that the computed height of the water is accurate before we start moving it around.
+            update_water_depth
+                .after(WaterSet::VerticalWaterMovement)
+                .before(WaterSet::HorizontalWaterMovement)
+                .in_set(SimulationSet),
+        )
+        .add_systems(
+            FixedUpdate,
+            horizontal_water_movement.in_set(WaterSet::HorizontalWaterMovement),
+        )
+        .add_systems(
+            FixedUpdate,
+            (add_water_emitters, update_water_depth).in_set(WaterSet::Synchronization),
+        );
     }
 }
 
@@ -205,7 +210,7 @@ impl Id<Item> {
 /// The components needed to track the water table.
 ///
 /// These are stored on terrain tile entities.
-/// To fully compute basic water dynamics, you also need the [`VoxelPos`](crate::geometry::VoxelPos) and [`Height`] components.
+/// To fully compute basic water dynamics, you also need the [`VoxelPos`] and [`Height`] components.
 #[derive(Bundle, Debug, Default)]
 pub struct WaterBundle {
     /// The volume of water stored at this tile.
diff --git a/emergence_lib/src/water/water_dynamics.rs b/emergence_lib/src/water/water_dynamics.rs
index f65011995..1ec5142e0 100644
--- a/emergence_lib/src/water/water_dynamics.rs
+++ b/emergence_lib/src/water/water_dynamics.rs
@@ -216,9 +216,13 @@ pub fn horizontal_water_movement(
     if water_config.enable_oceans {
         for hex in map_geometry.ocean_tiles() {
             for maybe_neighbor in map_geometry.adjacent_hexes(hex) {
-                let Some(valid_neighbor) = maybe_neighbor else { continue };
+                let Some(valid_neighbor) = maybe_neighbor else {
+                    continue;
+                };
 
-                let Ok(neighbor_entity) = map_geometry.get_terrain(valid_neighbor) else { continue };
+                let Ok(neighbor_entity) = map_geometry.get_terrain(valid_neighbor) else {
+                    continue;
+                };
                 let neighbor_query_item = terrain_query.get(neighbor_entity).unwrap();
 
                 let neighbor_tile_height = map_geometry.get_height(valid_neighbor).unwrap().into();
@@ -455,14 +459,10 @@ mod tests {
     fn water_testing_app(scenario: Scenario) -> App {
         let mut app = App::new();
         app.add_plugins(MinimalPlugins)
-            .add_plugin(WaterPlugin)
-            .add_plugin(WeatherPlugin)
+            .add_plugins(WaterPlugin)
+            .add_plugins(WeatherPlugin)
             .init_resource::<InGameTime>()
-            .add_system(
-                advance_in_game_time
-                    .in_set(SimulationSet)
-                    .in_schedule(CoreSchedule::FixedUpdate),
-            );
+            .add_systems(FixedUpdate, advance_in_game_time.in_set(SimulationSet));
 
         let map_geometry = scenario
             .map_shape
diff --git a/emergence_lib/src/world_gen/mod.rs b/emergence_lib/src/world_gen/mod.rs
index 9d722758f..030c07275 100644
--- a/emergence_lib/src/world_gen/mod.rs
+++ b/emergence_lib/src/world_gen/mod.rs
@@ -32,27 +32,26 @@ impl Plugin for GenerationPlugin {
         app.add_state::<WorldGenState>()
             .insert_resource(self.config.clone())
             .add_systems(
+                OnEnter(WorldGenState::Generating),
                 (
                     generate_terrain,
-                    apply_system_buffers,
+                    apply_deferred,
                     generate_landmarks,
                     initialize_water_table,
-                    apply_system_buffers,
+                    apply_deferred,
                     generate_structures,
-                    apply_system_buffers,
+                    apply_deferred,
                     generate_units,
-                    apply_system_buffers,
+                    apply_deferred,
                     randomize_starting_organisms,
                 )
-                    .chain()
-                    .in_schedule(OnEnter(WorldGenState::Generating)),
+                    .chain(),
             )
-            .add_system(
-                WorldGenState::manage_state
-                    .in_base_set(CoreSet::PreUpdate)
-                    .run_if(|world_gen_state: Res<State<WorldGenState>>| {
-                        world_gen_state.0 != WorldGenState::Complete
-                    }),
+            .add_systems(
+                PreUpdate,
+                WorldGenState::manage_state.run_if(|world_gen_state: Res<State<WorldGenState>>| {
+                    *world_gen_state.get() != WorldGenState::Complete
+                }),
             );
     }
 }
@@ -81,7 +80,7 @@ impl WorldGenState {
         mut maybe_frame_pace_settings: Option<ResMut<FramepaceSettings>>,
         maybe_asset_state: Option<Res<State<AssetState>>>,
     ) {
-        match world_gen_state.0 {
+        match world_gen_state.get() {
             WorldGenState::Waiting => {
                 if let Some(frame_pace_settings) = maybe_frame_pace_settings.as_mut() {
                     // Don't limit the tick rate while generating the world
@@ -91,7 +90,7 @@ impl WorldGenState {
                 }
 
                 if let Some(asset_state) = maybe_asset_state {
-                    if asset_state.0 == AssetState::FullyLoaded {
+                    if *asset_state.get() == AssetState::FullyLoaded {
                         next_world_gen_state.set(WorldGenState::Generating);
                     }
                 } else {
@@ -296,7 +295,7 @@ mod tests {
         let mut app = App::new();
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_system(generate_terrain);
+        app.add_systems(Startup, generate_terrain);
 
         app.update();
     }
@@ -304,10 +303,10 @@ mod tests {
     #[test]
     fn can_generate_organisms() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems((generate_terrain, generate_structures).chain());
+        app.add_systems(Startup, (generate_terrain, generate_structures).chain());
 
         app.update();
     }
@@ -315,10 +314,11 @@ mod tests {
     #[test]
     fn units_are_on_top_of_empty_ground() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems(
+        app.add_systems(
+            Startup,
             (generate_terrain, generate_structures, generate_landmarks).chain(),
         );
 
@@ -340,10 +340,11 @@ mod tests {
     #[test]
     fn structures_are_above_ground() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems(
+        app.add_systems(
+            Startup,
             (generate_terrain, generate_structures, generate_landmarks).chain(),
         );
 
@@ -361,10 +362,10 @@ mod tests {
     #[test]
     fn structures_exist() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems((generate_terrain, generate_structures).chain());
+        app.add_systems(Startup, (generate_terrain, generate_structures).chain());
 
         app.update();
 
@@ -382,9 +383,9 @@ mod tests {
     #[test]
     fn terrain_exists() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
-        app.add_startup_system(generate_terrain);
+        app.add_systems(Startup, generate_terrain);
         app.insert_resource(GlobalRng::new(0));
 
         app.update();
@@ -403,10 +404,10 @@ mod tests {
     #[test]
     fn can_generate_landmarks() {
         let mut app = App::new();
-        app.add_plugin(DummyManifestPlugin);
+        app.add_plugins(DummyManifestPlugin);
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems((generate_terrain, generate_landmarks).chain());
+        app.add_systems(Startup, (generate_terrain, generate_landmarks).chain());
 
         app.update();
     }
@@ -417,7 +418,7 @@ mod tests {
         app.insert_resource(GenerationConfig::testing());
         app.insert_resource(WaterConfig::IN_GAME);
         app.insert_resource(GlobalRng::new(0));
-        app.add_startup_systems((generate_terrain, initialize_water_table).chain());
+        app.add_systems(Startup, (generate_terrain, initialize_water_table).chain());
 
         app.update();
     }
@@ -425,10 +426,10 @@ mod tests {
     #[test]
     fn can_generate_world() {
         let mut app = App::new();
-        app.add_plugin(GenerationPlugin {
+        app.add_plugins(GenerationPlugin {
             config: GenerationConfig::testing(),
         })
-        .add_plugin(DummyManifestPlugin);
+        .add_plugins(DummyManifestPlugin);
         app.insert_resource(GlobalRng::new(0));
         app.insert_resource(WaterConfig::IN_GAME);
 
diff --git a/tools/ci/Cargo.toml b/tools/ci/Cargo.toml
index 70455dbaf..337ffc17d 100644
--- a/tools/ci/Cargo.toml
+++ b/tools/ci/Cargo.toml
@@ -8,4 +8,4 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 xshell = "0.2"
-bevy = "0.10"
+bevy = "0.11"
diff --git a/tools/debug_tools/Cargo.toml b/tools/debug_tools/Cargo.toml
deleted file mode 100644
index d8ad013a7..000000000
--- a/tools/debug_tools/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "debug_tools"
-version = "0.0.2"
-authors = ["Lyla <wallamide@gmail.com>"]
-edition = "2021"
-description = "Debugging tools for Emergence"
-publish = false
-license = "MIT OR Apache-2.0"
-
-[lib]
-name = "debug_tools"
-
-[dependencies]
-bevy = "0.10"
-# TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-# bevy_console = { git = "https://github.com/RichoDemus/bevy-console", rev = "fa09da33ee752facc8eb3b2ba93682005d179624" } # add bevy 0.9 revision
-# bevy_egui = "0.18.0" # TODO add when we use bevy_egui for debug ui
-# ALERT: using bevy-inspector-egui > 0.14 might cause issues with bevy_console
-bevy-inspector-egui = "0.18"
-leafwing-input-manager = "0.9"
diff --git a/tools/debug_tools/src/console.rs b/tools/debug_tools/src/console.rs
deleted file mode 100644
index 9fbebd1dc..000000000
--- a/tools/debug_tools/src/console.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-//! Create and manage `bevy_console` commands.
-
-use crate::*;
-
-// Modified from the log command example (https://github.com/RichoDemus/bevy-console/blob/main/examples/log_command.rs)
-/// Prints given arguments to the console
-#[derive(ConsoleCommand)]
-#[console_command(name = "log")]
-pub struct PrintToLog {
-    /// Message to print
-    msg: String,
-    /// Number of times to print message
-    num: Option<i64>,
-}
-
-// TODO add more useful commands
-/// allow command line statements to print to console N number of times
-pub fn print_to_log(mut log: ConsoleCommand<PrintToLog>) {
-    if let Some(Ok(PrintToLog { msg, num })) = log.take() {
-        let repeat_count = num.unwrap_or(1);
-
-        for _ in 0..repeat_count {
-            reply!(log, "{msg}");
-        }
-
-        log.ok();
-    }
-}
diff --git a/tools/debug_tools/src/debug_ui.rs b/tools/debug_tools/src/debug_ui.rs
deleted file mode 100644
index 6112e51bd..000000000
--- a/tools/debug_tools/src/debug_ui.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-//! Debugging user interface for development
-
-use crate::*;
-use bevy::prelude::*;
-
-// Modified text_debug example from the Bevy UI examples (https://github.com/bevyengine/bevy/blob/main/examples/ui/text_debug.rs)
-/// Tag for the changing fps text component.
-#[derive(Component)]
-pub struct FpsText;
-
-/// A marker entity for the developer controls
-#[derive(Component)]
-pub struct DevControlMarker;
-
-/// Generate text elements on the screen
-pub fn initialize_infotext(mut commands: Commands, asset_server: Res<AssetServer>) {
-    init_dev_action(&mut commands);
-    init_fps_text(&mut commands, asset_server);
-}
-
-fn init_dev_action(commands: &mut Commands) {
-    let dev_controls = DevControls::default();
-    commands
-        .spawn(DevControlMarker)
-        .insert(InputManagerBundle::<DevAction> {
-            action_state: ActionState::default(),
-            input_map: InputMap::new([
-                (dev_controls.toggle_dev_mode, DevAction::ToggleDevMode),
-                (dev_controls.toggle_tile_labels, DevAction::ToggleTileLabels),
-                (dev_controls.toggle_fps, DevAction::ToggleInfoText),
-                (dev_controls.toggle_inspector, DevAction::ToggleInspector),
-            ]),
-        });
-}
-
-fn init_fps_text(commands: &mut Commands, asset_server: Res<AssetServer>) {
-    let font = asset_server.load("fonts/FiraSans-Bold.ttf");
-
-    // Create a text section in the top left corner to draw the fps readout
-    commands.spawn((
-        TextBundle::from_sections([TextSection::new(
-            "",
-            TextStyle {
-                font,
-                font_size: 30.0,
-                color: Color::YELLOW_GREEN,
-            },
-        )])
-        .with_style(Style {
-            position_type: PositionType::Absolute,
-            position: UiRect {
-                top: Val::Px(15.0),
-                left: Val::Px(160.0),
-                ..default()
-            },
-            ..default()
-        }),
-        FpsText,
-    ));
-}
-
-/// Change text being displayed on the screen.
-pub fn change_infotext(
-    time: Res<Time>,
-    diagnostics: Res<Diagnostics>,
-    mut fps_text_query: Query<&mut Text, With<FpsText>>,
-    debug_info: Res<DebugInfo>,
-) {
-    let mut fps_text = fps_text_query.single_mut();
-
-    // Clear out any fps text if it shouldn't be showing
-    if !debug_info.dev_mode || !debug_info.show_fps_info {
-        if !fps_text.sections[0].value.is_empty() {
-            fps_text.sections[0].value = String::new();
-        }
-        return;
-    }
-
-    if debug_info.show_fps_info {
-        let mut fps = 0.0;
-        if let Some(fps_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS) {
-            if let Some(fps_smoothed) = fps_diagnostic.smoothed() {
-                fps = fps_smoothed;
-            }
-        }
-
-        let mut frame_time = time.delta_seconds_f64();
-        if let Some(frame_time_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FRAME_TIME)
-        {
-            if let Some(frame_time_smoothed) = frame_time_diagnostic.smoothed() {
-                frame_time = frame_time_smoothed;
-            }
-        }
-
-        fps_text.sections[0].value = format!(" {fps:.1} fps, {frame_time:.3} ms/frame");
-    }
-}
-
-/// Toggle showing debug info
-pub fn show_debug_info(
-    dev: Query<&ActionState<DevAction>, With<DevControlMarker>>,
-    mut debug_info: ResMut<DebugInfo>,
-) {
-    let dev = dev.single();
-    let dev_mode = dev.just_pressed(DevAction::ToggleDevMode);
-
-    // Toggle the dev mode so that what happens is intuitive to the user
-    if dev_mode {
-        if debug_info.dev_mode {
-            debug_info.disable();
-            info!("Debug Info disabled");
-        } else {
-            debug_info.enable();
-            info!("Debug Info enabled");
-        }
-    }
-
-    if !debug_info.dev_mode {
-        // There is no other work to be done on this callback
-        // The DebugInfo shouldn't be changed after it gets disabled, or is already disabled
-        return;
-    }
-
-    let tile_labels = dev.just_pressed(DevAction::ToggleTileLabels);
-    let fps_info = dev.just_pressed(DevAction::ToggleInfoText);
-    let inspector = dev.just_pressed(DevAction::ToggleInspector);
-
-    toggle_debug_var(tile_labels, &mut debug_info.show_tile_labels, "Tile labels");
-    toggle_debug_var(fps_info, &mut debug_info.show_fps_info, "FPS info");
-    toggle_debug_var(inspector, &mut debug_info.show_inspector, "Egui inspector");
-}
-
-/// Toggle a debug variable only if the given action is active.
-/// Also logs out which variable is being toggled.
-fn toggle_debug_var(is_action_active: bool, var: &mut bool, log_str: &'static str) {
-    if !is_action_active {
-        return;
-    }
-
-    if *var {
-        *var = false;
-        info!("{} off", log_str);
-    } else {
-        *var = true;
-        info!("{} on", log_str);
-    }
-}
diff --git a/tools/debug_tools/src/lib.rs b/tools/debug_tools/src/lib.rs
deleted file mode 100644
index 0ed4ecb4c..000000000
--- a/tools/debug_tools/src/lib.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-//! Debugging dev tools for Emergence.
-//!
-//! Keybindings for the developer info toggles:
-//! - `dev_mode` is Ctrl+Shift+D.
-//! - `show_tile`_labels is Ctrl+Shift+T.
-//! - `show_fps_info` is Ctrl+Shift+V.
-//! - `show_inspector` is Ctrl+Shift+I.
-//! These keybindings were chosen because the average person will not want to touch these very
-//! often. Primary, non-modifier keys should be for main gameplay keys.
-
-use bevy::{
-    asset::AssetServer,
-    diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin},
-    prelude::{
-        default, Color, Commands, Component, KeyCode, Plugin, Query, Res, Resource, TextBundle,
-        With,
-    },
-    text::{Text, TextSection, TextStyle},
-    time::Time,
-    ui::{PositionType, Style, UiRect, Val},
-};
-use leafwing_input_manager::prelude::*;
-
-// TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-// use bevy_console::*;
-
-use bevy_inspector_egui::quick::WorldInspectorPlugin;
-// TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-// use console::{print_to_log, PrintToLog};
-
-// TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-// pub mod console;
-pub mod debug_ui;
-
-// Whichever version of bevy_egui is used by the inspector, make that available to other users of
-// debug_tools
-pub use bevy_inspector_egui::bevy_egui;
-
-/// Creates a global resource that can be used to toggle actively displayed debug tools.
-#[derive(Clone, Resource, Component, Copy, Debug, PartialEq, Eq)]
-pub struct DebugInfo {
-    /// Toggle global access to developer tools
-    pub dev_mode: bool,
-    // TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-    // /// Toggle developer console
-    // pub enable_console: bool,
-    /// Toggle the debug tile labels
-    pub show_tile_labels: bool,
-    /// Toggle render info
-    pub show_fps_info: bool,
-    /// Toggle displaying the egui inspector
-    pub show_inspector: bool,
-}
-
-impl DebugInfo {
-    /// Change all the values in this [`DebugInfo`] to be enabled
-    pub fn enable(&mut self) {
-        self.dev_mode = true;
-        self.show_tile_labels = true;
-        self.show_fps_info = true;
-        self.show_inspector = true;
-    }
-
-    /// Change all the values in this [`DebugInfo`] to be disabled
-    pub fn disable(&mut self) {
-        self.dev_mode = false;
-        self.show_tile_labels = false;
-        self.show_fps_info = false;
-        self.show_inspector = false;
-    }
-}
-
-// TODO: It might be good later in development or closer to release to make the default disabled
-impl Default for DebugInfo {
-    fn default() -> Self {
-        Self {
-            dev_mode: true,
-            // TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-            // enable_console: true,
-            show_tile_labels: true,
-            show_fps_info: true,
-            show_inspector: true,
-        }
-    }
-}
-/// Adds an instance of `bevy_console`, basic console commands, `bevy-inspector-egui`,
-/// and basic performance information like fps and frame counting.
-pub struct DebugToolsPlugin;
-
-impl Plugin for DebugToolsPlugin {
-    fn build(&self, app: &mut bevy::prelude::App) {
-        app.add_plugin(WorldInspectorPlugin::new())
-            .add_plugin(FrameTimeDiagnosticsPlugin)
-            .init_resource::<DebugInfo>()
-            .add_plugin(InputManagerPlugin::<DevAction>::default())
-            .add_system(debug_ui::show_debug_info);
-        // TODO: see: https://github.com/Leafwing-Studios/Emergence/issues/140
-        // .add_plugin(ConsolePlugin)
-        // .add_console_command::<PrintToLog, _>(print_to_log);
-    }
-}
-
-/// Enumerates the actions a developer can take.
-#[derive(Actionlike, Clone, Copy, PartialEq, Eq, Debug)]
-pub enum DevAction {
-    /// Toggle the overall developer mode setting
-    ToggleDevMode,
-    // TODO: make debug labels
-    /// Toggle tilemap labels tools
-    ToggleTileLabels,
-    /// Toggle rendering info
-    ToggleInfoText,
-    /// Toggle the inspector
-    ToggleInspector,
-}
-
-/// Interface for developer controls
-pub struct DevControls {
-    /// Toggle the dev mode
-    pub toggle_dev_mode: UserInput,
-    /// Toggle the tile label
-    pub toggle_tile_labels: UserInput,
-    /// Toggle the fps ui
-    pub toggle_fps: UserInput,
-    /// Toggle the inspector
-    pub toggle_inspector: UserInput,
-}
-
-/// Add default developer controls
-impl Default for DevControls {
-    fn default() -> Self {
-        Self {
-            toggle_dev_mode: UserInput::chord([KeyCode::LControl, KeyCode::LShift, KeyCode::D]),
-            toggle_tile_labels: UserInput::chord([KeyCode::LControl, KeyCode::LShift, KeyCode::T]),
-            toggle_fps: UserInput::chord([KeyCode::LControl, KeyCode::LShift, KeyCode::V]),
-            toggle_inspector: UserInput::chord([KeyCode::LControl, KeyCode::LShift, KeyCode::I]),
-        }
-    }
-}