Skip to content

Commit

Permalink
Merge branch 'main' into feat/show
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	Cargo.toml
  • Loading branch information
Roms1383 committed Aug 3, 2024
2 parents 94350e8 + 5a9ad36 commit 0ffa99c
Show file tree
Hide file tree
Showing 11 changed files with 62,539 additions and 8,178 deletions.
294 changes: 148 additions & 146 deletions Cargo.lock

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "inkanim"
version = "0.3.0"
version = "0.4.0"
edition = "2021"
authors = ["Roms1383"]
license = "MIT OR Apache-2.0"
Expand All @@ -17,18 +17,18 @@ path = "src/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
inkanim-macros = { path = "./macros"}
enum_dispatch = "0.3.12"
serde = { version = "1.0.197", features = ["derive"] }
serde-aux = "4.5.0"
serde_json = "1.0.114"
chrono = { version = "0.4.34", default-features = false, features = [
chrono = { version = "0.4", default-features = false, features = [
"clock",
"std",
"serde",
] }
const-str = "0.5.6"
convert_case = "0.6.0"
clap = { version = "4.5", features = ["derive"] }
const-str = "0.5"
convert_case = "0.6"
enum_dispatch = "0.3"
inkanim-macros = { path = "./macros"}
serde = { version = "1.0", features = ["derive"] }
serde-aux = "4.5"
serde_json = "1.0"
red4ext-rs = { git = "https://github.com/jac3km4/red4ext-rs.git", rev = "2646318" }
clap = { version = "4.5.1", features = ["derive"] }
term-table = "1.3.2"
term-table = "1.4"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# InkAnim

![build](https://github.com/cyb3rpsych0s1s/inkanim/actions/workflows/quality.yml/badge.svg) [![crates.io](https://img.shields.io/crates/v/inkanim.svg)](https://crates.io/crates/inkanim) ![WolvenKit](https://img.shields.io/badge/8.12.2-red?label=WolvenKit&color=red&link=https%3A%2F%2Fwiki.redmodding.org%2Fwolvenkit) ![WKitJsonVersion](https://img.shields.io/badge/0.0.8-yellow?label=WKitJsonVersion&link=https%3A%2F%2Fwiki.redmodding.org%2Fwolvenkit)
![build](https://github.com/cyb3rpsych0s1s/inkanim/actions/workflows/quality.yml/badge.svg) [![crates.io](https://img.shields.io/crates/v/inkanim.svg)](https://crates.io/crates/inkanim) ![WolvenKit](https://img.shields.io/badge/8.13.0-red?label=WolvenKit&color=red&link=https%3A%2F%2Fwiki.redmodding.org%2Fwolvenkit) ![WKitJsonVersion](https://img.shields.io/badge/0.0.8-yellow?label=WKitJsonVersion&link=https%3A%2F%2Fwiki.redmodding.org%2Fwolvenkit)



Expand Down
8 changes: 4 additions & 4 deletions inkanim_biomoncheck.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"Header": {
"WolvenKitVersion": "8.12.2\u002B0e283c958d795f6aa4cd34f29d4f4409a0a1681e",
"WolvenKitVersion": "8.13.0",
"WKitJsonVersion": "0.0.8",
"GameVersion": 2110,
"ExportedDateTime": "2024-02-04T04:41:16.6384114Z",
"GameVersion": 2120,
"ExportedDateTime": "2024-03-23T12:33:26.4093965Z",
"DataType": "CR2W",
"ArchiveFileName": "C:\\Development\\4ddicted\\archives\\Addicted.Biomon\\source\\archive\\addicted\\gameplay\\gui\\quests\\q001\\q001_wakeup_biomoncheck_animations.inkanim"
"ArchiveFileName": "C:\\Development\\4ddicted\\archives\\Addicted.Biomon\\source\\archive\\base\\gameplay\\gui\\quests\\q001\\q001_wakeup_biomoncheck_animations.inkanim"
},
"Data": {
"Version": 195,
Expand Down
Loading

0 comments on commit 0ffa99c

Please sign in to comment.