Merge branch 'main' into colored-optional

blst-security · Sep 3, 2023 · 2c12105 · 2c12105
2 parents 0ae6160 + ef0b633
commit 2c12105
Show file tree

Hide file tree

Showing 25 changed files with 1,526 additions and 123 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,11 +24,13 @@ clap = { version = "4.0.29", features = ["derive"] }
 const_format = "0.2.30"
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
-cherrybomb-engine = "^0.1"
+#cherrybomb-engine = "^0.1"
+cherrybomb-engine = {path = "./cherrybomb-engine"}
 serde_yaml = "^0.9.0"
 uuid = {version = "1.2.2", features = ["v4"] }
 dirs = "4.0.0"
-reqwest = "0.11.13"
+reqwest = { version = "^0.11",default_features = false, features = ["json","rustls-tls"] }
 comfy-table = "6.1.4"
 serde_derive = "1.0.152"
-
+
+