Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC/update_deps' into 'master'

Browse Source 
xmac/update deps

See merge request veloren/veloren!4385
This commit is contained in:
Marcel 2024-03-20 21:35:02 +00:00
commit 710a007ab2
7 changed files with 565 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1091
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
client/Cargo.toml
View File

@ -43,7 +43,7 @@ client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true
serde = { workspace = true, features = [ "rc" ], optional = true }
ron = { workspace = true, optional = true }
clap = { workspace = true, optional = true }
rustyline = { version = "13.0.0", optional = true }
rustyline = { version = "14.0.0", optional = true }
## logging
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true }

2
common/Cargo.toml
View File

@ -72,7 +72,7 @@ clap = { workspace = true, optional = true }
hashbrown = { workspace = true }
slab = { workspace = true }
slotmap = { version = "1.0", features = ["serde"] }
indexmap = { version = "1.9.3", features = ["rayon"] }
indexmap = { version = "2.2.2", features = ["rayon"] }
# ECS
specs = { workspace = true, features = ["serde", "storage-event-control", "shred-derive"] }

2
network/Cargo.toml
View File

@ -55,7 +55,7 @@ serde = { version = "1.0", features = ["derive"] }
prometheus-hyper = { workspace = true }
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]}
#quic
rcgen = { version = "0.11"}
rcgen = { version = "0.12"}
[[bench]]
name = "speed"

4
server/Cargo.toml
View File

@ -64,7 +64,7 @@ enum-map = { workspace = true }
noise = { version = "0.7", default-features = false }
censor = "0.3"
rusqlite = { version = "0.28.0", features = ["array", "vtab", "bundled", "trace"] }
refinery = { version = "0.8.8", features = ["rusqlite"] }
rusqlite = { version = "0.30.0", features = ["array", "vtab", "bundled", "trace"] }
refinery = { version = "0.8.12", features = ["rusqlite"] }
schnellru = "0.2.1"

3
voxygen/src/singleplayer/singleplayer_world.rs
View File

@ -205,7 +205,8 @@ impl SingleplayerWorlds {
now.hour(),
now.minute(),
now.second(),
now.timestamp_subsec_millis()
now.and_utc().timestamp_subsec_millis() /* .and_utc() necessary, as other fn is
* deprecated */
);
let mut test_name = name.clone();

6
world/Cargo.toml
View File

@ -49,7 +49,7 @@ lz-fear = { version = "0.2", optional = true }
deflate = { version = "1.0.0", optional = true }
flate2 = { version = "1.0.20", optional = true }
num-traits = { workspace = true, optional = true }
fallible-iterator = { version = "0.2.0", optional = true }
fallible-iterator = { version = "0.3.0", optional = true }
rstar = { version = "0.10", optional = true }
clap = { workspace = true, optional = true }
signal-hook = { version = "0.3.6", optional = true }
@ -61,8 +61,8 @@ common-frontend = { package = "veloren-common-frontend", path = "../common/front
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]}
csv = "1.1.3"
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }
minifb = "0.24"
rusqlite = { version = "0.28.0", features = ["array", "vtab", "bundled", "trace"] }
minifb = "0.25"
rusqlite = { version = "0.30.0", features = ["array", "vtab", "bundled", "trace"] }
svg_fmt = "0.4"
[[bench]]