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

Browse Source 
fix specs

See merge request veloren/veloren!1179
This commit is contained in:
Marcel 2020-07-07 13:00:09 +00:00
commit 258e39f1dc
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@ -3700,14 +3700,6 @@ dependencies = [
"specs", "specs",
] ]
[[package]]
name = "specs-idvs"
version = "0.1.0"
source = "git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16#349153d18c19d238523e4eddd5bec179d38c59c5"
dependencies = [
"specs",
]
[[package]] [[package]]
name = "spin" name = "spin"
version = "0.5.2" version = "0.5.2"
@ -4398,7 +4390,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"specs", "specs",
"specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)", "specs-idvs",
"sum_type", "sum_type",
"tracing", "tracing",
"vek", "vek",
@ -4428,7 +4420,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"specs", "specs",
"specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)", "specs-idvs",
"tiny_http", "tiny_http",
"tracing", "tracing",
"uvth 3.1.1", "uvth 3.1.1",
@ -4486,7 +4478,7 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"specs", "specs",
"specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)", "specs-idvs",
"tracing", "tracing",
"tracing-appender", "tracing-appender",
"tracing-log", "tracing-log",

2
common/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
no-assets = [] no-assets = []
[dependencies] [dependencies]
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-16" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
specs = { version = "0.16.1", features = ["serde", "storage-event-control"] } specs = { version = "0.16.1", features = ["serde", "storage-event-control"] }
vek = { version = "0.11.0", features = ["serde"] } vek = { version = "0.11.0", features = ["serde"] }

2
server/Cargo.toml
View File

@ -13,7 +13,7 @@ common = { package = "veloren-common", path = "../common" }
world = { package = "veloren-world", path = "../world" } world = { package = "veloren-world", path = "../world" }
network = { package = "veloren_network", path = "../network", default-features = false } network = { package = "veloren_network", path = "../network", default-features = false }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-16" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
tracing = "0.1" tracing = "0.1"
specs = { version = "0.16.1", features = ["shred-derive"] } specs = { version = "0.16.1", features = ["shred-derive"] }