Merge remote-tracking branch 'origin/repository'
# Conflicts: # src/data/entities.rs
This commit is contained in:
commit
18aa748451
8 files changed
+1085
-13
No files matched your search
Generated
+13
-12
@@ -1066,7 +1066,7 @@ dependencies = [
|
||||
"cosmic-text",
|
||||
"etagere",
|
||||
"lru",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"wgpu",
|
||||
]
|
||||
|
||||
@@ -2091,7 +2091,7 @@ dependencies = [
|
||||
"lilt",
|
||||
"log",
|
||||
"num-traits",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"smol_str",
|
||||
"thiserror 2.0.18",
|
||||
"web-time",
|
||||
@@ -2117,7 +2117,7 @@ dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
"log",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"tokio",
|
||||
"wasm-bindgen-futures",
|
||||
"wasmtimer",
|
||||
@@ -2137,7 +2137,7 @@ dependencies = [
|
||||
"iced_futures",
|
||||
"log",
|
||||
"raw-window-handle",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"thiserror 2.0.18",
|
||||
"unicode-segmentation",
|
||||
]
|
||||
@@ -2191,7 +2191,7 @@ dependencies = [
|
||||
"kurbo 0.10.4",
|
||||
"log",
|
||||
"resvg",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"softbuffer",
|
||||
"tiny-skia",
|
||||
]
|
||||
@@ -2212,7 +2212,7 @@ dependencies = [
|
||||
"iced_graphics",
|
||||
"log",
|
||||
"resvg",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"thiserror 2.0.18",
|
||||
"wgpu",
|
||||
]
|
||||
@@ -2227,7 +2227,7 @@ dependencies = [
|
||||
"log",
|
||||
"num-traits",
|
||||
"ouroboros",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"thiserror 2.0.18",
|
||||
"unicode-segmentation",
|
||||
]
|
||||
@@ -2242,7 +2242,7 @@ dependencies = [
|
||||
"iced_program",
|
||||
"log",
|
||||
"mundy",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"thiserror 2.0.18",
|
||||
"tracing",
|
||||
"wasm-bindgen-futures",
|
||||
@@ -2466,6 +2466,7 @@ dependencies = [
|
||||
"rhai",
|
||||
"rodio",
|
||||
"rusqlite",
|
||||
"rustc-hash 2.1.3",
|
||||
"serde_json",
|
||||
"sha2",
|
||||
"tokio",
|
||||
@@ -3907,7 +3908,7 @@ dependencies = [
|
||||
"pin-project-lite",
|
||||
"quinn-proto",
|
||||
"quinn-udp",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"rustls",
|
||||
"socket2",
|
||||
"thiserror 2.0.18",
|
||||
@@ -3929,7 +3930,7 @@ dependencies = [
|
||||
"rand",
|
||||
"rand_pcg",
|
||||
"ring",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustc-hash 2.1.3",
|
||||
"rustls",
|
||||
"rustls-pki-types",
|
||||
"slab",
|
||||
@@ -4334,9 +4335,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "2.1.1"
|
||||
version = "2.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
|
||||
checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
|
||||
Reference in new issue
Block a user