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 'sam/torvus-fix-test' into 'master'

Browse Source 
Fix for torvus

See merge request veloren/veloren!1816
This commit is contained in:
Marcel 2021-02-23 20:51:14 +00:00
commit 553e8c2195
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -4749,9 +4749,20 @@ dependencies = [
"serde",
"shred",
"shrev",
"specs-derive",
"tuple_utils",
]
[[package]]
name = "specs-derive"
version = "0.4.1"
source = "git+https://github.com/amethyst/specs.git?rev=d4435bdf496cf322c74886ca09dd8795984919b4#d4435bdf496cf322c74886ca09dd8795984919b4"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "specs-idvs"
version = "0.1.1"

2
common/sys/Cargo.toml
View File

@ -26,7 +26,7 @@ indexmap = "1.3.0"
slab = "0.4.2"
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
# Serde
serde = { version = "1.0.110", features = ["derive"] }