From ca0777fdd077d5aab1ab84424e6fc108ffa8dce0 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Sun, 23 Apr 2023 21:13:53 +0800
Subject: [PATCH] ChangeLog: v0.1.4

---
 CHANGELOG.md                | 16 ++++++++++++++++
 CMakeLists.txt              |  2 +-
 android/AndroidManifest.xml |  4 ++--
 flake.nix                   |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 641ad3a8..1231c2b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ___
 
+## v0.1.4
+
+看点：
+
+1. 国战
+2. 旧版朱然
+
+修bug内容：
+
+1. 游戏规则优先级bug
+2. 插入新阶段
+3. 蜀护驾改魏护驾
+4. 为card也增加了mark，但尚不实用
+
+___
+
 ## v0.1.3
 
 1. 优化了武将一览和卡牌一览的UI。
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 136856d2..0a8b26ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.1.3)
+project(FreeKill VERSION 0.1.4)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c3e38727..b97c93e8 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="103"
-  android:versionName="0.1.3">
+  android:versionCode="104"
+  android:versionName="0.1.4">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/flake.nix b/flake.nix
index 069e7646..36f315f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
       with import nixpkgs { system = "x86_64-linux"; };
       stdenv.mkDerivation {
         name = "freekill";
-        version = "0.1.2";
+        version = "0.1.4";
         src = self;
 
         buildInputs = with qt6; [