From 0d8ef5de88ef0f3114826c87d0e8f8a55503a216 Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Fri, 17 Dec 2021 20:37:02 -0500
Subject: [PATCH] Updated everything over to bevy main.

---
 Cargo.lock               | 64 ++++++++++++++++++++--------------------
 Cargo.toml               |  2 +-
 README.md                |  4 +--
 bevy_kayak_ui/Cargo.toml |  4 +--
 kayak_font/Cargo.toml    |  4 +--
 kayak_widgets/Cargo.toml |  2 +-
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c7aa96..a15b184 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -193,7 +193,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 [[package]]
 name = "bevy"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_internal",
 ]
@@ -201,7 +201,7 @@ dependencies = [
 [[package]]
 name = "bevy_app"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -214,7 +214,7 @@ dependencies = [
 [[package]]
 name = "bevy_asset"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -241,7 +241,7 @@ dependencies = [
 [[package]]
 name = "bevy_audio"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -256,7 +256,7 @@ dependencies = [
 [[package]]
 name = "bevy_core"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_derive",
@@ -271,7 +271,7 @@ dependencies = [
 [[package]]
 name = "bevy_core_pipeline"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -283,7 +283,7 @@ dependencies = [
 [[package]]
 name = "bevy_derive"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "Inflector",
  "bevy_macro_utils",
@@ -294,7 +294,7 @@ dependencies = [
 [[package]]
 name = "bevy_diagnostic"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -306,7 +306,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -323,7 +323,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -334,7 +334,7 @@ dependencies = [
 [[package]]
 name = "bevy_gilrs"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -346,7 +346,7 @@ dependencies = [
 [[package]]
 name = "bevy_gltf"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "anyhow",
  "base64",
@@ -371,7 +371,7 @@ dependencies = [
 [[package]]
 name = "bevy_input"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -382,7 +382,7 @@ dependencies = [
 [[package]]
 name = "bevy_internal"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -429,7 +429,7 @@ dependencies = [
 [[package]]
 name = "bevy_log"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -443,7 +443,7 @@ dependencies = [
 [[package]]
 name = "bevy_macro_utils"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "cargo-manifest",
  "quote",
@@ -453,7 +453,7 @@ dependencies = [
 [[package]]
 name = "bevy_math"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_reflect",
  "glam",
@@ -462,7 +462,7 @@ dependencies = [
 [[package]]
 name = "bevy_pbr"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -484,7 +484,7 @@ dependencies = [
 [[package]]
 name = "bevy_reflect"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_reflect_derive",
  "bevy_utils",
@@ -500,7 +500,7 @@ dependencies = [
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -512,7 +512,7 @@ dependencies = [
 [[package]]
 name = "bevy_render"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -545,7 +545,7 @@ dependencies = [
 [[package]]
 name = "bevy_scene"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -563,7 +563,7 @@ dependencies = [
 [[package]]
 name = "bevy_sprite"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -587,7 +587,7 @@ dependencies = [
 [[package]]
 name = "bevy_tasks"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -600,7 +600,7 @@ dependencies = [
 [[package]]
 name = "bevy_text"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -623,7 +623,7 @@ dependencies = [
 [[package]]
 name = "bevy_transform"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -636,7 +636,7 @@ dependencies = [
 [[package]]
 name = "bevy_ui"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -664,7 +664,7 @@ dependencies = [
 [[package]]
 name = "bevy_utils"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "ahash",
  "bevy_derive",
@@ -677,7 +677,7 @@ dependencies = [
 [[package]]
 name = "bevy_window"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bevy_app",
  "bevy_math",
@@ -689,7 +689,7 @@ dependencies = [
 [[package]]
 name = "bevy_winit"
 version = "0.5.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "approx",
  "bevy_app",
@@ -1095,7 +1095,7 @@ dependencies = [
 [[package]]
 name = "crevice"
 version = "0.8.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "bytemuck",
  "crevice-derive",
@@ -1106,7 +1106,7 @@ dependencies = [
 [[package]]
 name = "crevice-derive"
 version = "0.8.0"
-source = "git+https://github.com/StarArawn/bevy?rev=bcca341d696c66d0173d8b0ac7a1b23b4b9e775c#bcca341d696c66d0173d8b0ac7a1b23b4b9e775c"
+source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index fcfd8e0..e76dc57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,5 +25,5 @@ kayak_font = { path = "kayak_font", optional = true }
 kayak_render_macros = { path = "kayak_render_macros" }
 
 [dev-dependencies]
-bevy = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
 kayak_widgets = { path = "kayak_widgets", features = ["bevy_renderer"] }
diff --git a/README.md b/README.md
index f13067a..69570f4 100644
--- a/README.md
+++ b/README.md
@@ -47,10 +47,10 @@ Because bevy's new renderer is not released yet there is no crate on crates.io y
 ```rust
 kayak_ui = { git="https://github.com/StarArawn/kayak_ui", rev="{INSERT_COMMIT_SHA_HERE}" }
 kayak_widgets = { git="https://github.com/StarArawn/kayak_ui", rev="{INSERT_COMMIT_SHA_HERE}" }
-bevy = { git="https://github.com/StarArawn/bevy", rev="{INSERT_COMMIT_SHA_HERE}" }
+bevy = { git="https://github.com/bevyengine/bevy", rev="{INSERT_COMMIT_SHA_HERE}" }
 ```
 
-It's also worth mentioning that you will need to use the same bevy revision that this library uses which is currently: `bcca341d696c66d0173d8b0ac7a1b23b4b9e775c`.
+It's also worth mentioning that you will need to use the same bevy revision that this library uses which is currently: `9a16a4d01830297987db40b45f03382ed3acad62`.
 
 This is temporary and will change when bevy 0.6 is released.
 
diff --git a/bevy_kayak_ui/Cargo.toml b/bevy_kayak_ui/Cargo.toml
index e0bf202..8216639 100644
--- a/bevy_kayak_ui/Cargo.toml
+++ b/bevy_kayak_ui/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 
 [dependencies]
 bytemuck = "1.7.2"
-bevy = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
 kayak_core = { path = "../kayak_core" }
 kayak_font = { path = "../kayak_font" }
 #kayak_font = { path = "../kayak_font" }
-crevice = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
+crevice = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
 serde = "1.0"
 serde_json = "1.0"
 serde_path_to_error = "0.1"
diff --git a/kayak_font/Cargo.toml b/kayak_font/Cargo.toml
index 4579aba..28aa86b 100644
--- a/kayak_font/Cargo.toml
+++ b/kayak_font/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
 
 [dependencies]
 anyhow = { version = "1.0" }
-bevy = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
 bytemuck = "1.7.2"
-crevice = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
+crevice = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
 serde = "1.0"
 serde_json = "1.0"
 serde_path_to_error = "0.1"
diff --git a/kayak_widgets/Cargo.toml b/kayak_widgets/Cargo.toml
index a1c7814..eb37067 100644
--- a/kayak_widgets/Cargo.toml
+++ b/kayak_widgets/Cargo.toml
@@ -10,4 +10,4 @@ bevy_renderer = ["bevy", "kayak_ui/bevy_renderer"]
 
 [dependencies]
 kayak_ui = { path = "../", version = "0.1.0" }
-bevy = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c", optional = true }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62", optional = true }
-- 
GitLab