Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge branch 'main' into fix/macos-quit-crash

dotCooCooaa296cf273fb
diff --cc Cargo.lock
index 8c354978a,f99e09a06..325893ce2
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -1660,9 -1661,9 +1672,10 @@@ dependencies =
[[package]]
name = "effectcraft-ui-egui"
- version = "0.11.0"
+ version = "0.16.0"
dependencies = [
+ "chrono",
+ "craft-quit",
"craft-ui",
"effectcraft-color",
"effectcraft-engine",
diff --cc Cargo.toml
index 60e97e13c,a3935f047..b26720cf9
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -11,9 -11,8 +11,9 @@@ rust-version = "1.95
repository = "https://github.com/storytold/effectcraft"
[workspace.dependencies]
- craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.1.0", default-features = false, features = ["read"] }
+ craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0", default-features = false, features = ["read"] }
craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
+craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
# internal
effectcraft-time = { path = "crates/time" }
effectcraft-geom = { path = "crates/geom" }