Add new log; Change veloren version to weekly tag

This commit is contained in:
Jeff 2024-07-10 00:20:50 -04:00
parent 6a020aa6e6
commit c731c99208
4 changed files with 119 additions and 171 deletions

274
Cargo.lock generated
View File

@ -30,7 +30,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"getrandom 0.2.15", "getrandom",
"once_cell", "once_cell",
"version_check", "version_check",
"zerocopy", "zerocopy",
@ -45,6 +45,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "allocator-api2"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
[[package]] [[package]]
name = "android-tzdata" name = "android-tzdata"
version = "0.1.1" version = "0.1.1"
@ -200,7 +206,7 @@ name = "auth-common"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=ae0e16783a9f9041951296885f082308e155db79#ae0e16783a9f9041951296885f082308e155db79" source = "git+https://gitlab.com/veloren/auth.git?rev=ae0e16783a9f9041951296885f082308e155db79#ae0e16783a9f9041951296885f082308e155db79"
dependencies = [ dependencies = [
"rand 0.8.5", "rand",
"serde", "serde",
"uuid", "uuid",
] ]
@ -379,9 +385,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz" name = "chrono-tz"
version = "0.8.6" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
dependencies = [ dependencies = [
"chrono", "chrono",
"chrono-tz-build", "chrono-tz-build",
@ -391,21 +397,15 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz-build" name = "chrono-tz-build"
version = "0.2.1" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
dependencies = [ dependencies = [
"parse-zoneinfo", "parse-zoneinfo",
"phf", "phf",
"phf_codegen", "phf_codegen",
] ]
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "colorchoice" name = "colorchoice"
version = "1.0.1" version = "1.0.1"
@ -663,7 +663,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [ dependencies = [
"heck", "heck 0.4.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.66",
@ -935,17 +935,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "getrandom"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.15" version = "0.2.15"
@ -954,7 +943,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi",
] ]
[[package]] [[package]]
@ -982,22 +971,17 @@ dependencies = [
"ahash 0.4.8", "ahash 0.4.8",
] ]
[[package]]
name = "hashbrown"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
"ahash 0.8.11",
"rayon",
"serde",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.14.5" version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash 0.8.11",
"allocator-api2",
"rayon",
"serde",
]
[[package]] [[package]]
name = "heck" name = "heck"
@ -1005,6 +989,12 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.3.9" version = "0.3.9"
@ -1042,7 +1032,7 @@ dependencies = [
"idna 0.4.0", "idna 0.4.0",
"ipnet", "ipnet",
"once_cell", "once_cell",
"rand 0.8.5", "rand",
"thiserror", "thiserror",
"tinyvec", "tinyvec",
"tokio", "tokio",
@ -1063,7 +1053,7 @@ dependencies = [
"lru-cache", "lru-cache",
"once_cell", "once_cell",
"parking_lot", "parking_lot",
"rand 0.8.5", "rand",
"resolv-conf", "resolv-conf",
"smallvec", "smallvec",
"thiserror", "thiserror",
@ -1236,16 +1226,16 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.24.9" version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder",
"color_quant",
"jpeg-decoder",
"num-traits", "num-traits",
"png", "png",
"zune-core",
"zune-jpeg",
] ]
[[package]] [[package]]
@ -1291,18 +1281,18 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.5" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [ dependencies = [
"either", "either",
] ]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.12.1" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
dependencies = [ dependencies = [
"either", "either",
] ]
@ -1333,12 +1323,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jpeg-decoder"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.69" version = "0.3.69"
@ -1364,7 +1348,7 @@ dependencies = [
"itertools 0.12.1", "itertools 0.12.1",
"log", "log",
"num-traits", "num-traits",
"ordered-float 4.2.0", "ordered-float",
"sorted-vec", "sorted-vec",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -1488,17 +1472,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [ dependencies = [
"libc", "libc",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
name = "noise" name = "noise"
version = "0.7.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43" checksum = "6da45c8333f2e152fc665d78a380be060eb84fad8ca4c9f7ac8ca29216cff0cc"
dependencies = [ dependencies = [
"rand 0.7.3", "num-traits",
"rand",
"rand_xorshift", "rand_xorshift",
] ]
@ -1658,15 +1643,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "ordered-float"
version = "3.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "ordered-float" name = "ordered-float"
version = "4.2.0" version = "4.2.0"
@ -1758,7 +1734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [ dependencies = [
"phf_shared", "phf_shared",
"rand 0.8.5", "rand",
] ]
[[package]] [[package]]
@ -1886,7 +1862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08"
dependencies = [ dependencies = [
"bytes", "bytes",
"rand 0.8.5", "rand",
"ring", "ring",
"rustc-hash", "rustc-hash",
"rustls", "rustls",
@ -1925,19 +1901,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
[[package]]
name = "rand"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
"getrandom 0.1.16",
"libc",
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.8.5" version = "0.8.5"
@ -1945,18 +1908,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [ dependencies = [
"libc", "libc",
"rand_chacha 0.3.1", "rand_chacha",
"rand_core 0.6.4", "rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [
"ppv-lite86",
"rand_core 0.5.1",
] ]
[[package]] [[package]]
@ -1966,16 +1919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [ dependencies = [
"ppv-lite86", "ppv-lite86",
"rand_core 0.6.4", "rand_core",
]
[[package]]
name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
"getrandom 0.1.16",
] ]
[[package]] [[package]]
@ -1984,25 +1928,16 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [ dependencies = [
"getrandom 0.2.15", "getrandom",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core 0.5.1",
] ]
[[package]] [[package]]
name = "rand_xorshift" name = "rand_xorshift"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
dependencies = [ dependencies = [
"rand_core 0.5.1", "rand_core",
] ]
[[package]] [[package]]
@ -2040,7 +1975,7 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
dependencies = [ dependencies = [
"getrandom 0.2.15", "getrandom",
"libredox", "libredox",
"thiserror", "thiserror",
] ]
@ -2092,7 +2027,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if", "cfg-if",
"getrandom 0.2.15", "getrandom",
"libc", "libc",
"spin", "spin",
"untrusted", "untrusted",
@ -2503,24 +2438,24 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.24.1" version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [ dependencies = [
"strum_macros", "strum_macros",
] ]
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.24.3" version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [ dependencies = [
"heck", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
"syn 1.0.109", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -2895,7 +2830,7 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
dependencies = [ dependencies = [
"getrandom 0.2.15", "getrandom",
"serde", "serde",
] ]
@ -2921,11 +2856,11 @@ dependencies = [
[[package]] [[package]]
name = "veloren-client" name = "veloren-client"
version = "0.16.0" version = "0.16.0"
source = "git+https://gitlab.com/veloren/veloren?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"authc", "authc",
"byteorder", "byteorder",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"hickory-resolver", "hickory-resolver",
"image", "image",
"num", "num",
@ -2947,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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"approx", "approx",
"bitflags 2.5.0", "bitflags 2.5.0",
@ -2957,14 +2892,14 @@ dependencies = [
"dot_vox", "dot_vox",
"enum-map", "enum-map",
"fxhash", "fxhash",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"indexmap", "indexmap",
"itertools 0.10.5", "itertools 0.13.0",
"lazy_static", "lazy_static",
"num-derive", "num-derive",
"num-traits", "num-traits",
"ordered-float 3.9.2", "ordered-float",
"rand 0.8.5", "rand",
"rayon", "rayon",
"roots", "roots",
"serde", "serde",
@ -2987,11 +2922,11 @@ 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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"assets_manager", "assets_manager",
"dot_vox", "dot_vox",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"image", "image",
"lazy_static", "lazy_static",
"ron", "ron",
@ -3002,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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"directories-next", "directories-next",
"tracing", "tracing",
@ -3011,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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"specs", "specs",
"tracing", "tracing",
@ -3021,21 +2956,21 @@ 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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"hashbrown 0.13.2", "hashbrown 0.14.5",
"rand 0.8.5", "rand",
"serde", "serde",
] ]
[[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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"bincode", "bincode",
"flate2", "flate2",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"image", "image",
"num-traits", "num-traits",
"serde", "serde",
@ -3049,12 +2984,12 @@ 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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
"futures", "futures",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"num_cpus", "num_cpus",
"rayon", "rayon",
"scopeguard", "scopeguard",
@ -3071,11 +3006,11 @@ 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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"itertools 0.10.5", "itertools 0.13.0",
"ordered-float 3.9.2", "ordered-float",
"rand 0.8.5", "rand",
"rayon", "rayon",
"specs", "specs",
"tracing", "tracing",
@ -3089,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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-trait", "async-trait",
@ -3097,11 +3032,11 @@ dependencies = [
"bytes", "bytes",
"crossbeam-channel", "crossbeam-channel",
"futures-util", "futures-util",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"lazy_static", "lazy_static",
"lz-fear", "lz-fear",
"quinn", "quinn",
"rand 0.8.5", "rand",
"rustls", "rustls",
"serde", "serde",
"socket2", "socket2",
@ -3114,21 +3049,21 @@ 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?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitflags 2.5.0", "bitflags 2.5.0",
"bytes", "bytes",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"prometheus", "prometheus",
"rand 0.8.5", "rand",
"tracing", "tracing",
] ]
[[package]] [[package]]
name = "veloren-world" name = "veloren-world"
version = "0.10.0" version = "0.10.0"
source = "git+https://gitlab.com/veloren/veloren?branch=master#e4cd939eb8a2050a86b3d2a66924af485ba3ef70" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#6a4fcbe412f252f6c127e3dd6038689f0a9f6eeb"
dependencies = [ dependencies = [
"arr_macro", "arr_macro",
"bincode", "bincode",
@ -3137,16 +3072,16 @@ dependencies = [
"enumset", "enumset",
"fixed", "fixed",
"fxhash", "fxhash",
"hashbrown 0.13.2", "hashbrown 0.14.5",
"image", "image",
"itertools 0.10.5", "itertools 0.13.0",
"kiddo", "kiddo",
"lazy_static", "lazy_static",
"noise", "noise",
"num", "num",
"ordered-float 3.9.2", "ordered-float",
"rand 0.8.5", "rand",
"rand_chacha 0.3.1", "rand_chacha",
"rayon", "rayon",
"ron", "ron",
"serde", "serde",
@ -3183,12 +3118,6 @@ dependencies = [
"try-lock", "try-lock",
] ]
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.11.0+wasi-snapshot-preview1" version = "0.11.0+wasi-snapshot-preview1"
@ -3514,3 +3443,18 @@ name = "zeroize"
version = "1.8.1" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
[[package]]
name = "zune-core"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
[[package]]
name = "zune-jpeg"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
dependencies = [
"zune-core",
]

View File

@ -5,10 +5,10 @@ edition = "2021"
[dependencies] [dependencies]
tokio = "1.38.0" tokio = "1.38.0"
veloren-common = { git = "https://gitlab.com/veloren/veloren", branch = "master", features = ["no-assets"] } veloren-common = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" , features = ["no-assets"] }
veloren-common-net = { git = "https://gitlab.com/veloren/veloren", branch = "master" } veloren-common-net = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" }
veloren-client = { git = "https://gitlab.com/veloren/veloren", branch = "master" } veloren-client = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" }
veloren-world = { git = "https://gitlab.com/veloren/veloren", branch = "master" } veloren-world = { git = "https://gitlab.com/veloren/veloren", tag = "weekly" }
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"

View File

@ -1,5 +1,5 @@
character = "Obarc (Merchant)" character = "crabobot_test"
position = [17726.0, 14960.0, 237.0] position = [17726.0, 14957.0, 237.0]
orientation = "West" orientation = "West"
[buy_prices] [buy_prices]

View File

@ -169,6 +169,8 @@ impl Bot {
for (item_id, price) in &self.buy_prices { for (item_id, price) in &self.buy_prices {
if item_id.contains(item_name) { if item_id.contains(item_name) {
log::debug!("Sending price info on {item_id} to {player_name}");
self.client.send_command( self.client.send_command(
"tell".to_string(), "tell".to_string(),
vec![ vec![
@ -183,6 +185,8 @@ impl Bot {
for (item_id, price) in &self.sell_prices { for (item_id, price) in &self.sell_prices {
if item_id.contains(item_name) { if item_id.contains(item_name) {
log::debug!("Sending price info on {item_id} to {player_name}");
self.client.send_command( self.client.send_command(
"tell".to_string(), "tell".to_string(),
vec![ vec![