jeff/trade_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

Switch back to veloren master branch

Browse Source
This commit is contained in:
Jeff 2024-07-11 05:29:34 -04:00
parent 80fb6a7d2b
commit 44bc14bb1e
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock generated
View File

@ -2856,7 +2856,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-client" name = "veloren-client"
version = "0.16.0" version = "0.16.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"authc", "authc",
"byteorder", "byteorder",
@ -2882,7 +2882,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common" name = "veloren-common"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"approx", "approx",
"bitflags 2.5.0", "bitflags 2.5.0",
@ -2922,7 +2922,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-assets" name = "veloren-common-assets"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"assets_manager", "assets_manager",
"dot_vox", "dot_vox",
@ -2937,7 +2937,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-base" name = "veloren-common-base"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"directories-next", "directories-next",
"tracing", "tracing",
@ -2946,7 +2946,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-ecs" name = "veloren-common-ecs"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"specs", "specs",
"tracing", "tracing",
@ -2956,7 +2956,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-i18n" name = "veloren-common-i18n"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
"rand", "rand",
@ -2966,7 +2966,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-net" name = "veloren-common-net"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"bincode", "bincode",
"flate2", "flate2",
@ -2984,7 +2984,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-state" name = "veloren-common-state"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3006,7 +3006,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-common-systems" name = "veloren-common-systems"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"itertools 0.13.0", "itertools 0.13.0",
"ordered-float", "ordered-float",
@ -3024,7 +3024,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-network" name = "veloren-network"
version = "0.3.0" version = "0.3.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-trait", "async-trait",
@ -3049,7 +3049,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-network-protocol" name = "veloren-network-protocol"
version = "0.6.1" version = "0.6.1"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitflags 2.5.0", "bitflags 2.5.0",
@ -3063,7 +3063,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-world" name = "veloren-world"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb" source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19"
dependencies = [ dependencies = [
"arr_macro", "arr_macro",
"bincode", "bincode",

10
Cargo.toml
View File

@ -5,10 +5,12 @@ edition = "2021"
[dependencies] [dependencies]
tokio = "1.38.0" tokio = "1.38.0"
veloren-common = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" , features = ["no-assets"] } veloren-common = { git = "https://gitlab.com/veloren/veloren", branch = "master", features = [
veloren-common-net = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" } "no-assets",
veloren-client = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" } ] }
veloren-world = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" } veloren-common-net = { git = "https://gitlab.com/veloren/veloren", branch = "master" }
veloren-client = { git = "https://gitlab.com/veloren/veloren", branch = "master" }
veloren-world = { git = "https://gitlab.com/veloren/veloren", branch = "master" }
toml = "0.8.14" toml = "0.8.14"
serde = { version = "1.0.203", features = ["derive"] } serde = { version = "1.0.203", features = ["derive"] }
log = "0.4.22" log = "0.4.22"