mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'a1phyr/assets_manager_0.12' into 'master'
Update `assets_manager` to 0.12 See merge request veloren/veloren!4566
This commit is contained in:
commit
2c1a141fd8
5
Cargo.lock
generated
5
Cargo.lock
generated
@ -320,14 +320,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "assets_manager"
|
||||
version = "0.11.6"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4dde42f7d78f1a1d0149ac8526e21c6c849090ce6aa191ae94b90b0cb2e4aed"
|
||||
checksum = "eadb8d5c3ec796630a35133c038842b02bcfc2a8a324349fc24fd6db5d679474"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"ahash 0.8.11",
|
||||
"bincode",
|
||||
"crossbeam-channel",
|
||||
"hashbrown 0.14.5",
|
||||
"log",
|
||||
"notify",
|
||||
"ron",
|
||||
|
@ -7,7 +7,7 @@ version = "0.10.0"
|
||||
|
||||
[dependencies]
|
||||
lazy_static = { workspace = true }
|
||||
assets_manager = { version = "0.11.1", features = ["bincode", "ron", "json"] }
|
||||
assets_manager = { version = "0.12", features = ["bincode", "ron", "json"] }
|
||||
ron = { workspace = true }
|
||||
dot_vox = "5.1"
|
||||
wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them
|
||||
|
@ -112,7 +112,7 @@ server = { package = "veloren-server", path = "../server", optional = true, defa
|
||||
clap = { workspace = true }
|
||||
|
||||
# Utility
|
||||
assets_manager = { version = "0.11", features = ["ab_glyph"] }
|
||||
assets_manager = { version = "0.12", features = ["ab_glyph"] }
|
||||
backtrace = "0.3.40"
|
||||
chrono = { workspace = true }
|
||||
chumsky = "0.9"
|
||||
|
Loading…
Reference in New Issue
Block a user