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

specs back to master

Browse Source
This commit is contained in:
Marcel Märtens 2020-07-07 12:55:06 +02:00
parent c8fd6f4766
commit 6ddd09b7b6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

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

2
voxygen/Cargo.toml
View File

@ -34,7 +34,7 @@ euc = { git = "https://github.com/zesterer/euc.git" }
# ECS # ECS
specs = "0.16.1" 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 # Mathematics
vek = { version = "0.11.0", features = ["serde"] } vek = { version = "0.11.0", features = ["serde"] }