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 'xMAC94x/dependencies' into 'master'

Browse Source 
update dependencies

See merge request veloren/veloren!2577
This commit is contained in:
Marcel
2021-07-08 16:40:37 +00:00
parent 4b1a3891df 98800c5424
commit 8bb5fb6c14
6 changed files with 319 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

699
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
common/Cargo.toml
View File

@ -26,8 +26,8 @@ enum-iterator = "0.6"
vek = { version = "=0.14.1", features = ["serde"] } vek = { version = "=0.14.1", features = ["serde"] }
# Strum # Strum
strum = "0.20" strum = "0.21"
strum_macros = "0.20" strum_macros = "0.21"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
approx = "0.4.0" approx = "0.4.0"

4
server-cli/Cargo.toml
View File

@ -29,10 +29,10 @@ common-frontend = { package = "veloren-common-frontend", path = "../common/front
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] } tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0" num_cpus = "1.0"
ansi-parser = "0.7" ansi-parser = "0.8"
clap = "2.33" clap = "2.33"
structopt = "0.3.13" structopt = "0.3.13"
crossterm = "0.19" crossterm = "0.20"
lazy_static = "1" lazy_static = "1"
signal-hook = "0.3.6" signal-hook = "0.3.6"
shell-words = "1.0.0" shell-words = "1.0.0"

4
voxygen/Cargo.toml
View File

@ -110,8 +110,8 @@ rayon = "1.5"
rodio = {version = "0.14", default-features = false, features = ["vorbis"]} rodio = {version = "0.14", default-features = false, features = ["vorbis"]}
ron = {version = "0.6", default-features = false} ron = {version = "0.6", default-features = false}
serde = {version = "1.0", features = [ "rc", "derive" ]} serde = {version = "1.0", features = [ "rc", "derive" ]}
strum = "0.20" strum = "0.21"
strum_macros = "0.20" strum_macros = "0.21"
treeculler = "0.2" treeculler = "0.2"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] } tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0" num_cpus = "1.0"

4
voxygen/i18n/Cargo.toml
View File

@ -18,13 +18,13 @@ serde = { version = "1.0", features = ["derive"] }
tracing = "0.1" tracing = "0.1"
# Diagnostic # Diagnostic
ron = "0.6" ron = "0.6"
git2 = { version = "0.12", default-features = false, optional = true } git2 = { version = "0.13", default-features = false, optional = true }
# Binary # Binary
clap = { version = "2.33", features = ["suggestions"], default-features = false, optional = true } clap = { version = "2.33", features = ["suggestions"], default-features = false, optional = true }
[dev-dependencies] [dev-dependencies]
git2 = { version = "0.12", default-features = false } git2 = { version = "0.13", default-features = false }
[features] [features]
bin = ["git2", "clap"] bin = ["git2", "clap"]

4
world/Cargo.toml
View File

@ -44,7 +44,7 @@ flate2 = { version = "1.0.20", optional = true }
num-traits = { version = "0.2", optional = true } num-traits = { version = "0.2", optional = true }
fallible-iterator = { version = "0.2.0", optional = true } fallible-iterator = { version = "0.2.0", optional = true }
kiddo = { version = "0.1.4", optional = true } kiddo = { version = "0.1.4", optional = true }
rstar = { version = "0.8.3", optional = true } rstar = { version = "0.9", optional = true }
clap = { version = "2.33.3", optional = true } clap = { version = "2.33.3", optional = true }
@ -57,7 +57,7 @@ minifb = "0.19.1"
rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] } rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] }
svg_fmt = "0.4" svg_fmt = "0.4"
structopt = "0.3" structopt = "0.3"
strum = "0.20" strum = "0.21"
[[bench]] [[bench]]
harness = false harness = false