From 45b5db46c59816089e983000c5e07a097407ca3a Mon Sep 17 00:00:00 2001
From: bd_ <bd_@nadena.dev>
Date: Sat, 5 Apr 2025 14:49:12 -0700
Subject: [PATCH] chore(deps): update NDMF dependency

---
 .github/ProjectRoot/vpm-manifest-2022.json | 4 ++--
 CHANGELOG-PRERELEASE-jp.md                 | 1 +
 CHANGELOG-PRERELEASE.md                    | 1 +
 CHANGELOG-jp.md                            | 1 +
 CHANGELOG.md                               | 1 +
 package.json                               | 2 +-
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/ProjectRoot/vpm-manifest-2022.json b/.github/ProjectRoot/vpm-manifest-2022.json
index 19bb1cf5..9eb0da9d 100644
--- a/.github/ProjectRoot/vpm-manifest-2022.json
+++ b/.github/ProjectRoot/vpm-manifest-2022.json
@@ -4,7 +4,7 @@
       "version": "3.7.4"
     },
     "nadena.dev.ndmf": {
-      "version": "1.7.2-rc.0"
+      "version": "1.7.4"
     }
   },
   "locked": {
@@ -19,7 +19,7 @@
       "dependencies": {}
     },
     "nadena.dev.ndmf": {
-      "version": "1.7.2-rc.0"
+      "version": "1.7.4"
     }
   }
 }
\ No newline at end of file
diff --git a/CHANGELOG-PRERELEASE-jp.md b/CHANGELOG-PRERELEASE-jp.md
index a5ff2fbc..5ab703be 100644
--- a/CHANGELOG-PRERELEASE-jp.md
+++ b/CHANGELOG-PRERELEASE-jp.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
 
 ### Changed
 - [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
index b8fcecbf..a7d2eb9e 100644
--- a/CHANGELOG-PRERELEASE.md
+++ b/CHANGELOG-PRERELEASE.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
 
 ### Changed
 - [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
diff --git a/CHANGELOG-jp.md b/CHANGELOG-jp.md
index 9d1f22f4..da8f2576 100644
--- a/CHANGELOG-jp.md
+++ b/CHANGELOG-jp.md
@@ -11,6 +11,7 @@ Modular Avatarの主な変更点をこのファイルで記録しています。
 ### Added
 
 ### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
 
 ### Changed
 - [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b72ad4..a28fe997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
 
 ### Changed
 - [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
diff --git a/package.json b/package.json
index bf283aa8..d281f1a4 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,6 @@
   },
   "vpmDependencies": {
     "com.vrchat.avatars": ">=3.7.4",
-    "nadena.dev.ndmf": ">=1.7.2-r <2.0.0-a"
+    "nadena.dev.ndmf": ">=1.7.4 <2.0.0-a"
   }
 }