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

Finally fix the bug with modular weapons

Browse Source
This commit is contained in:
Jeff 2025-01-14 19:01:20 -05:00
parent 55f020e600
commit 79e50289a5
2 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
Cargo.lock generated
View File

@ -193,7 +193,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -282,9 +282,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.6.0" version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -353,9 +353,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.7" version = "1.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
dependencies = [ dependencies = [
"shlex", "shlex",
] ]
@ -566,7 +566,7 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -589,7 +589,7 @@ dependencies = [
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -600,7 +600,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -654,7 +654,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -702,7 +702,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -723,7 +723,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -744,7 +744,7 @@ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -953,7 +953,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -1391,7 +1391,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -1531,9 +1531,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.76" version = "0.3.77"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"wasm-bindgen", "wasm-bindgen",
@ -1580,7 +1580,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.7.0",
"libc", "libc",
] ]
@ -1627,7 +1627,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d" checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.7.0",
"byteorder", "byteorder",
"culpa", "culpa",
"thiserror 1.0.69", "thiserror 1.0.69",
@ -1788,7 +1788,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2013,9 +2013,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.92" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2053,7 +2053,7 @@ dependencies = [
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustls", "rustls",
"socket2", "socket2",
"thiserror 2.0.10", "thiserror 2.0.11",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -2073,7 +2073,7 @@ dependencies = [
"rustls-pki-types", "rustls-pki-types",
"rustls-platform-verifier", "rustls-platform-verifier",
"slab", "slab",
"thiserror 2.0.10", "thiserror 2.0.11",
"tinyvec", "tinyvec",
"tracing", "tracing",
"web-time", "web-time",
@ -2173,7 +2173,7 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.7.0",
] ]
[[package]] [[package]]
@ -2248,7 +2248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [ dependencies = [
"base64", "base64",
"bitflags 2.6.0", "bitflags 2.7.0",
"serde", "serde",
"serde_derive", "serde_derive",
] ]
@ -2299,9 +2299,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.20" version = "0.23.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"ring", "ring",
@ -2434,7 +2434,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.7.0",
"core-foundation 0.9.4", "core-foundation 0.9.4",
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -2448,7 +2448,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.7.0",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -2503,7 +2503,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2526,7 +2526,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2723,7 +2723,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2751,9 +2751,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.95" version = "2.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2768,7 +2768,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2788,11 +2788,11 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "2.0.10" version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
dependencies = [ dependencies = [
"thiserror-impl 2.0.10", "thiserror-impl 2.0.11",
] ]
[[package]] [[package]]
@ -2803,18 +2803,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "2.0.10" version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2885,7 +2885,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -2969,7 +2969,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -3138,9 +3138,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.11.0" version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4"
dependencies = [ dependencies = [
"getrandom", "getrandom",
"serde", "serde",
@ -3169,7 +3169,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-client" name = "veloren-client"
version = "0.17.0" version = "0.17.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"authc", "authc",
"byteorder", "byteorder",
@ -3195,7 +3195,7 @@ dependencies = [
[[package]] [[package]]
name = "veloren-client-i18n" name = "veloren-client-i18n"
version = "0.13.0" version = "0.13.0"
source = "git+https://gitlab.com/veloren/veloren?tag=weekly#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"deunicode", "deunicode",
"fluent", "fluent",
@ -3213,10 +3213,10 @@ 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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"approx", "approx",
"bitflags 2.6.0", "bitflags 2.7.0",
"chrono", "chrono",
"chrono-tz", "chrono-tz",
"crossbeam-utils", "crossbeam-utils",
@ -3253,7 +3253,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"assets_manager", "assets_manager",
"dot_vox", "dot_vox",
@ -3268,7 +3268,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"directories-next", "directories-next",
"tracing", "tracing",
@ -3277,7 +3277,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"specs", "specs",
"tracing", "tracing",
@ -3287,7 +3287,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"hashbrown 0.15.1", "hashbrown 0.15.1",
"rand", "rand",
@ -3297,7 +3297,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"bincode", "bincode",
"flate2", "flate2",
@ -3315,7 +3315,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3337,7 +3337,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"itertools", "itertools",
"ordered-float", "ordered-float",
@ -3355,7 +3355,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-trait", "async-trait",
@ -3380,10 +3380,10 @@ 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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitflags 2.6.0", "bitflags 2.7.0",
"bytes", "bytes",
"hashbrown 0.15.1", "hashbrown 0.15.1",
"prometheus", "prometheus",
@ -3394,7 +3394,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#e8b92888ea8d349c8ab4fdff398b31f9cf92c0eb" source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef"
dependencies = [ dependencies = [
"arr_macro", "arr_macro",
"bincode", "bincode",
@ -3457,34 +3457,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.99" version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
"rustversion",
"wasm-bindgen-macro", "wasm-bindgen-macro",
] ]
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.99" version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.99" version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -3492,22 +3493,25 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.99" version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.99" version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
dependencies = [
"unicode-ident",
]
[[package]] [[package]]
name = "wavefront" name = "wavefront"
@ -3614,7 +3618,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -3625,7 +3629,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -3797,9 +3801,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.6.22" version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -3855,7 +3859,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
"synstructure", "synstructure",
] ]
@ -3877,7 +3881,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -3897,7 +3901,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
"synstructure", "synstructure",
] ]
@ -3926,7 +3930,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.96",
] ]
[[package]] [[package]]

2
src/config.rs
View File

@ -78,11 +78,11 @@ impl<'de> Visitor<'de> for PriceListVisitor {
ItemDefinitionIdOwned::Modular { ItemDefinitionIdOwned::Modular {
pseudo_base: "veloren.core.pseudo_items.modular.tool".to_string(), pseudo_base: "veloren.core.pseudo_items.modular.tool".to_string(),
components: vec![ components: vec![
ItemDefinitionIdOwned::Simple(secondary),
ItemDefinitionIdOwned::Compound { ItemDefinitionIdOwned::Compound {
simple_base: primary, simple_base: primary,
components: vec![ItemDefinitionIdOwned::Simple(material)], components: vec![ItemDefinitionIdOwned::Simple(material)],
}, },
ItemDefinitionIdOwned::Simple(secondary),
], ],
} }
} }