From 6ddd09b7b6351a05996f576bfbffcebe927fd519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Tue, 7 Jul 2020 12:55:06 +0200
Subject: [PATCH] specs back to master

---
 Cargo.lock         | 14 +++++++++++---
 voxygen/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf9ed53bfc..a5b989d08b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3692,6 +3692,14 @@ dependencies = [
  "tuple_utils",
 ]
 
+[[package]]
+name = "specs-idvs"
+version = "0.1.0"
+source = "git+https://gitlab.com/veloren/specs-idvs.git#530ebb00b60685d6d1f47a3bc16c5b1f25c5e530"
+dependencies = [
+ "specs",
+]
+
 [[package]]
 name = "specs-idvs"
 version = "0.1.0"
@@ -4390,7 +4398,7 @@ dependencies = [
  "serde",
  "serde_json",
  "specs",
- "specs-idvs",
+ "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)",
  "sum_type",
  "tracing",
  "vek",
@@ -4420,7 +4428,7 @@ dependencies = [
  "serde",
  "serde_json",
  "specs",
- "specs-idvs",
+ "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-16)",
  "tiny_http",
  "tracing",
  "uvth 3.1.1",
@@ -4478,7 +4486,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "specs",
- "specs-idvs",
+ "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
  "tracing",
  "tracing-appender",
  "tracing-log",
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 526f0c017e..44ff442b1d 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -34,7 +34,7 @@ euc = { git = "https://github.com/zesterer/euc.git" }
 
 # ECS
 specs = "0.16.1"
-specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-16" }
+specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
 
 # Mathematics
 vek = { version = "0.11.0", features = ["serde"] }