From bc700b578f31271ee1c692421693d5728d6d033f Mon Sep 17 00:00:00 2001
From: narumi <yan.jianhui147@gmail.com>
Date: Thu, 8 Aug 2024 00:29:40 +0800
Subject: [PATCH] Bump version to 2.5.12

---
 CHANGELOG.md                |  8 +++++++-
 CHANGELOG.zh.md             | 10 ++++++++--
 lib/generated/git_info.dart |  4 ++--
 pubspec.yaml                |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31786f913..14425cfb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,19 @@
 # Changelog
 
+## 2.5.12
+
+- Fix skill option bug: Kulkulcan etc
+- Fix Space Ereshkigal's master affection to master skill
+
 ## 2.5.11
+
 - Laplace
   - Support Append Skill 5 shorten skill after use
   - Fixed a bug where reduced damage (for overkill bug counting) is not reset after NP
   - Support Summer Eresh
     - New NP Dmg type based on battle points
     - Support battle points system
-    - Support activate skill when being targeted 
+    - Support activate skill when being targeted
     - Support activate skill before NP/Skill
     - Support activate skill after select cards
 
diff --git a/CHANGELOG.zh.md b/CHANGELOG.zh.md
index b7922c1cd..bf2acb1f3 100644
--- a/CHANGELOG.zh.md
+++ b/CHANGELOG.zh.md
@@ -1,8 +1,14 @@
 # 更新日志
 
+## 2.5.12
+
+- 修复库库尔坎等有选项的技能错误
+- 修复泳装艾蕾御主技能对好感度的计算
+
 ## 2.5.11
+
 - Laplace
-  - 支持附加五技能：使用技能后减少CD
+  - 支持附加五技能：使用技能后减少 CD
   - 修正了 Overkill bug 没有在宝具使用后重置的问题
   - 支持泳装艾蕾
     - 新的根据好感度增加伤害的机制
@@ -22,7 +28,7 @@
 - 宝具伤害排行计算时固定部分从者的技能顺序
 - 支持响＆千键不同灵基不同副属性
 - 支持新活动甜品贸易
-- 修复了一些bug
+- 修复了一些 bug
 
 ## 2.5.9
 
diff --git a/lib/generated/git_info.dart b/lib/generated/git_info.dart
index b7b76d533..3e9424c3c 100644
--- a/lib/generated/git_info.dart
+++ b/lib/generated/git_info.dart
@@ -1,3 +1,3 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
-const String kCommitHash = "90fca1";
-const int kCommitTimestamp = 1722877240;
+const String kCommitHash = "911d06";
+const int kCommitTimestamp = 1723047940;
diff --git a/pubspec.yaml b/pubspec.yaml
index 8bfff00b0..556c974c4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.5.11+972
+version: 2.5.12+973
 
 environment:
   sdk: ">=3.4.0 <4.0.0"