Merge branch 'master' of https://git.txmn.tk/tuxmain/bevyjam into nixon-main

Cargo.lock

@@ -923,24 +923,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "bevyjam"
-version = "0.1.0"
-dependencies = [
- "bevy",
- "bevy-inspector-egui",
- "bevy_common_assets",
- "bevy_mod_picking",
- "bevy_rapier2d",
- "crossbeam-channel",
- "rand",
- "rand_distr",
- "rapier2d",
- "serde",
- "serde_json",
- "ticktock",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.59.2"
@@ -2182,9 +2164,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2199,6 +2181,24 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "lux-synthese"
+version = "0.1.0"
+dependencies = [
+ "bevy",
+ "bevy-inspector-egui",
+ "bevy_common_assets",
+ "bevy_mod_picking",
+ "bevy_rapier2d",
+ "crossbeam-channel",
+ "rand",
+ "rand_distr",
+ "rapier2d",
+ "serde",
+ "serde_json",
+ "ticktock",
+]
+
 [[package]]
 name = "mach"
 version = "0.3.2"
@@ -3654,7 +3654,7 @@ dependencies = [
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "raw-window-handle",
  "smallvec",
  "wasm-bindgen",
@@ -3679,7 +3679,7 @@ dependencies = [
  "fxhash",
  "log",
  "naga",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle",
  "smallvec",
@@ -3715,7 +3715,7 @@ dependencies = [
  "metal",
  "naga",
  "objc",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
  "raw-window-handle",