From d72a614fb4a4bd2ffc1ed3ff3d89d509b1d65f12 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Mon, 3 Apr 2023 19:29:57 +0900
Subject: [PATCH] merge 0.14.4 (#648)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ファンクションが間違っていますエラーをなくす (#629)

* to 0.14.4 (#640)
---
 .github/workflows/build-docker.yml       | 4 ++--
 .github/workflows/build.yml              | 4 ++--
 Dockerfile                               | 4 ++--
 default.csv                              | 5 +++++
 engine_manifest_assets/update_infos.json | 8 ++++++++
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index ab7158a45..aaa353f35 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -15,8 +15,8 @@ on:
 env:
   IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
   PYTHON_VERSION: "3.8.10"
-  VOICEVOX_RESOURCE_VERSION: "0.14.1"
-  VOICEVOX_CORE_VERSION: "0.14.2"
+  VOICEVOX_RESOURCE_VERSION: "0.14.2"
+  VOICEVOX_CORE_VERSION: "0.14.3"
   VOICEVOX_ENGINE_VERSION:
     |- # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る
     ${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1ffbb6cc6..325162e35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,8 +21,8 @@ on:
 
 env:
   PYTHON_VERSION: "3.8.10"
-  VOICEVOX_RESOURCE_VERSION: "0.14.1"
-  VOICEVOX_CORE_VERSION: "0.14.2"
+  VOICEVOX_RESOURCE_VERSION: "0.14.2"
+  VOICEVOX_CORE_VERSION: "0.14.3"
 
 jobs:
   config: # 全 jobs で利用する定数の定義. `env` が利用できないコンテキストでも利用できる.
diff --git a/Dockerfile b/Dockerfile
index 5fe278b33..caa70d783 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ EOF
 # assert VOICEVOX_CORE_VERSION >= 0.11.0 (ONNX)
 ARG TARGETPLATFORM
 ARG USE_GPU=false
-ARG VOICEVOX_CORE_VERSION=0.14.2
+ARG VOICEVOX_CORE_VERSION=0.14.3
 
 RUN <<EOF
     set -eux
@@ -275,7 +275,7 @@ RUN <<EOF
 EOF
 
 # Download Resource
-ARG VOICEVOX_RESOURCE_VERSION=0.14.1
+ARG VOICEVOX_RESOURCE_VERSION=0.14.2
 RUN <<EOF
     set -eux
 
diff --git a/default.csv b/default.csv
index d13cf01db..ec2ab0754 100644
--- a/default.csv
+++ b/default.csv
@@ -1,6 +1,7 @@
 朱司,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,アカシ,アカシ,1/3,C1
 青山,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,アオヤマ,アオヤマ,2/4,C1
 雨晴,1350,1350,7000,名詞,固有名詞,人名,姓,*,*,*,アメハレ,アメハレ,2/4,C1
+アル,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,アル,アル,1/2,C1
 櫻歌,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,オウカ,オーカ,1/3,C1
 音街,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,オトマチ,オトマチ,2/4,C1
 春日部,1350,1350,8600,名詞,固有名詞,人名,姓,*,*,*,カスカベ,カスカベ,0/4,C1
@@ -26,9 +27,13 @@
 月読,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ツクヨミ,ツクヨミ,0/4,C1
 つむぎ,1351,1351,7450,名詞,固有名詞,人名,名,*,*,*,ツムギ,ツムギ,0/3,C1
 ナースロボ,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ナースロボ,ナースロボ,4/5,C1
+ナナ,1351,1351,8600,名詞,固有名詞,人名,名,*,*,*,ナナ,ナナ,1/2,C1
 Ｎｏ．７,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,ナンバーセブン,ナンバーセブン,5/7,C1
+猫使,1350,1350,2200,名詞,固有名詞,人名,姓,*,*,*,ネコツカ,ネコツカ,2/4,C1
 はう,1351,1351,5000,名詞,固有名詞,人名,名,*,*,*,ハウ,ハウ,1/2,C1
+春歌,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ハルカ,ハルカ,1/3,C1
 桜乃,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ハルノ,ハルノ,1/3,C1
+ビィ,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,ビー,ビー,1/2,C1
 ひまり,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,ヒマリ,ヒマリ,0/3,C1
 紅桜,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,ベニザクラ,ベニザクラ,3/5,C1
 聖騎士,1350,1350,8600,名詞,固有名詞,人名,姓,*,*,*,ホーリーナイト,ホーリーナイト,5/7,C1
diff --git a/engine_manifest_assets/update_infos.json b/engine_manifest_assets/update_infos.json
index 5a8fa6bf0..41d8183e8 100644
--- a/engine_manifest_assets/update_infos.json
+++ b/engine_manifest_assets/update_infos.json
@@ -1,4 +1,12 @@
 [
+  {
+    "version": "0.14.4",
+    "descriptions": [
+      "キャラクター「春歌ナナ」「猫使アル」「猫使ビィ」を追加",
+      "バグ修正"
+    ],
+    "contributors": ["Hiroshiba"]
+  },
   {
     "version": "0.14.3",
     "descriptions": [