Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-12 23:24:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
SpikeHD
2022-05-09 19:38:23 -07:00
parent 0a2365e546 78e8f27d67
commit 30318e566f
6 changed files with 202 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src-tauri/Cargo.lock generated
View File

@@ -644,6 +644,7 @@ dependencies = [
"futures-util",
"hudsucker",
"opener",
"registry",
"reqwest",
"rustls-pemfile",
"serde",
@@ -2862,6 +2863,19 @@ version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "registry"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d593176a37a58e828d0503cfbb257983786c88b75c786994432324be775afaa9"
dependencies = [
"bitflags",
"log",
"thiserror",
"utfx",
"winapi",
]
[[package]]
name = "remove_dir_all"
version = "0.5.3"
@@ -4107,6 +4121,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "utfx"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "133bf74f01486773317ddfcde8e2e20d2933cc3b68ab797e5d718bef996a81de"
[[package]]
name = "uuid"
version = "0.8.2"