diff --git a/Cargo.lock b/Cargo.lock index a5b989d08b..66a2f27b45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3700,14 +3700,6 @@ dependencies = [ "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]] name = "spin" version = "0.5.2" @@ -4398,7 +4390,7 @@ dependencies = [ "serde", "serde_json", "specs", - "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)", + "specs-idvs", "sum_type", "tracing", "vek", @@ -4428,7 +4420,7 @@ dependencies = [ "serde", "serde_json", "specs", - "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)", + "specs-idvs", "tiny_http", "tracing", "uvth 3.1.1", @@ -4486,7 +4478,7 @@ dependencies = [ "serde", "serde_derive", "specs", - "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)", + "specs-idvs", "tracing", "tracing-appender", "tracing-log", diff --git a/common/Cargo.toml b/common/Cargo.toml index 929390bc5e..b481a0a9ad 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" no-assets = [] [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"] } vek = { version = "0.11.0", features = ["serde"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index c19e454878..37c584765a 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -13,7 +13,7 @@ common = { package = "veloren-common", path = "../common" } world = { package = "veloren-world", path = "../world" } 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" specs = { version = "0.16.1", features = ["shred-derive"] }