Add task page screenshot

Add Test page
Update SceneIds and MonsterIds
2025-10-22 20:09:46 +08:00 · 2022-12-15 20:43:51 +08:00 · 2022-12-15 20:32:01 +08:00 · 2022-12-15 20:31:29 +08:00 · 2022-12-15 20:03:47 +08:00 · 2022-12-14 20:24:48 +08:00
73 changed files with 14500 additions and 16350 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,32 @@
+name: Build project
+
+on:
+  push:
+    branches:
+    - main
+    paths:
+    - Source/**
+  pull_request:
+    branches:
+    - main
+    paths:
+    - Source/**
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+        
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v1.1.3
+      
+    - name: Build release
+      run: msbuild Source/GrasscutterTools.sln /p:Configuration=Release /t:build /restore
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: GrasscutterTools
+        path: Source/GrasscutterTools/bin/Release/GrasscutterTools.exe
--- a/Doc/Screenshots-en/18-TaskPage.png
+++ b/Doc/Screenshots-en/18-TaskPage.png
--- a/Doc/Screenshots-ru/18-TaskPage.png
+++ b/Doc/Screenshots-ru/18-TaskPage.png
--- a/Doc/Screenshots/18-TaskPage.png
+++ b/Doc/Screenshots/18-TaskPage.png
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 [![GitHub license](https://img.shields.io/github/license/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/blob/main/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/stargazers)
 [![Github All Releases](https://img.shields.io/github/downloads/jie65535/GrasscutterCommandGenerator/total.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
+[![GitHub release](https://img.shields.io/github/v/release/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/releases/latest)
+[![Build](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml/badge.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml)
 [![QQ Group](https://pub.idqqimg.com/wpa/images/group.png)](https://qm.qq.com/cgi-bin/qm/qr?k=PdS9--b-n8LEAmYjX8fNFXtKDcsp4NHN&jump_from=webapi&authKey=7ty3ZCKYMKLGWLmO8O84qiNAZ0EuCnSGF+acP+74xuDMKYXXNjuPP7iUzffHz4r2)

 English | [简体中文](README_zh-cn.md) | [Русский](README_ru-RU.md)
@@ -16,6 +18,10 @@ Support 简体中文, 繁体中文, English and Русский languages.
 > **Warning**: app look may be different rather than on screenshots. It may also contain translation errors and a lack of certain resources. **We're welcome everyone to contribute to their [improvement](/Source/GrasscutterTools/Resources/en-us)**

 ## Update log
+
+### GrasscutterTools-v1.8
+![Task page](Doc/Screenshots-en/18-TaskPage.png)
+
 ### GrasscutterTools-v1.7.3
 ![Gadget](Doc/Screenshots-en/6-SpawnEntity.png)

--- a/README_ru-RU.md
+++ b/README_ru-RU.md
@@ -3,6 +3,8 @@
 [![GitHub лицензия](https://img.shields.io/github/license/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/blob/main/LICENSE)
 [![GitHub звёзды](https://img.shields.io/github/stars/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/stargazers)
 [![Github ВСЕ выпуски](https://img.shields.io/github/downloads/jie65535/GrasscutterCommandGenerator/total.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
+[![GitHub release](https://img.shields.io/github/v/release/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/releases/latest)
+[![Build](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml/badge.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml)

 [English](README.md) | [简体中文](README_zh-cn.md) | Русский - Перевод [Юрий Дворецкий](https://github.com/yurikenjx) (с исправлениями от [EgorBron](https://github.com/EgorBron)) 

@@ -15,6 +17,10 @@ GCG поддерживает 简体中文 (китайский упр.), 繁体
 > **Warning**: вид приложения может отличаться от скриншотов. Также в нём могут присутствовать ошибки в переводе и отсутсвие некоторых ресурсов. **Мы приглашаем всех сделать вклад в их [улучшение](/Source/GrasscutterTools/Resources/ru-ru)**

 ## Лог обновлений
+
+### GrasscutterTools-v1.8
+![Task page](Doc/Screenshots-ru/18-TaskPage.png)
+
 ### GrasscutterTools-v1.7.3
 ![Улучшенный спавн](Doc/Screenshots-ru/5-Spawn.png)

--- a/README_zh-cn.md
+++ b/README_zh-cn.md
@@ -3,6 +3,8 @@
 [![GitHub license](https://img.shields.io/github/license/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/blob/main/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/stargazers)
 [![Github All Releases](https://img.shields.io/github/downloads/jie65535/GrasscutterCommandGenerator/total.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
+[![GitHub release](https://img.shields.io/github/v/release/jie65535/GrasscutterCommandGenerator)](https://github.com/jie65535/GrasscutterCommandGenerator/releases/latest)
+[![Build](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml/badge.svg)](https://github.com/jie65535/GrasscutterCommandGenerator/actions/workflows/build.yml)
 [![QQ Group](https://pub.idqqimg.com/wpa/images/group.png)](https://qm.qq.com/cgi-bin/qm/qr?k=PdS9--b-n8LEAmYjX8fNFXtKDcsp4NHN&jump_from=webapi&authKey=7ty3ZCKYMKLGWLmO8O84qiNAZ0EuCnSGF+acP+74xuDMKYXXNjuPP7iUzffHz4r2)

 [English](README.md) | 简体中文 | [Русский](README_ru-RU.md)
@@ -17,6 +19,9 @@

 ## Update log

+### GrasscutterTools-v1.8
+![Task page](Doc/Screenshots/18-TaskPage.png)
+
 ### GrasscutterTools-v1.7.3
 ![Spawns](Doc/Screenshots/6-SpawnEntity.png)

--- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs
@@ -49,6 +49,7 @@ namespace GrasscutterTools.Forms
            this.TPHome = new System.Windows.Forms.TabPage();
            this.TCMain = new System.Windows.Forms.TabControl();
            this.TPMail = new System.Windows.Forms.TabPage();
+            this.TPLoopTasks = new System.Windows.Forms.TabPage();
            this.MenuSpawnEntityFilter = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.GrpCommand.SuspendLayout();
            this.TCMain.SuspendLayout();
@@ -177,6 +178,7 @@ namespace GrasscutterTools.Forms
            this.TCMain.Controls.Add(this.TPWeapon);
            this.TCMain.Controls.Add(this.TPManage);
            this.TCMain.Controls.Add(this.TPMail);
+            this.TCMain.Controls.Add(this.TPLoopTasks);
            this.TCMain.Controls.Add(this.TPQuest);
            this.TCMain.Controls.Add(this.TPScene);
            this.TCMain.Controls.Add(this.TPAbout);
@@ -189,10 +191,16 @@ namespace GrasscutterTools.Forms
            this.TPMail.Name = "TPMail";
            this.TPMail.UseVisualStyleBackColor = true;
            // 
+            // TPLoopTasks
+            // 
+            resources.ApplyResources(this.TPLoopTasks, "TPLoopTasks");
+            this.TPLoopTasks.Name = "TPLoopTasks";
+            this.TPLoopTasks.UseVisualStyleBackColor = true;
+            // 
            // MenuSpawnEntityFilter
            // 
-            this.MenuSpawnEntityFilter.Name = "MenuSpawnEntityFilter";
            resources.ApplyResources(this.MenuSpawnEntityFilter, "MenuSpawnEntityFilter");
+            this.MenuSpawnEntityFilter.Name = "MenuSpawnEntityFilter";
            // 
            // FormMain
            // 
@@ -234,5 +242,6 @@ namespace GrasscutterTools.Forms
        private System.Windows.Forms.TabControl TCMain;
        private System.Windows.Forms.TabPage TPMail;
        private System.Windows.Forms.ContextMenuStrip MenuSpawnEntityFilter;
+        private System.Windows.Forms.TabPage TPLoopTasks;
    }
 }
--- a/Source/GrasscutterTools/Forms/FormMain.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.cs
@@ -97,9 +97,11 @@ namespace GrasscutterTools.Forms
            TPWeapon.Controls.Add(CreatePage<PageGiveWeapon>());
            TPManage.Controls.Add(CreatePage<PageManagement>());
            TPMail.Controls.Add(CreatePage<PageMail>());
+            TPLoopTasks.Controls.Add(CreatePage<PageTasks>());
            TPQuest.Controls.Add(CreatePage<PageQuest>());
            TPScene.Controls.Add(CreatePage<PageScene>());
            TPAbout.Controls.Add(CreatePage<PageAbout>());
+            //TPAbout.Controls.Add(CreatePage<PageTools>());
            TCMain.ResumeLayout();
            Logger.I(TAG, "InitPages completed");
        }
@@ -206,7 +208,9 @@ namespace GrasscutterTools.Forms
        {
            Logger.I(TAG, $"SetCommand(\"{command}\")");
            var oldCommand = CmbCommand.Text;
-            CmbCommand.Text = (ModifierKeys == Keys.Shift) ? $"{oldCommand} | {command}" : command;
+            CmbCommand.Text = (ModifierKeys == Keys.Shift) ?
+                (string.IsNullOrEmpty(oldCommand) ? command : $"{oldCommand} | {command}")
+                : command;
            if (ChkAutoCopy.Checked)
                CopyCommand();
            AddCommandToList(command);
--- a/Source/GrasscutterTools/Forms/FormMain.en-us.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
@@ -127,119 +127,21 @@
  <data name="ChkAutoCopy.Text" xml:space="preserve">
    <value>Auto</value>
  </data>
-  <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
-    <value>Run(F5)</value>
-  </data>
  <data name="GrpCommand.Text" xml:space="preserve">
    <value>Command  - [Ctrl] Autorun  - [Shift] Append  - [Alt] Only run  - [|] Split multiple commands</value>
  </data>
+  <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
+    <value>Run(F5)</value>
+  </data>
  <data name="TPRemoteCall.Text" xml:space="preserve">
    <value>Remote</value>
  </data>
-  <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>387, 102</value>
-  </data>
-  <data name="LblSupportDescription.Text" xml:space="preserve">
-    <value>Grasscutter Tools
-
-This is a free and open source project.
-If you think this is helpful to you, you can give me a free Star.
-If there is a problem with the command generation,
-or there is a new feature request, you can file an issue on Github.</value>
-  </data>
  <data name="TPAbout.Text" xml:space="preserve">
    <value>About</value>
  </data>
  <data name="TPManage.Text" xml:space="preserve">
    <value>Manage</value>
  </data>
-  <data name="RbListDungeons.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 7</value>
-  </data>
-  <data name="RbListDungeons.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 21</value>
-  </data>
-  <data name="RbListDungeons.Text" xml:space="preserve">
-    <value>Dungeons</value>
-  </data>
-  <data name="RbListScene.Location" type="System.Drawing.Point, System.Drawing">
-    <value>183, 7</value>
-  </data>
-  <data name="RbListScene.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 21</value>
-  </data>
-  <data name="RbListScene.Text" xml:space="preserve">
-    <value>Scenes</value>
-  </data>
-  <data name="ChkIncludeSceneId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>91, 213</value>
-  </data>
-  <data name="ChkIncludeSceneId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>122, 21</value>
-  </data>
-  <data name="ChkIncludeSceneId.Text" xml:space="preserve">
-    <value>Include scene Id</value>
-  </data>
-  <data name="LblTpZ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>219, 184</value>
-  </data>
-  <data name="LblTpY.Location" type="System.Drawing.Point, System.Drawing">
-    <value>113, 184</value>
-  </data>
-  <data name="BtnTeleport.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 211</value>
-  </data>
-  <data name="BtnTeleport.Text" xml:space="preserve">
-    <value>Teleport</value>
-  </data>
-  <data name="LblTpX.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 184</value>
-  </data>
-  <data name="NUDTpZ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>239, 182</value>
-  </data>
-  <data name="NUDTpY.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 182</value>
-  </data>
-  <data name="NUDTpX.Location" type="System.Drawing.Point, System.Drawing">
-    <value>27, 182</value>
-  </data>
-  <data name="CmbClimateType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 61</value>
-  </data>
-  <data name="LblClimateType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 64</value>
-  </data>
-  <data name="LblClimateType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 17</value>
-  </data>
-  <data name="LblClimateType.Text" xml:space="preserve">
-    <value>weather</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="LblSceneDescription.AutoSize" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="LblSceneDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 55</value>
-  </data>
-  <data name="LblSceneDescription.Text" xml:space="preserve">
-    <value>Scene control</value>
-  </data>
-  <data name="LblTp.AutoSize" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="LblTp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 89</value>
-  </data>
-  <data name="LblTp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 90</value>
-  </data>
-  <data name="LblTp.Text" xml:space="preserve">
-    <value>Teleporting
-Tip: You can quickly teleport through the 'fishing hook' pin on the map in-game.
-In the command, you can use ~ to indicate the current position, and ~N to indicate the relative current N</value>
-  </data>
  <data name="TPScene.Text" xml:space="preserve">
    <value>Scene</value>
  </data>
@@ -255,38 +157,6 @@ In the command, you can use ~ to indicate the current position, and ~N to indica
  <data name="TPSpawn.Text" xml:space="preserve">
    <value>Spawn</value>
  </data>
-  <data name="ChkQuestFilterTEST.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 21</value>
-  </data>
-  <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
-    <value>Test</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.Size" type="System.Drawing.Size, System.Drawing">
-    <value>93, 21</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.Text" xml:space="preserve">
-    <value>Unreleased</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 21</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
-    <value>Hidden</value>
-  </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>List Filter</value>
-  </data>
-  <data name="BtnFinishQuest.Text" xml:space="preserve">
-    <value>Finish</value>
-  </data>
-  <data name="BtnAddQuest.Text" xml:space="preserve">
-    <value>Add</value>
-  </data>
-  <data name="LblQuestDescription.Text" xml:space="preserve">
-    <value>Add or Finish Quest
-Tip: Many quest require server-side scripting support
-Therefore, the quest can be added and finished, but not necessarily work.</value>
-  </data>
  <data name="TPQuest.Text" xml:space="preserve">
    <value>Quest</value>
  </data>
@@ -302,4 +172,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
  <data name="TPMail.Text" xml:space="preserve">
    <value>Mail</value>
  </data>
+  <data name="TPLoopTasks.Text" xml:space="preserve">
+    <value>Loop</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Forms/FormMain.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.resx
--- a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
@@ -142,130 +142,24 @@
  <data name="ChkAutoCopy.Text" xml:space="preserve">
    <value>Авто</value>
  </data>
+  <data name="GrpCommand.Text" xml:space="preserve">
+    <value>Команды - [Ctrl] Запуск и замена - [Shift] Добавить  - [Alt] Только запустить  - [|] Разделитель</value>
+  </data>
  <data name="BtnInvokeOpenCommand.Size" type="System.Drawing.Size, System.Drawing">
    <value>120, 23</value>
  </data>
  <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
    <value>Выполнить (F5)</value>
  </data>
-  <data name="GrpCommand.Text" xml:space="preserve">
-    <value>Команды - [Ctrl] Запуск и замена - [Shift] Добавить  - [Alt] Только запустить  - [|] Разделитель</value>
-  </data>
  <data name="TPRemoteCall.Text" xml:space="preserve">
    <value>OpenCommand</value>
  </data>
-  <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 170</value>
-  </data>
-  <data name="LblSupportDescription.Text" xml:space="preserve">
-    <value>Grasscutter Tools - основной перевод Юрий Дворецкий (с исправлениями от EgorBron)
-
-Это бесплатный проект с открытым исходным кодом.
-Если вы считаете, что это полезно для вас,
- вы можете дать мне звезду на Github.
-Если возникла проблема с генерацией команды или
- есть запрос на новую функцию,
- вы можете написать в Issues на Github.
-
-	Спасибо:  Dhar_Jinxed
-</value>
-  </data>
  <data name="TPAbout.Text" xml:space="preserve">
    <value>Справка</value>
  </data>
  <data name="TPManage.Text" xml:space="preserve">
    <value>Аккаунты</value>
  </data>
-  <data name="RbListDungeons.Location" type="System.Drawing.Point, System.Drawing">
-    <value>243, 7</value>
-  </data>
-  <data name="RbListDungeons.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 21</value>
-  </data>
-  <data name="RbListDungeons.Text" xml:space="preserve">
-    <value>Подземелья</value>
-  </data>
-  <data name="RbListScene.Location" type="System.Drawing.Point, System.Drawing">
-    <value>171, 7</value>
-  </data>
-  <data name="RbListScene.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 21</value>
-  </data>
-  <data name="RbListScene.Text" xml:space="preserve">
-    <value>Сцены</value>
-  </data>
-  <data name="ChkIncludeSceneId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>91, 213</value>
-  </data>
-  <data name="ChkIncludeSceneId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>228, 21</value>
-  </data>
-  <data name="ChkIncludeSceneId.Text" xml:space="preserve">
-    <value>Включить идентификатор сцены</value>
-  </data>
-  <data name="LblTpZ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>219, 184</value>
-  </data>
-  <data name="LblTpY.Location" type="System.Drawing.Point, System.Drawing">
-    <value>113, 184</value>
-  </data>
-  <data name="BtnTeleport.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 211</value>
-  </data>
-  <data name="BtnTeleport.Text" xml:space="preserve">
-    <value>Телепорт</value>
-  </data>
-  <data name="LblTpX.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 184</value>
-  </data>
-  <data name="NUDTpZ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>239, 182</value>
-  </data>
-  <data name="NUDTpY.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 182</value>
-  </data>
-  <data name="NUDTpX.Location" type="System.Drawing.Point, System.Drawing">
-    <value>27, 182</value>
-  </data>
-  <data name="CmbClimateType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 61</value>
-  </data>
-  <data name="LblClimateType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 64</value>
-  </data>
-  <data name="LblClimateType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>52, 17</value>
-  </data>
-  <data name="LblClimateType.Text" xml:space="preserve">
-    <value>Погода</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="LblSceneDescription.AutoSize" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="LblSceneDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 55</value>
-  </data>
-  <data name="LblSceneDescription.Text" xml:space="preserve">
-    <value>Управление сценами.</value>
-  </data>
-  <data name="LblTp.AutoSize" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="LblTp.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Microsoft YaHei UI, 8pt</value>
-  </data>
-  <data name="LblTp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 84</value>
-  </data>
-  <data name="LblTp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 100</value>
-  </data>
-  <data name="LblTp.Text" xml:space="preserve">
-    <value>Телепортация
-Подсказка: вы можете быстро телепортироваться через отметку «рыболовный крючок» на миникарте в игре.
-В команде вы можете использовать ~, чтобы указать текущую позицию, и ~N, чтобы указать смещение на N относительно текущей позиции</value>
-  </data>
  <data name="TPScene.Text" xml:space="preserve">
    <value>Сцена</value>
  </data>
@@ -281,38 +175,6 @@
  <data name="TPSpawn.Text" xml:space="preserve">
    <value>Спавн</value>
  </data>
-  <data name="ChkQuestFilterTEST.Size" type="System.Drawing.Size, System.Drawing">
-    <value>52, 21</value>
-  </data>
-  <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
-    <value>Тест</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 21</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.Text" xml:space="preserve">
-    <value>Неизданное</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>81, 21</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
-    <value>Скрытый</value>
-  </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>Фильтр списка</value>
-  </data>
-  <data name="BtnFinishQuest.Text" xml:space="preserve">
-    <value>Завершить</value>
-  </data>
-  <data name="BtnAddQuest.Text" xml:space="preserve">
-    <value>Добавить</value>
-  </data>
-  <data name="LblQuestDescription.Text" xml:space="preserve">
-    <value>Добавить или завершить задание.
-Внимание: для многих квестов требуются скрипты таковых на стороне сервера.
-Поэтому квест может быть добавлен или отозван через консоль, но завершён игроком - вряд ли.</value>
-  </data>
  <data name="TPQuest.Text" xml:space="preserve">
    <value>Квест</value>
  </data>
@@ -328,4 +190,7 @@
  <data name="TPMail.Text" xml:space="preserve">
    <value>Почта</value>
  </data>
+  <data name="TPLoopTasks.Text" xml:space="preserve">
+    <value>Петля</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx
@@ -132,73 +132,12 @@
  <data name="TPRemoteCall.Text" xml:space="preserve">
    <value>遠程</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>334, 102</value>
-  </data>
-  <data name="LblSupportDescription.Text" xml:space="preserve">
-    <value>割草機工具箱
-
-這是一個免費且開源的項目
-如果覺得這對你很有幫助，可以為我點一個免費的Star
-如果願意請我喝一杯奶茶，那就更好了 : )
-指令生成有問題，或者有新的功能請求，都可以來Github提出</value>
-  </data>
  <data name="TPAbout.Text" xml:space="preserve">
    <value>關於</value>
  </data>
-  <data name="RbListDungeons.Text" xml:space="preserve">
-    <value>祕境</value>
-  </data>
-  <data name="RbListScene.Text" xml:space="preserve">
-    <value>場景</value>
-  </data>
-  <data name="ChkIncludeSceneId.Text" xml:space="preserve">
-    <value>含場景ID</value>
-  </data>
-  <data name="BtnTeleport.Text" xml:space="preserve">
-    <value>傳送</value>
-  </data>
-  <data name="LblClimateType.Text" xml:space="preserve">
-    <value>設置天氣</value>
-  </data>
-  <data name="LblSceneDescription.Text" xml:space="preserve">
-    <value>場景控制</value>
-  </data>
-  <data name="LblTp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>290, 51</value>
-  </data>
-  <data name="LblTp.Text" xml:space="preserve">
-    <value>座標傳送
-提示：遊戲內可以通過小地圖的'魚鉤'標記來快捷傳送
-命令中可以用~表示當前位置，~N 表示相對當前N</value>
-  </data>
  <data name="TPScene.Text" xml:space="preserve">
    <value>場景</value>
  </data>
-  <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
-    <value>測試任務</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.Text" xml:space="preserve">
-    <value>未發佈的任務</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
-    <value>隱藏的任務</value>
-  </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>列表過濾</value>
-  </data>
-  <data name="BtnFinishQuest.Text" xml:space="preserve">
-    <value>完成任務</value>
-  </data>
-  <data name="BtnAddQuest.Text" xml:space="preserve">
-    <value>添加任務</value>
-  </data>
-  <data name="LblQuestDescription.Text" xml:space="preserve">
-    <value>添加或完成任務
-提示：許多任務需要服務端腳本支持
-囙此任務可以接，可以完成，但是不一定可以做</value>
-  </data>
  <data name="TPQuest.Text" xml:space="preserve">
    <value>任務</value>
  </data>
@@ -214,4 +153,7 @@
  <data name="TPMail.Text" xml:space="preserve">
    <value>郵件</value>
  </data>
+  <data name="TPLoopTasks.Text" xml:space="preserve">
+    <value>循環</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs
+++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs
@@ -59,7 +59,7 @@ namespace GrasscutterTools.Game.Gacha
        /// <summary>
        /// 这个是抽卡的预览背景路径id
        /// </summary>
-        [JsonProperty("previewPrefabPath")]
+        [JsonProperty("previewPrefabPath"), JsonIgnore]
        public string PreviewPrefabPath { get; set; } = "UI_Tab_GachaShowPanel_A007";

        /// <summary>
--- a/Source/GrasscutterTools/Game/GameData.cs
+++ b/Source/GrasscutterTools/Game/GameData.cs
@@ -31,7 +31,7 @@ namespace GrasscutterTools.Game
            ArtifactSubAttribution = new ItemMap(Resources.ArtifactSubAttribution);
            Avatars = new ItemMap(Resources.Avatar);
            AvatarColors = new ItemMap(Resources.AvatarColor);
-            Items = new ItemMap(Resources.Item);
+            Items = new ItemMapGroup(Resources.Item);
            Monsters = new ItemMapGroup(Resources.Monsters);
            Gadgets = new ItemMapGroup(Resources.Gadget);
            Scenes = new ItemMap(Resources.Scene);
@@ -56,7 +56,7 @@ namespace GrasscutterTools.Game

        public static ItemMap AvatarColors { get; private set; }

-        public static ItemMap Items { get; private set; }
+        public static ItemMapGroup Items { get; private set; }

        public static ItemMapGroup Monsters { get; private set; }

--- a/Source/GrasscutterTools/Game/ItemMapGroup.cs
+++ b/Source/GrasscutterTools/Game/ItemMapGroup.cs
@@ -63,5 +63,21 @@ namespace GrasscutterTools.Game
        /// 获取所有行
        /// </summary>
        public IEnumerable<string> AllLines => Values.SelectMany(it => it.Lines);
+
+        private string[] lines;
+        public string[] Lines => lines ?? (lines = AllLines.ToArray());
+
+        public string this[int id]
+        {
+            get
+            {
+                foreach (var map in Values) {
+                    var n = map[id];
+                    if (n != ItemMap.EmptyName)
+                        return n;
+                }
+                return ItemMap.EmptyName;
+            }
+        }
    }
 }
--- a/Source/GrasscutterTools/GrasscutterTools.csproj
+++ b/Source/GrasscutterTools/GrasscutterTools.csproj
@@ -238,6 +238,18 @@
    <Compile Include="Pages\PageSpawn.Designer.cs">
      <DependentUpon>PageSpawn.cs</DependentUpon>
    </Compile>
+    <Compile Include="Pages\PageTasks.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Pages\PageTasks.Designer.cs">
+      <DependentUpon>PageTasks.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\PageTools.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Pages\PageTools.Designer.cs">
+      <DependentUpon>PageTools.cs</DependentUpon>
+    </Compile>
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Resources.zh-TW.Designer.cs">
@@ -496,6 +508,21 @@
    <EmbeddedResource Include="Pages\PageSpawn.zh-TW.resx">
      <DependentUpon>PageSpawn.cs</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PageTasks.en-US.resx">
+      <DependentUpon>PageTasks.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PageTasks.resx">
+      <DependentUpon>PageTasks.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PageTasks.ru-RU.resx">
+      <DependentUpon>PageTasks.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PageTasks.zh-TW.resx">
+      <DependentUpon>PageTasks.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PageTools.resx">
+      <DependentUpon>PageTools.cs</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.zh-TW.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.zh-TW.Designer.cs</LastGenOutput>
@@ -567,6 +594,7 @@
    <Content Include="Resources\en-us\ShopType.txt" />
    <Content Include="Resources\en-us\Weapon.txt" />
    <None Include="Resources\Newtonsoft.Json.dll" />
+    <Content Include="Resources\MyTools.java" />
    <Content Include="Resources\ru-ru\Artifact.txt" />
    <Content Include="Resources\ru-ru\ArtifactCat.txt" />
    <Content Include="Resources\ru-ru\ArtifactMainAttribution.txt" />
--- a/Source/GrasscutterTools/Pages/BasePage.cs
+++ b/Source/GrasscutterTools/Pages/BasePage.cs
@@ -19,6 +19,7 @@

 using System;
 using System.Drawing;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;

@@ -51,7 +52,7 @@ namespace GrasscutterTools.Pages
        /// <param name="args">参数</param>
        public SetCommandHandler SetCommand { get; set; }

-        public delegate Task<bool> RunCommandsHandler(string[] commands);
+        public delegate Task<bool> RunCommandsHandler(params string[] commands);

        /// <summary>
        /// 运行命令
@@ -63,6 +64,30 @@ namespace GrasscutterTools.Pages
        /// </summary>
        public Func<string> GetCommand { get; set; }

+        /// <summary>
+        /// 运行原始命令（未处理的竖线分割命令文本）
+        /// </summary>
+        /// <param name="commands">未处理的竖线分割命令文本</param>
+        /// <returns>是否运行成功</returns>
+        protected async Task<bool> RunRawCommands(string commands)
+        {
+            if (commands.IndexOf('|') == -1)
+                return await RunCommands(FormatCommand(commands));
+            else
+                return await RunCommands(commands.Split('|').Select(it => FormatCommand(it)).ToArray());
+        }
+
+        /// <summary>
+        /// 格式化命令
+        /// （去除收尾空白，替换换行）
+        /// </summary>
+        /// <param name="raw">原始输入</param>
+        /// <returns>格式化后可执行命令</returns>
+        private string FormatCommand(string raw)
+        {
+            return raw.Trim().Replace("\\r", "\r").Replace("\\n", "\n");
+        }
+
        #endregion - 命令相关 -

        #region - 生命周期事件 -
--- a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs
+++ b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs
@@ -28,6 +28,7 @@
        /// </summary>
        private void InitializeComponent()
        {
+            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PageGiveItem));
            this.LblClearGiveItemLogs = new System.Windows.Forms.Label();
            this.BtnSaveGiveItemLog = new System.Windows.Forms.Button();
@@ -42,6 +43,8 @@
            this.NUDGameItemAmout = new System.Windows.Forms.NumericUpDown();
            this.NUDGameItemLevel = new System.Windows.Forms.NumericUpDown();
            this.LblGiveCommandDescription = new System.Windows.Forms.Label();
+            this.BtnFilterItem = new System.Windows.Forms.Button();
+            this.MenuItemFilter = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.GrpGiveItemRecord.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.NUDGameItemAmout)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.NUDGameItemLevel)).BeginInit();
@@ -159,10 +162,23 @@
            resources.ApplyResources(this.LblGiveCommandDescription, "LblGiveCommandDescription");
            this.LblGiveCommandDescription.Name = "LblGiveCommandDescription";
            // 
+            // BtnFilterItem
+            // 
+            resources.ApplyResources(this.BtnFilterItem, "BtnFilterItem");
+            this.BtnFilterItem.Name = "BtnFilterItem";
+            this.BtnFilterItem.UseVisualStyleBackColor = true;
+            this.BtnFilterItem.Click += new System.EventHandler(this.BtnFilterItem_Click);
+            // 
+            // MenuItemFilter
+            // 
+            this.MenuItemFilter.Name = "MenuSpawnEntityFilter";
+            resources.ApplyResources(this.MenuItemFilter, "MenuItemFilter");
+            // 
            // PageGiveItem
            // 
            resources.ApplyResources(this, "$this");
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.BtnFilterItem);
            this.Controls.Add(this.LblClearGiveItemLogs);
            this.Controls.Add(this.BtnSaveGiveItemLog);
            this.Controls.Add(this.BtnRemoveGiveItemLog);
@@ -199,5 +215,7 @@
        private System.Windows.Forms.NumericUpDown NUDGameItemAmout;
        private System.Windows.Forms.NumericUpDown NUDGameItemLevel;
        private System.Windows.Forms.Label LblGiveCommandDescription;
+        private System.Windows.Forms.Button BtnFilterItem;
+        private System.Windows.Forms.ContextMenuStrip MenuItemFilter;
    }
 }
--- a/Source/GrasscutterTools/Pages/PageGiveItem.cs
+++ b/Source/GrasscutterTools/Pages/PageGiveItem.cs
@@ -46,8 +46,52 @@ namespace GrasscutterTools.Pages
        /// </summary>
        public override void OnLoad()
        {
-            ListGameItems.Items.Clear();
-            ListGameItems.Items.AddRange(GameData.Items.Lines);
+            MenuItemFilter.SuspendLayout();
+            MenuItemFilter.Items.Clear();
+            SelectedItemTypeLines = GameData.Items.Lines;
+            var all = new ToolStripMenuItem
+            {
+                Text = Resources.All,
+                Tag = SelectedItemTypeLines,
+            };
+            all.Click += OnItemFilterClick;
+            MenuItemFilter.Items.Add(all);
+            foreach (var kv in GameData.Items)
+            {
+                var item = new ToolStripMenuItem
+                {
+                    Text = kv.Key,
+                    Tag = kv.Value.Lines,
+                };
+                item.Click += OnItemFilterClick;
+                MenuItemFilter.Items.Add(item);
+            }
+            MenuItemFilter.ResumeLayout();
+
+            LoadItemList();
+        }
+
+        /// <summary>
+        /// 当前选中的物品类型行
+        /// </summary>
+        private string[] SelectedItemTypeLines;
+
+        /// <summary>
+        /// 物品类型过滤器类型选中时触发
+        /// </summary>
+        private void OnItemFilterClick(object sender, EventArgs e)
+        {
+            var btn = sender as ToolStripMenuItem;
+            SelectedItemTypeLines = btn.Tag as string[];
+            LoadItemList();
+        }
+
+        /// <summary>
+        /// 加载物品列表
+        /// </summary>
+        private void LoadItemList()
+        {
+            UIUtil.ListBoxFilter(ListGameItems, SelectedItemTypeLines, TxtGameItemFilter.Text);
        }

        /// <summary>
@@ -55,7 +99,7 @@ namespace GrasscutterTools.Pages
        /// </summary>
        private void TxtGameItemFilter_TextChanged(object sender, EventArgs e)
        {
-            UIUtil.ListBoxFilter(ListGameItems, GameData.Items.Lines, TxtGameItemFilter.Text);
+            LoadItemList();
        }

        /// <summary>
@@ -95,6 +139,14 @@ namespace GrasscutterTools.Pages
            GenGiveItemCommand();
        }

+        /// <summary>
+        /// 点击过滤物品按钮时触发
+        /// </summary>
+        private void BtnFilterItem_Click(object sender, EventArgs e)
+        {
+            MenuItemFilter.Show(BtnFilterItem, 0, BtnFilterItem.Height);
+        }
+
        #region -- 物品记录 --

        /// <summary>
--- a/Source/GrasscutterTools/Pages/PageGiveItem.resx
+++ b/Source/GrasscutterTools/Pages/PageGiveItem.resx
@@ -151,7 +151,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;LblClearGiveItemLogs.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
  </data>
  <data name="BtnSaveGiveItemLog.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
@@ -178,7 +178,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;BtnSaveGiveItemLog.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
  </data>
  <data name="BtnRemoveGiveItemLog.Enabled" type="System.Boolean, mscorlib">
    <value>False</value>
@@ -208,7 +208,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;BtnRemoveGiveItemLog.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
  </data>
  <data name="GrpGiveItemRecord.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Bottom, Left</value>
@@ -262,7 +262,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;GrpGiveItemRecord.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
  </data>
  <data name="ChkDrop.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Left</value>
@@ -295,7 +295,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;ChkDrop.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
  </data>
  <data name="TxtGameItemFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
@@ -304,7 +304,7 @@
    <value>343, 3</value>
  </data>
  <data name="TxtGameItemFilter.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 23</value>
+    <value>268, 23</value>
  </data>
  <data name="TxtGameItemFilter.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
@@ -319,7 +319,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;TxtGameItemFilter.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
  </data>
  <data name="ListGameItems.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Bottom, Left, Right</value>
@@ -334,7 +334,7 @@
    <value>300, 208</value>
  </data>
  <data name="ListGameItems.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>11</value>
  </data>
  <data name="&gt;&gt;ListGameItems.Name" xml:space="preserve">
    <value>ListGameItems</value>
@@ -346,7 +346,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;ListGameItems.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
  </data>
  <data name="LblGameItemAmount.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Left</value>
@@ -379,7 +379,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;LblGameItemAmount.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
  </data>
  <data name="LblGameItemLevel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Left</value>
@@ -412,7 +412,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;LblGameItemLevel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
  </data>
  <data name="NUDGameItemAmout.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Left</value>
@@ -436,7 +436,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;NUDGameItemAmout.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
  </data>
  <data name="NUDGameItemLevel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Left</value>
@@ -460,7 +460,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;NUDGameItemLevel.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
  </data>
  <data name="LblGiveCommandDescription.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -491,7 +491,49 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;LblGiveCommandDescription.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
+  </data>
+  <data name="BtnFilterItem.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="BtnFilterItem.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="BtnFilterItem.Location" type="System.Drawing.Point, System.Drawing">
+    <value>617, 3</value>
+  </data>
+  <data name="BtnFilterItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>26, 24</value>
+  </data>
+  <data name="BtnFilterItem.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="BtnFilterItem.Text" xml:space="preserve">
+    <value>三</value>
+  </data>
+  <data name="&gt;&gt;BtnFilterItem.Name" xml:space="preserve">
+    <value>BtnFilterItem</value>
+  </data>
+  <data name="&gt;&gt;BtnFilterItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;BtnFilterItem.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;BtnFilterItem.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="MenuItemFilter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="MenuItemFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 4</value>
+  </data>
+  <data name="&gt;&gt;MenuItemFilter.Name" xml:space="preserve">
+    <value>MenuItemFilter</value>
+  </data>
+  <data name="&gt;&gt;MenuItemFilter.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
@@ -503,6 +545,6 @@
    <value>PageGiveItem</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.4.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
+    <value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.6.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
  </data>
 </root>
--- a/Source/GrasscutterTools/Pages/PageMail.cs
+++ b/Source/GrasscutterTools/Pages/PageMail.cs
@@ -181,9 +181,9 @@ namespace GrasscutterTools.Pages
        /// </summary>
        private void LoadMailSelectableItems()
        {
-            MailSelectableItems = new string[GameData.Items.Count + GameData.Weapons.Count + GameData.Artifacts.Count];
+            MailSelectableItems = new string[GameData.Items.Lines.Length + GameData.Weapons.Count + GameData.Artifacts.Count];
            int i = 0;
-            GameData.Items.Lines.CopyTo(MailSelectableItems, i); i += GameData.Items.Count;
+            GameData.Items.Lines.CopyTo(MailSelectableItems, i); i += GameData.Items.Lines.Length;
            GameData.Weapons.Lines.CopyTo(MailSelectableItems, i); i += GameData.Weapons.Count;
            GameData.Artifacts.Lines.CopyTo(MailSelectableItems, i); i += GameData.Artifacts.Count;

--- a/Source/GrasscutterTools/Pages/PageSpawn.cs
+++ b/Source/GrasscutterTools/Pages/PageSpawn.cs
@@ -60,6 +60,15 @@ namespace GrasscutterTools.Pages
            // 初始化列表类型过滤器
            MenuSpawnEntityFilter.SuspendLayout();
            MenuSpawnEntityFilter.Items.Clear();
+            // 默认显示所有
+            SelectedEntityTypeLines = GameData.Monsters.AllLines.Concat(GameData.Gadgets.AllLines).ToArray();
+            var all = new ToolStripMenuItem
+            {
+                Text = Resources.All,
+                Tag = SelectedEntityTypeLines,
+            };
+            all.Click += OnEntityTypeFilterClick;
+            MenuSpawnEntityFilter.Items.Add(all);
            void AddTypes(ItemMapGroup group)
            {
                foreach (var kv in group)
@@ -80,8 +89,6 @@ namespace GrasscutterTools.Pages
            AddTypes(GameData.Gadgets);
            MenuSpawnEntityFilter.ResumeLayout();

-            // 默认显示所有
-            SelectedEntityTypeLines = GameData.Monsters.AllLines.Concat(GameData.Gadgets.AllLines).ToArray();
            LoadEntityList();
        }

--- a/Source/GrasscutterTools/Pages/PageTasks.Designer.cs
+++ b/Source/GrasscutterTools/Pages/PageTasks.Designer.cs
@@ -0,0 +1,202 @@
+namespace GrasscutterTools.Pages
+{
+    partial class PageTasks
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PageTasks));
+            this.GrpTasks = new System.Windows.Forms.GroupBox();
+            this.ListTasks = new System.Windows.Forms.ListView();
+            this.ColTag = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.ColContent = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.ColDelay = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.ColCount = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.GrpTask = new System.Windows.Forms.GroupBox();
+            this.BtnRemove = new System.Windows.Forms.Button();
+            this.BtnAccept = new System.Windows.Forms.Button();
+            this.NUDTriggerCount = new System.Windows.Forms.NumericUpDown();
+            this.LblTriggerCount = new System.Windows.Forms.Label();
+            this.DTPDelay = new System.Windows.Forms.DateTimePicker();
+            this.LblDelay = new System.Windows.Forms.Label();
+            this.TxtTag = new System.Windows.Forms.TextBox();
+            this.LblTag = new System.Windows.Forms.Label();
+            this.GrpTasks.SuspendLayout();
+            this.GrpTask.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.NUDTriggerCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // GrpTasks
+            // 
+            resources.ApplyResources(this.GrpTasks, "GrpTasks");
+            this.GrpTasks.Controls.Add(this.ListTasks);
+            this.GrpTasks.Name = "GrpTasks";
+            this.GrpTasks.TabStop = false;
+            // 
+            // ListTasks
+            // 
+            resources.ApplyResources(this.ListTasks, "ListTasks");
+            this.ListTasks.AllowColumnReorder = true;
+            this.ListTasks.CheckBoxes = true;
+            this.ListTasks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.ColTag,
+            this.ColContent,
+            this.ColDelay,
+            this.ColCount});
+            this.ListTasks.HideSelection = false;
+            this.ListTasks.MultiSelect = false;
+            this.ListTasks.Name = "ListTasks";
+            this.ListTasks.UseCompatibleStateImageBehavior = false;
+            this.ListTasks.View = System.Windows.Forms.View.Details;
+            this.ListTasks.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.ListTasks_ItemChecked);
+            this.ListTasks.SelectedIndexChanged += new System.EventHandler(this.ListTasks_SelectedIndexChanged);
+            // 
+            // ColTag
+            // 
+            resources.ApplyResources(this.ColTag, "ColTag");
+            // 
+            // ColContent
+            // 
+            resources.ApplyResources(this.ColContent, "ColContent");
+            // 
+            // ColDelay
+            // 
+            resources.ApplyResources(this.ColDelay, "ColDelay");
+            // 
+            // ColCount
+            // 
+            resources.ApplyResources(this.ColCount, "ColCount");
+            // 
+            // GrpTask
+            // 
+            resources.ApplyResources(this.GrpTask, "GrpTask");
+            this.GrpTask.Controls.Add(this.BtnRemove);
+            this.GrpTask.Controls.Add(this.BtnAccept);
+            this.GrpTask.Controls.Add(this.NUDTriggerCount);
+            this.GrpTask.Controls.Add(this.LblTriggerCount);
+            this.GrpTask.Controls.Add(this.DTPDelay);
+            this.GrpTask.Controls.Add(this.LblDelay);
+            this.GrpTask.Controls.Add(this.TxtTag);
+            this.GrpTask.Controls.Add(this.LblTag);
+            this.GrpTask.Name = "GrpTask";
+            this.GrpTask.TabStop = false;
+            // 
+            // BtnRemove
+            // 
+            resources.ApplyResources(this.BtnRemove, "BtnRemove");
+            this.BtnRemove.Name = "BtnRemove";
+            this.BtnRemove.UseVisualStyleBackColor = true;
+            this.BtnRemove.Click += new System.EventHandler(this.BtnRemove_Click);
+            // 
+            // BtnAccept
+            // 
+            resources.ApplyResources(this.BtnAccept, "BtnAccept");
+            this.BtnAccept.Name = "BtnAccept";
+            this.BtnAccept.UseVisualStyleBackColor = true;
+            this.BtnAccept.Click += new System.EventHandler(this.BtnAccept_Click);
+            // 
+            // NUDTriggerCount
+            // 
+            resources.ApplyResources(this.NUDTriggerCount, "NUDTriggerCount");
+            this.NUDTriggerCount.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.NUDTriggerCount.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            -2147483648});
+            this.NUDTriggerCount.Name = "NUDTriggerCount";
+            this.NUDTriggerCount.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            -2147483648});
+            // 
+            // LblTriggerCount
+            // 
+            resources.ApplyResources(this.LblTriggerCount, "LblTriggerCount");
+            this.LblTriggerCount.Name = "LblTriggerCount";
+            // 
+            // DTPDelay
+            // 
+            resources.ApplyResources(this.DTPDelay, "DTPDelay");
+            this.DTPDelay.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+            this.DTPDelay.Name = "DTPDelay";
+            this.DTPDelay.ShowUpDown = true;
+            this.DTPDelay.Value = new System.DateTime(2022, 12, 10, 0, 1, 0, 0);
+            // 
+            // LblDelay
+            // 
+            resources.ApplyResources(this.LblDelay, "LblDelay");
+            this.LblDelay.Name = "LblDelay";
+            // 
+            // TxtTag
+            // 
+            resources.ApplyResources(this.TxtTag, "TxtTag");
+            this.TxtTag.Name = "TxtTag";
+            // 
+            // LblTag
+            // 
+            resources.ApplyResources(this.LblTag, "LblTag");
+            this.LblTag.Name = "LblTag";
+            // 
+            // PageTasks
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.GrpTask);
+            this.Controls.Add(this.GrpTasks);
+            this.Name = "PageTasks";
+            this.GrpTasks.ResumeLayout(false);
+            this.GrpTask.ResumeLayout(false);
+            this.GrpTask.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.NUDTriggerCount)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox GrpTasks;
+        private System.Windows.Forms.GroupBox GrpTask;
+        private System.Windows.Forms.DateTimePicker DTPDelay;
+        private System.Windows.Forms.Label LblDelay;
+        private System.Windows.Forms.TextBox TxtTag;
+        private System.Windows.Forms.Label LblTag;
+        private System.Windows.Forms.NumericUpDown NUDTriggerCount;
+        private System.Windows.Forms.Label LblTriggerCount;
+        private System.Windows.Forms.Button BtnRemove;
+        private System.Windows.Forms.Button BtnAccept;
+        private System.Windows.Forms.ListView ListTasks;
+        private System.Windows.Forms.ColumnHeader ColTag;
+        private System.Windows.Forms.ColumnHeader ColContent;
+        private System.Windows.Forms.ColumnHeader ColDelay;
+        private System.Windows.Forms.ColumnHeader ColCount;
+    }
+}
--- a/Source/GrasscutterTools/Pages/PageTasks.cs
+++ b/Source/GrasscutterTools/Pages/PageTasks.cs
@@ -0,0 +1,265 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+using GrasscutterTools.Properties;
+using GrasscutterTools.Utils;
+
+using Newtonsoft.Json;
+
+namespace GrasscutterTools.Pages
+{
+    internal partial class PageTasks : BasePage
+    {
+        private const string TAG = nameof(PageTasks);
+
+        public PageTasks()
+        {
+            InitializeComponent();
+            ListTasks.FullRowSelect = true;
+            if (DesignMode) return;
+
+            InitTasks();
+        }
+
+        /// <summary>
+        /// 循环任务
+        /// </summary>
+        private class LoopTask
+        {
+            /// <summary>
+            /// 任务标签
+            /// </summary>
+            public string Tag { get; set; }
+
+            /// <summary>
+            /// 任务内容
+            /// </summary>
+            public string Content { get; set; }
+
+            /// <summary>
+            /// 延迟时间（秒）
+            /// </summary>
+            public int DelayS { get; set; }
+
+            /// <summary>
+            /// 触发次数  -1为无限循环
+            /// </summary>
+            public int TriggerCount { get; set; }
+        }
+
+        /// <summary>
+        /// 任务列表路径
+        /// </summary>
+        private readonly string TasksJsonPath = Common.GetAppDataFile("Tasks.json");
+
+        /// <summary>
+        /// 任务集合
+        /// </summary>
+        private List<LoopTask> Tasks;
+
+        /// <summary>
+        /// 运行中的任务集合
+        /// </summary>
+        private readonly ConcurrentDictionary<string, CancellationTokenSource> RunningTasks = new ConcurrentDictionary<string, CancellationTokenSource>();
+
+        /// <summary>
+        /// 初始化任务集合
+        /// </summary>
+        private void InitTasks()
+        {
+            if (File.Exists(TasksJsonPath))
+            {
+                try
+                {
+                    Tasks = JsonConvert.DeserializeObject<List<LoopTask>>(File.ReadAllText(TasksJsonPath));
+                    ListTasks.Items.AddRange(Tasks.Select(t => TaskToViewItem(t)).ToArray());
+                }
+                catch (Exception ex)
+                {
+                    Tasks = new List<LoopTask>();
+                    Logger.W(TAG, "Parsing Tasks json failed", ex);
+                }
+            }
+            else
+            {
+                Tasks = new List<LoopTask>();
+            }
+        }
+
+        /// <summary>
+        /// 关闭时触发
+        /// </summary>
+        public override void OnClosed()
+        {
+            // 取消所有正在运行的任务
+            foreach (var cs in RunningTasks.Values)
+                cs.Cancel();
+            // 清空列表
+            RunningTasks.Clear();
+
+            // 保存任务列表
+            File.WriteAllText(TasksJsonPath, JsonConvert.SerializeObject(Tasks));
+        }
+
+        /// <summary>
+        /// 任务转为列表项
+        /// </summary>
+        /// <param name="task">任务</param>
+        /// <returns>列表项</returns>
+        private static ListViewItem TaskToViewItem(LoopTask task) => new ListViewItem(new string[]
+        {
+            task.Tag,
+            task.Content,
+            TimeSpan.FromSeconds(task.DelayS).ToString(),
+            task.TriggerCount.ToString(),
+        });
+
+        /// <summary>
+        /// 列表选中项改变时触发
+        /// </summary>
+        private void ListTasks_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (ListTasks.SelectedIndices.Count == 0) return;
+            int i = ListTasks.SelectedIndices[0];
+            var task = Tasks[i];
+            TxtTag.Text = task.Tag;
+            DTPDelay.Value = DateTime.Today.Add(TimeSpan.FromSeconds(task.DelayS));
+            NUDTriggerCount.Value = task.TriggerCount;
+            // 设置命令
+            SetCommand(task.Content);
+        }
+
+        /// <summary>
+        /// 点击确定按钮时触发
+        /// </summary>
+        private void BtnAccept_Click(object sender, EventArgs e)
+        {
+            var tag = TxtTag.Text.Trim();
+            var commands = GetCommand();
+            var delay = DTPDelay.Value.TimeOfDay;
+            var count = (int)NUDTriggerCount.Value;
+            if (string.IsNullOrEmpty(tag) || string.IsNullOrEmpty(commands) || delay.Ticks == 0)
+            {
+                MessageBox.Show(Resources.EmptyInputTip, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            // 查找是否已经存在
+            var i = Tasks.FindIndex(t => t.Tag == tag);
+            if (i == -1)
+            {
+                // 新建任务
+                var t = new LoopTask
+                {
+                    Tag = tag,
+                    Content = commands,
+                    DelayS = (int)delay.TotalSeconds,
+                    TriggerCount = count,
+                };
+                ListTasks.Items.Add(TaskToViewItem(t));
+                Tasks.Add(t);
+            }
+            else
+            {
+                // 已存在的任务，确认是否正在运行中
+                if (ListTasks.Items[i].Checked || RunningTasks.ContainsKey(tag))
+                {
+                    MessageBox.Show(Resources.TaskRunningCannotOperated, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
+                // 否则修改任务内容
+                var task = Tasks[i];
+                task.Content = commands;
+                task.DelayS = (int)delay.TotalSeconds;
+                task.TriggerCount = count;
+                ListTasks.Items[i] = TaskToViewItem(task);
+            }
+        }
+
+        /// <summary>
+        /// 点击删除按钮时触发
+        /// </summary>
+        private void BtnRemove_Click(object sender, EventArgs e)
+        {
+            var tag = TxtTag.Text.Trim();
+            // 查找是否已经存在
+            var i = Tasks.FindIndex(t => t.Tag == tag);
+            if (i == -1) return;
+
+            if (ListTasks.Items[i].Checked || RunningTasks.ContainsKey(tag))
+            {
+                MessageBox.Show(Resources.TaskRunningCannotOperated, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            // 删除实例
+            ListTasks.Items.RemoveAt(i);
+            Tasks.RemoveAt(i);
+        }
+
+        /// <summary>
+        /// 任务前复选框改变时触发
+        /// </summary>
+        private void ListTasks_ItemChecked(object sender, ItemCheckedEventArgs e)
+        {
+            try
+            {
+                var item = e.Item;
+                if (item.Index < 0 || item.Index >= Tasks.Count)
+                    return;
+                var task = Tasks[item.Index];
+                // 先将旧的任务取消
+                if (RunningTasks.TryRemove(task.Tag, out var source))
+                    source.Cancel();
+
+                if (item.Checked)
+                {
+                    var cancelSource = new CancellationTokenSource();
+                    RunningTasks.TryAdd(task.Tag, cancelSource);
+                    var token = cancelSource.Token;
+                    Task.Run(async () =>
+                    {
+                        try
+                        {
+                            Logger.I(TAG, $"Task \"{task.Tag}\" started");
+                            // 循环执行命令
+                            for (int c = 0;
+                                !token.IsCancellationRequested
+                                && (c < task.TriggerCount || task.TriggerCount <= 0);
+                                c++)
+                            {
+                                // 延迟
+                                await Task.Delay(task.DelayS * 1000, token);
+                                // 使用UI线程执行
+                                var ret = Invoke(new Func<string, Task<bool>>(RunRawCommands), task.Content);
+                                if (ret is Task<bool> b && b.Result == false)
+                                    break;
+                                // 执行
+                                //if (!await RunRawCommands(task.Content))
+                                //    break;
+                            }
+                        }
+                        finally
+                        {
+                            // 任务结束后取消勾选状态
+                            BeginInvoke(new Action(() => item.Checked = false));
+                            Logger.I(TAG, $"Task \"{task.Tag}\" stoped");
+                        }
+                    }, token);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.E(TAG, "Start or Stop Task failed.", ex);
+                MessageBox.Show(ex.ToString(), Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}
--- a/Source/GrasscutterTools/Pages/PageTasks.en-US.resx
+++ b/Source/GrasscutterTools/Pages/PageTasks.en-US.resx
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GrpTasks.Text" xml:space="preserve">
+    <value>Task list</value>
+  </data>
+  <data name="ColTag.Text" xml:space="preserve">
+    <value>Tag</value>
+  </data>
+  <data name="ColContent.Text" xml:space="preserve">
+    <value>Content</value>
+  </data>
+  <data name="ColDelay.Text" xml:space="preserve">
+    <value>Delay</value>
+  </data>
+  <data name="ColCount.Text" xml:space="preserve">
+    <value>Count</value>
+  </data>
+  <data name="GrpTask.Text" xml:space="preserve">
+    <value>Task</value>
+  </data>
+  <data name="BtnRemove.Text" xml:space="preserve">
+    <value>× Delete</value>
+  </data>
+  <data name="BtnAccept.Text" xml:space="preserve">
+    <value>√ Accept</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="LblTriggerCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>331, 22</value>
+  </data>
+  <data name="LblTriggerCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>42, 17</value>
+  </data>
+  <data name="LblTriggerCount.Text" xml:space="preserve">
+    <value>Count</value>
+  </data>
+  <data name="LblDelay.Location" type="System.Drawing.Point, System.Drawing">
+    <value>219, 22</value>
+  </data>
+  <data name="LblDelay.Size" type="System.Drawing.Size, System.Drawing">
+    <value>40, 17</value>
+  </data>
+  <data name="LblDelay.Text" xml:space="preserve">
+    <value>Delay</value>
+  </data>
+  <data name="LblTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 17</value>
+  </data>
+  <data name="LblTag.Text" xml:space="preserve">
+    <value>Tag</value>
+  </data>
+</root>
--- a/Source/GrasscutterTools/Pages/PageTasks.resx
+++ b/Source/GrasscutterTools/Pages/PageTasks.resx
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="&gt;&gt;BtnRemove.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;ColCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BtnRemove.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 23</value>
+  </data>
+  <data name="&gt;&gt;ColContent.Name" xml:space="preserve">
+    <value>ColContent</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.8.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
+  </data>
+  <data name="&gt;&gt;LblDelay.Name" xml:space="preserve">
+    <value>LblDelay</value>
+  </data>
+  <data name="&gt;&gt;GrpTasks.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="LblDelay.Text" xml:space="preserve">
+    <value>延迟</value>
+  </data>
+  <data name="LblTriggerCount.Text" xml:space="preserve">
+    <value>次数</value>
+  </data>
+  <data name="&gt;&gt;DTPDelay.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="BtnRemove.Location" type="System.Drawing.Point, System.Drawing">
+    <value>534, 18</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TxtTag.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="DTPDelay.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;TxtTag.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="&gt;&gt;LblTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ListTasks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 161</value>
+  </data>
+  <data name="TxtTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 23</value>
+  </data>
+  <data name="&gt;&gt;LblTag.Name" xml:space="preserve">
+    <value>LblTag</value>
+  </data>
+  <data name="&gt;&gt;TxtTag.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="NUDTriggerCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 23</value>
+  </data>
+  <data name="ListTasks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 19</value>
+  </data>
+  <data name="GrpTasks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>640, 183</value>
+  </data>
+  <data name="&gt;&gt;ColTag.Name" xml:space="preserve">
+    <value>ColTag</value>
+  </data>
+  <data name="&gt;&gt;TxtTag.Name" xml:space="preserve">
+    <value>TxtTag</value>
+  </data>
+  <data name="LblTriggerCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>334, 22</value>
+  </data>
+  <data name="GrpTasks.Text" xml:space="preserve">
+    <value>任务列表</value>
+  </data>
+  <data name="GrpTask.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;LblTriggerCount.Name" xml:space="preserve">
+    <value>LblTriggerCount</value>
+  </data>
+  <data name="LblTriggerCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 17</value>
+  </data>
+  <data name="TxtTag.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;ColTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="NUDTriggerCount.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;LblDelay.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;DTPDelay.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="DTPDelay.CustomFormat" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;NUDTriggerCount.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;NUDTriggerCount.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="&gt;&gt;BtnAccept.Name" xml:space="preserve">
+    <value>BtnAccept</value>
+  </data>
+  <data name="LblDelay.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 17</value>
+  </data>
+  <data name="&gt;&gt;GrpTasks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GrpTask.Name" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="&gt;&gt;LblDelay.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="&gt;&gt;GrpTask.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="DTPDelay.Location" type="System.Drawing.Point, System.Drawing">
+    <value>258, 19</value>
+  </data>
+  <data name="LblTriggerCount.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;NUDTriggerCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="NUDTriggerCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 19</value>
+  </data>
+  <data name="LblTag.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="LblTriggerCount.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;LblTriggerCount.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="LblTag.Text" xml:space="preserve">
+    <value>标签</value>
+  </data>
+  <data name="ColContent.Text" xml:space="preserve">
+    <value>内容</value>
+  </data>
+  <data name="&gt;&gt;BtnRemove.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ColContent.Width" type="System.Int32, mscorlib">
+    <value>330</value>
+  </data>
+  <data name="ColDelay.Text" xml:space="preserve">
+    <value>延迟</value>
+  </data>
+  <data name="&gt;&gt;LblTag.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="LblTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 17</value>
+  </data>
+  <data name="BtnRemove.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="LblTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 21</value>
+  </data>
+  <data name="&gt;&gt;DTPDelay.Type" xml:space="preserve">
+    <value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GrpTask.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;ColCount.Name" xml:space="preserve">
+    <value>ColCount</value>
+  </data>
+  <data name="&gt;&gt;NUDTriggerCount.Name" xml:space="preserve">
+    <value>NUDTriggerCount</value>
+  </data>
+  <data name="&gt;&gt;TxtTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;BtnRemove.Name" xml:space="preserve">
+    <value>BtnRemove</value>
+  </data>
+  <data name="&gt;&gt;BtnAccept.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="&gt;&gt;GrpTasks.Name" xml:space="preserve">
+    <value>GrpTasks</value>
+  </data>
+  <data name="&gt;&gt;LblTag.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>7, 17</value>
+  </data>
+  <data name="BtnAccept.Text" xml:space="preserve">
+    <value>√ 确定</value>
+  </data>
+  <data name="ColTag.Width" type="System.Int32, mscorlib">
+    <value>150</value>
+  </data>
+  <data name="DTPDelay.Size" type="System.Drawing.Size, System.Drawing">
+    <value>70, 23</value>
+  </data>
+  <data name="&gt;&gt;BtnAccept.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;GrpTasks.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="BtnAccept.Location" type="System.Drawing.Point, System.Drawing">
+    <value>428, 18</value>
+  </data>
+  <data name="&gt;&gt;DTPDelay.Name" xml:space="preserve">
+    <value>DTPDelay</value>
+  </data>
+  <data name="&gt;&gt;ListTasks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="LblDelay.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;ColDelay.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="LblDelay.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="ColCount.Text" xml:space="preserve">
+    <value>次数</value>
+  </data>
+  <data name="LblTriggerCount.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>PageTasks</value>
+  </data>
+  <data name="GrpTasks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;ListTasks.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="GrpTask.Text" xml:space="preserve">
+    <value>任务</value>
+  </data>
+  <data name="BtnAccept.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;BtnAccept.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GrpTask.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="GrpTask.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 186</value>
+  </data>
+  <data name="&gt;&gt;LblDelay.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;LblTriggerCount.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="ListTasks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="&gt;&gt;GrpTask.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;LblTriggerCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;BtnRemove.Parent" xml:space="preserve">
+    <value>GrpTask</value>
+  </data>
+  <data name="GrpTasks.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="BtnAccept.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="BtnRemove.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;ColContent.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="LblTag.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="ListTasks.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="LblDelay.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="NUDTriggerCount.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="ColTag.Text" xml:space="preserve">
+    <value>标签</value>
+  </data>
+  <data name="DTPDelay.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="GrpTask.Size" type="System.Drawing.Size, System.Drawing">
+    <value>640, 50</value>
+  </data>
+  <data name="BtnAccept.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 23</value>
+  </data>
+  <data name="LblDelay.Location" type="System.Drawing.Point, System.Drawing">
+    <value>220, 22</value>
+  </data>
+  <data name="&gt;&gt;ColDelay.Name" xml:space="preserve">
+    <value>ColDelay</value>
+  </data>
+  <data name="BtnRemove.Text" xml:space="preserve">
+    <value>× 删除</value>
+  </data>
+  <data name="TxtTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>49, 18</value>
+  </data>
+  <data name="&gt;&gt;ListTasks.Name" xml:space="preserve">
+    <value>ListTasks</value>
+  </data>
+  <data name="&gt;&gt;ListTasks.Parent" xml:space="preserve">
+    <value>GrpTasks</value>
+  </data>
+  <data name="GrpTasks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
--- a/Source/GrasscutterTools/Pages/PageTasks.ru-RU.resx
+++ b/Source/GrasscutterTools/Pages/PageTasks.ru-RU.resx
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GrpTasks.Text" xml:space="preserve">
+    <value>Список задач</value>
+  </data>
+  <data name="ColTag.Text" xml:space="preserve">
+    <value>Метка</value>
+  </data>
+  <data name="ColContent.Text" xml:space="preserve">
+    <value>Содержание</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ColContent.Width" type="System.Int32, mscorlib">
+    <value>310</value>
+  </data>
+  <data name="ColDelay.Text" xml:space="preserve">
+    <value>Задержка</value>
+  </data>
+  <data name="ColDelay.Width" type="System.Int32, mscorlib">
+    <value>80</value>
+  </data>
+  <data name="ColCount.Text" xml:space="preserve">
+    <value>Время</value>
+  </data>
+  <data name="GrpTask.Text" xml:space="preserve">
+    <value>Задача</value>
+  </data>
+  <data name="BtnRemove.Text" xml:space="preserve">
+    <value>× Удалить</value>
+  </data>
+  <data name="BtnAccept.Text" xml:space="preserve">
+    <value>√ Принять</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="LblTriggerCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>328, 22</value>
+  </data>
+  <data name="LblTriggerCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>47, 17</value>
+  </data>
+  <data name="LblTriggerCount.Text" xml:space="preserve">
+    <value>Время</value>
+  </data>
+  <data name="LblDelay.Location" type="System.Drawing.Point, System.Drawing">
+    <value>195, 22</value>
+  </data>
+  <data name="LblDelay.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 17</value>
+  </data>
+  <data name="LblDelay.Text" xml:space="preserve">
+    <value>Задержка</value>
+  </data>
+  <data name="TxtTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>63, 18</value>
+  </data>
+  <data name="TxtTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>130, 23</value>
+  </data>
+  <data name="LblTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 17</value>
+  </data>
+  <data name="LblTag.Text" xml:space="preserve">
+    <value>Метка</value>
+  </data>
+</root>
--- a/Source/GrasscutterTools/Pages/PageTasks.zh-TW.resx
+++ b/Source/GrasscutterTools/Pages/PageTasks.zh-TW.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GrpTasks.Text" xml:space="preserve">
+    <value>任務列表</value>
+  </data>
+  <data name="ColTag.Text" xml:space="preserve">
+    <value>標籤</value>
+  </data>
+  <data name="ColContent.Text" xml:space="preserve">
+    <value>內容</value>
+  </data>
+  <data name="ColDelay.Text" xml:space="preserve">
+    <value>延遲</value>
+  </data>
+  <data name="ColCount.Text" xml:space="preserve">
+    <value>次數</value>
+  </data>
+  <data name="GrpTask.Text" xml:space="preserve">
+    <value>任務</value>
+  </data>
+  <data name="BtnRemove.Text" xml:space="preserve">
+    <value>× 刪除</value>
+  </data>
+  <data name="BtnAccept.Text" xml:space="preserve">
+    <value>√ 確定</value>
+  </data>
+  <data name="LblTriggerCount.Text" xml:space="preserve">
+    <value>次數</value>
+  </data>
+  <data name="LblDelay.Text" xml:space="preserve">
+    <value>延遲</value>
+  </data>
+  <data name="LblTag.Text" xml:space="preserve">
+    <value>標籤</value>
+  </data>
+</root>
--- a/Source/GrasscutterTools/Pages/PageTools.Designer.cs
+++ b/Source/GrasscutterTools/Pages/PageTools.Designer.cs
@@ -0,0 +1,58 @@
+namespace GrasscutterTools.Pages
+{
+    partial class PageTools
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.BtnUpdateResources = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // BtnUpdateResources
+            // 
+            this.BtnUpdateResources.Location = new System.Drawing.Point(3, 3);
+            this.BtnUpdateResources.Name = "BtnUpdateResources";
+            this.BtnUpdateResources.Size = new System.Drawing.Size(100, 30);
+            this.BtnUpdateResources.TabIndex = 0;
+            this.BtnUpdateResources.Text = "Update res";
+            this.BtnUpdateResources.UseVisualStyleBackColor = true;
+            this.BtnUpdateResources.Click += new System.EventHandler(this.BtnUpdateResources_Click);
+            // 
+            // PageTools
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.BtnUpdateResources);
+            this.Name = "PageTools";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button BtnUpdateResources;
+    }
+}
--- a/Source/GrasscutterTools/Pages/PageTools.cs
+++ b/Source/GrasscutterTools/Pages/PageTools.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+
+namespace GrasscutterTools.Pages
+{
+    internal partial class PageTools : BasePage
+    {
+        public PageTools()
+        {
+            InitializeComponent();
+        }
+
+        private void BtnUpdateResources_Click(object sender, EventArgs e)
+        {
+            var src = new OpenFileDialog
+            {
+                Title = "请选择当前原文件",
+                Multiselect = false,
+            };
+            var dest = new OpenFileDialog
+            {
+                Title = "请选择包含新ID的文件",
+                Multiselect = false,
+            };
+
+            if (src.ShowDialog() == DialogResult.OK && dest.ShowDialog() == DialogResult.OK)
+            {
+                var srcLines = File.ReadAllLines(src.FileName);
+                var srcDic = new Dictionary<string, string>(srcLines.Length);
+                foreach (var line in srcLines)
+                {
+                    var sp = line.IndexOf(':');
+                    if (sp > 0)
+                    {
+                        var value = line.Substring(sp + 1).Trim();
+                        if (!value.StartsWith("[N/A]"))
+                            srcDic[line.Substring(0, sp).Trim()] = line.Substring(sp + 1).Trim();
+                    }
+                }
+
+                var destLines = File.ReadAllLines(dest.FileName);
+                using (var outStream = File.Create(dest.FileName))
+                using (var outTxtStream = new StreamWriter(outStream))
+                {
+                    foreach (var line in destLines)
+                    {
+                        var sp = line.IndexOf(':');
+                        if (sp == -1)
+                        {
+                            outTxtStream.WriteLine(line);
+                        }
+                        else
+                        {
+                            var key = line.Substring(0, sp).Trim();
+                            if (!srcDic.TryGetValue(key, out var value))
+                                value = line.Substring(sp + 1).Trim();
+                            outTxtStream.WriteLine($"{key}:{value}");
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/Source/GrasscutterTools/Pages/PageTools.resx
+++ b/Source/GrasscutterTools/Pages/PageTools.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Source/GrasscutterTools/Properties/AssemblyInfo.cs
+++ b/Source/GrasscutterTools/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.6")]
-[assembly: AssemblyFileVersion("1.7.6")]
+[assembly: AssemblyVersion("1.8.0")]
+[assembly: AssemblyFileVersion("1.8.0")]
--- a/Source/GrasscutterTools/Properties/Resources.Designer.cs
+++ b/Source/GrasscutterTools/Properties/Resources.Designer.cs
@@ -60,6 +60,15 @@ namespace GrasscutterTools.Properties {
            }
        }
        
+        /// <summary>
+        ///   查找类似 全部 的本地化字符串。
+        /// </summary>
+        internal static string All {
+            get {
+                return ResourceManager.GetString("All", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 20412:迷误者之灯
        ///20413:迷误者之灯
@@ -820,10 +829,12 @@ namespace GrasscutterTools.Properties {
        }
        
        /// <summary>
-        ///   查找类似 101:角色经验
+        ///   查找类似 // Items
+        ///
+        ///
+        ///// ITEM_VIRTUAL
+        ///101:角色经验
        ///102:冒险阅历
-        ///103:星尘
-        ///104:星辉
        ///105:好感经验
        ///106:原粹树脂
        ///107:传说钥匙
@@ -865,12 +876,10 @@ namespace GrasscutterTools.Properties {
        ///143:巧思手记
        ///144:随想草稿
        ///145:古铁钱
+        ///146:牌手经验
        ///147:节庆热度
        ///148:营业收入
-        ///149:可用资金
-        ///150:巧策灵感
-        ///151:蘑菇宝钱
-        ///1 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///149:可用 [字符串的其余部分被截断]&quot;; 的本地化字符串。
        /// </summary>
        internal static string Item {
            get {
@@ -1176,6 +1185,15 @@ namespace GrasscutterTools.Properties {
            }
        }
        
+        /// <summary>
+        ///   查找类似 任务已经启动，无法操作 的本地化字符串。
+        /// </summary>
+        internal static string TaskRunningCannotOperated {
+            get {
+                return ResourceManager.GetString("TaskRunningCannotOperated", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 提示 的本地化字符串。
        /// </summary>
@@ -1250,13 +1268,12 @@ namespace GrasscutterTools.Properties {
        ///11419:「一心传」名刀
        ///11420:「一心传」名刀
        ///11421:「一心传」名刀
+        ///11422:东花坊时雨
        ///11501:风鹰剑
        ///11502:天空之刃
        ///11503:苍古自由之誓
        ///11504:斫峰之刃
        ///11505:磐岩结绿
-        ///11506:磐岩结绿
-        ///11507:凭虚
        ///11509:雾切之回光
        ///11510:波乱月白经津
        ///11511:圣显之钥
@@ -1264,7 +1281,8 @@ namespace GrasscutterTools.Properties {
        ///12201:佣兵重剑
        ///12301:铁影阔剑
        ///12302:沐浴龙血的剑
-        ///12303 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///12303:白铁大剑
+        ///12 [字符串的其余部分被截断]&quot;; 的本地化字符串。
        /// </summary>
        internal static string Weapon {
            get {
--- a/Source/GrasscutterTools/Properties/Resources.en-us.resx
+++ b/Source/GrasscutterTools/Properties/Resources.en-us.resx
@@ -291,4 +291,10 @@ Improvement suggestions have been submitted, please use caution to send emails t
  <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\en-us\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
+  <data name="All" xml:space="preserve">
+    <value>All</value>
+  </data>
+  <data name="TaskRunningCannotOperated" xml:space="preserve">
+    <value>The task has already started and cannot be operated</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Properties/Resources.resx
+++ b/Source/GrasscutterTools/Properties/Resources.resx
@@ -303,4 +303,10 @@
  <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zh-cn\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
+  <data name="All" xml:space="preserve">
+    <value>全部</value>
+  </data>
+  <data name="TaskRunningCannotOperated" xml:space="preserve">
+    <value>任务已经启动，无法操作</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Properties/Resources.ru-ru.resx
+++ b/Source/GrasscutterTools/Properties/Resources.ru-ru.resx
@@ -279,4 +279,10 @@
  <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ru-ru\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
+  <data name="All" xml:space="preserve">
+    <value>Все</value>
+  </data>
+  <data name="TaskRunningCannotOperated" xml:space="preserve">
+    <value>Задача уже запущена и не может быть выполнена</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Properties/Resources.zh-TW.resx
+++ b/Source/GrasscutterTools/Properties/Resources.zh-TW.resx
@@ -285,4 +285,10 @@
  <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zh-tw\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
+  <data name="All" xml:space="preserve">
+    <value>全部</value>
+  </data>
+  <data name="TaskRunningCannotOperated" xml:space="preserve">
+    <value>任務已經啟動，無法操作</value>
+  </data>
 </root>
--- a/Source/GrasscutterTools/Resources/AvatarColor.txt
+++ b/Source/GrasscutterTools/Resources/AvatarColor.txt
@@ -58,4 +58,8 @@
 1071:5
 1072:4
 1073:5
-1074:4
+1074:4
+1075:5
+1076:4
+1077:4
+1078:5
--- a/Source/GrasscutterTools/Resources/MyTools.java
+++ b/Source/GrasscutterTools/Resources/MyTools.java
@@ -0,0 +1,420 @@
+package emu.grasscutter.tools;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.command.CommandMap;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.ResourceLoader;
+import emu.grasscutter.data.excels.AvatarData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.inventory.MaterialType;
+import emu.grasscutter.game.props.MonsterType;
+import emu.grasscutter.utils.Language;
+import emu.grasscutter.utils.Language.TextStrings;
+import emu.grasscutter.utils.SparseSet;
+import it.unimi.dsi.fastutil.ints.Int2IntRBTreeMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
+import lombok.val;
+
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.Language.getTextMapKey;
+
+public final class Tools {
+    public static void createGmHandbooks() throws Exception {
+        val languages = Language.TextStrings.getLanguages();
+
+        ResourceLoader.loadAll();
+
+        SparseSet illegalWeaponIds = new SparseSet("""
+        10000-10008, 11411, 11506-11508, 12505, 12506, 12508, 12509,
+        13503, 13506, 14411, 14503, 14505, 14508, 15504-15506
+        """);
+
+        SparseSet illegalRelicIds = new SparseSet("""
+        20001, 23300-23340, 23383-23385, 78310-78554, 99310-99554
+        """);
+
+        SparseSet illegalItemIds = new SparseSet("""
+        3004-3022, 100086, 100087, 100100-101000, 101106-101110, 101306, 101500-104000,
+        105001, 105004, 106000-107000, 107011, 108000, 109000-110000,
+        115000-130000, 200200-200899, 220050, 220054
+        """);
+
+
+        val mainQuestTitles = new Int2IntRBTreeMap(GameData.getMainQuestDataMap().int2ObjectEntrySet().stream().collect(Collectors.toMap(e -> (int) e.getIntKey(), e -> (int) e.getValue().getTitleTextMapHash())));
+        // val questDescs = new Int2IntRBTreeMap(GameData.getQuestDataMap().int2ObjectEntrySet().stream().collect(Collectors.toMap(e -> (int) e.getIntKey(), e -> (int) e.getValue().getDescTextMapHash())));
+
+        val avatarDataMap = new Int2ObjectRBTreeMap<>(GameData.getAvatarDataMap());
+        val itemDataMap = new Int2ObjectRBTreeMap<>(GameData.getItemDataMap());
+        val monsterDataMap = new Int2ObjectRBTreeMap<>(GameData.getMonsterDataMap());
+        val sceneDataMap = new Int2ObjectRBTreeMap<>(GameData.getSceneDataMap());
+        val questDataMap = new Int2ObjectRBTreeMap<>(GameData.getQuestDataMap());
+
+        // Create builders and helper functions
+        val handbookBuilders = IntStream.range(0, TextStrings.NUM_LANGUAGES).mapToObj(i -> new StringBuilder()).toList();
+        var h = new Object() {
+            void newLine(String line) {
+                handbookBuilders.forEach(b -> b.append(line + "\n"));
+            }
+            void newSection(String title) {
+                newLine("\n\n// " + title);
+            }
+            void newTranslatedLine(String template, TextStrings... textstrings) {
+                for (int i = 0; i < TextStrings.NUM_LANGUAGES; i++) {
+                    String s = template;
+                    for (int j = 0; j < textstrings.length; j++)
+                        s = s.replace("{"+j+"}", textstrings[j].strings[i]);
+                    handbookBuilders.get(i).append(s + "\n");
+                }
+            }
+            void newTranslatedLine(String template, long... hashes) {
+                newTranslatedLine(template, LongStream.of(hashes).mapToObj(hash -> getTextMapKey(hash)).toArray(TextStrings[]::new));
+            }
+        };
+
+        // Preamble
+        h.newLine("// Grasscutter " + GameConstants.VERSION + " GM Handbook");
+        h.newLine("// Created " + DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss").format(LocalDateTime.now()));
+
+        // Commands
+        h.newSection("Commands");
+        final List<CommandHandler> cmdList = CommandMap.getInstance().getHandlersAsList();
+        final String padCmdLabel = "%s:";
+        for (CommandHandler cmd : cmdList) {
+            final String label = padCmdLabel.formatted(cmd.getLabel());
+            final String descKey = cmd.getDescriptionKey();
+            for (int i = 0; i < TextStrings.NUM_LANGUAGES; i++) {
+                String desc = languages.get(i).get(descKey).replace("\n", "\n\t");
+                handbookBuilders.get(i).append(label + desc + "\n");
+            }
+        }
+        // Avatars
+        h.newSection("Avatars");
+        for (val data : avatarDataMap.values()) {
+            if (data.getId() >= 10000002 && data.getId() < 11000000)
+                h.newTranslatedLine("%d:{0}".formatted(data.getId()), data.getNameTextMapHash());
+        }
+//        avatarDataMap.forEach((id, data) -> h.newTranslatedLine("%d:".formatted(id) + "{0}", data.getNameTextMapHash()));
+        // Items
+        h.newSection("Items");
+        Map<ItemType, List<ItemData>> items = new HashMap<>();
+        for (val type : ItemType.values()) {
+            items.put(type, new ArrayList<>());
+        }
+        for (val item : itemDataMap.values()) {
+            if (!illegalItemIds.contains(item.getId()))
+                items.get(item.getItemType()).add(item);
+        }
+        items.get(ItemType.ITEM_WEAPON).removeIf(data -> illegalWeaponIds.contains(data.getId()));
+        items.get(ItemType.ITEM_RELIQUARY).removeIf(data -> illegalRelicIds.contains(data.getId()));
+        for (val kv : items.entrySet()
+            .stream()
+            .filter(e -> e.getValue().size() > 0)
+            .sorted(Comparator.comparing(e -> e.getValue().get(0).getId()))
+            .toList()) {
+
+            if (kv.getValue().size() == 0)
+                continue;
+            h.newSection(kv.getKey().name());
+            if (kv.getKey() == ItemType.ITEM_MATERIAL) {
+                Map<MaterialType, List<ItemData>> materials = new HashMap<>();
+                for (val type : MaterialType.values()) {
+                    materials.put(type, new ArrayList<>());
+                }
+                for (val item : kv.getValue()) {
+                    materials.get(item.getMaterialType()).add(item);
+                }
+                for (val mkv : materials.entrySet()
+                    .stream()
+                    .filter(e -> e.getValue().size() > 0)
+                    .sorted(Comparator.comparing(e -> e.getValue()
+                        .stream()
+                        .mapToInt(ItemData::getId)
+                        .average()
+                        .orElse(0)))
+                    .toList()) {
+                    h.newSection(mkv.getKey().name());
+                    if (mkv.getKey() == MaterialType.MATERIAL_BGM) {
+                        for (val item : mkv.getValue()) {
+                            val bgmName = Optional.ofNullable(item.getItemUse())
+                                .map(u -> u.get(0))
+                                .map(u -> u.getUseParam())
+                                .filter(u -> u.length > 0)
+                                .map(u -> Integer.parseInt(u[0]))
+                                .map(bgmId -> GameData.getHomeWorldBgmDataMap().get(bgmId))
+                                .map(bgm -> bgm.getBgmNameTextMapHash())
+                                .map(hash -> getTextMapKey(hash));
+                            if (bgmName.isPresent()) {
+                                h.newTranslatedLine("%d:{0} - {1}".formatted(item.getId()), getTextMapKey(item.getNameTextMapHash()), bgmName.get());
+                                return;
+                            }  // Fall-through
+                            h.newTranslatedLine("%d:{0}".formatted(item.getId()), getTextMapKey(item.getNameTextMapHash()));
+                        }
+                    } else {
+                        for (val item : mkv.getValue()) {
+                            h.newTranslatedLine("%d:{0}".formatted(item.getId()), getTextMapKey(item.getNameTextMapHash()));
+                        }
+                    }
+                }
+            } else {
+                for (val item : kv.getValue()) {
+                    h.newTranslatedLine("%d:{0}".formatted(item.getId()), getTextMapKey(item.getNameTextMapHash()));
+                }
+            }
+        }
+
+//        h.newSection("WeaponColors");
+//        for (val data : items.get(ItemType.ITEM_WEAPON)) {
+//            val color = switch (data.getRankLevel()) {
+//                case 3 -> "blue";
+//                case 4 -> "purple";
+//                case 5 -> "yellow";
+//                default -> null;
+//            };
+//            if (color != null) {
+//                h.newLine("%d:%s".formatted(data.getId(), color));
+//            }
+//        }
+//
+//        h.newSection("AvatarColors");
+//        for (val data : avatarDataMap.values()) {
+//            if (data.getId() >= 10000002 && data.getId() < 11000000) {
+//                String color = switch (data.getQualityType()) {
+//                    case "QUALITY_PURPLE" -> "purple";
+//                    case "QUALITY_ORANGE" -> "yellow";
+//                    case "QUALITY_BLUE" -> "blue";
+//                    default -> "";
+//                };
+//                h.newLine("%d:%s".formatted(data.getId(), color));
+//            }
+//        }
+
+//        itemDataMap.forEach((id, data) -> {
+//            val name = getTextMapKey(data.getNameTextMapHash());
+//            switch (data.getMaterialType()) {
+//                case MATERIAL_BGM:
+//                    val bgmName = Optional.ofNullable(data.getItemUse())
+//                        .map(u -> u.get(0))
+//                        .map(u -> u.getUseParam())
+//                        .filter(u -> u.length > 0)
+//                        .map(u -> Integer.parseInt(u[0]))
+//                        .map(bgmId -> GameData.getHomeWorldBgmDataMap().get(bgmId))
+//                        .map(bgm -> bgm.getBgmNameTextMapHash())
+//                        .map(hash -> getTextMapKey(hash));
+//                    if (bgmName.isPresent()) {
+//                        h.newTranslatedLine("%d:".formatted(id) + "{0} - {1}", name, bgmName.get());
+//                        return;
+//                    }  // Fall-through
+//                default:
+//                    h.newTranslatedLine("%d:".formatted(id) + "{0}", name);
+//                    return;
+//            }
+//        });
+        // Monsters
+        h.newSection("Monsters");
+        val monsterTypes = MonsterType.values();
+        for (val type : monsterTypes) {
+            h.newSection(type.name());
+            for (val kv : monsterDataMap.int2ObjectEntrySet()) {
+                if (kv.getValue().getType() == type)
+                    h.newTranslatedLine(
+                        "%d:".formatted(kv.getIntKey()) + kv.getValue().getMonsterName() + " - {0}",
+                        kv.getValue().getNameTextMapHash());
+            }
+        }
+
+        // Scenes - no translations
+        h.newSection("Scenes");
+        sceneDataMap.forEach((id, data) -> h.newLine("%d:".formatted(id) + data.getScriptData()));
+        // Quests
+        h.newSection("Quests");
+        questDataMap.forEach((id, data) -> h.newTranslatedLine(
+            "%d:".formatted(id) + "{0} - {1}",
+            mainQuestTitles.get(data.getMainId()),
+            data.getDescTextMapHash()));
+
+        // Write txt files
+        for (int i = 0; i < TextStrings.NUM_LANGUAGES; i++) {
+            File GMHandbookOutputpath=new File("./GM Handbook");
+            GMHandbookOutputpath.mkdir();
+            final String fileName = "./GM Handbook/GM Handbook - %s.txt".formatted(TextStrings.ARR_LANGUAGES[i]);
+            try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName), StandardCharsets.UTF_8), false)) {
+                writer.write(handbookBuilders.get(i).toString());
+            }
+        }
+        Grasscutter.getLogger().info("GM Handbooks generated!");
+    }
+
+    public static List<String> createGachaMappingJsons() {
+        final int NUM_LANGUAGES = Language.TextStrings.NUM_LANGUAGES;
+        final Language.TextStrings CHARACTER = Language.getTextMapKey(4233146695L);  // "Character" in EN
+        final Language.TextStrings WEAPON = Language.getTextMapKey(4231343903L);  // "Weapon" in EN
+        final Language.TextStrings STANDARD_WISH = Language.getTextMapKey(332935371L);  // "Standard Wish" in EN
+        final Language.TextStrings CHARACTER_EVENT_WISH = Language.getTextMapKey(2272170627L);  // "Character Event Wish" in EN
+        final Language.TextStrings CHARACTER_EVENT_WISH_2 = Language.getTextMapKey(3352513147L);  // "Character Event Wish-2" in EN
+        final Language.TextStrings WEAPON_EVENT_WISH = Language.getTextMapKey(2864268523L);  // "Weapon Event Wish" in EN
+        final List<StringBuilder> sbs = new ArrayList<>(NUM_LANGUAGES);
+        for (int langIdx = 0; langIdx < NUM_LANGUAGES; langIdx++)
+            sbs.add(new StringBuilder("{\n"));  // Web requests should never need Windows line endings
+
+        // Avatars
+        GameData.getAvatarDataMap().keySet().intStream().sorted().forEach(id -> {
+            AvatarData data = GameData.getAvatarDataMap().get(id);
+            int avatarID = data.getId();
+            if (avatarID >= 11000000) { // skip test avatar
+                return;
+            }
+            String color = switch (data.getQualityType()) {
+                case "QUALITY_PURPLE" -> "purple";
+                case "QUALITY_ORANGE" -> "yellow";
+                case "QUALITY_BLUE" -> "blue";
+                default -> "";
+            };
+            Language.TextStrings avatarName = Language.getTextMapKey(data.getNameTextMapHash());
+            for (int langIdx = 0; langIdx < NUM_LANGUAGES; langIdx++) {
+                sbs.get(langIdx)
+                    .append("\t\"")
+                    .append(avatarID % 1000 + 1000)
+                    .append("\": [\"")
+                    .append(avatarName.get(langIdx))
+                    .append(" (")
+                    .append(CHARACTER.get(langIdx))
+                    .append(")\", \"")
+                    .append(color)
+                    .append("\"],\n");
+            }
+        });
+
+        // Weapons
+        GameData.getItemDataMap().keySet().intStream().sorted().forEach(id -> {
+            ItemData data = GameData.getItemDataMap().get(id);
+            if (data.getId() <= 11101 || data.getId() >= 20000) {
+                return; //skip non weapon items
+            }
+            String color = switch (data.getRankLevel()) {
+                case 3 -> "blue";
+                case 4 -> "purple";
+                case 5 -> "yellow";
+                default -> null;
+            };
+            if (color == null) return;  // skip unnecessary entries
+            Language.TextStrings weaponName = Language.getTextMapKey(data.getNameTextMapHash());
+            for (int langIdx = 0; langIdx < NUM_LANGUAGES; langIdx++) {
+                sbs.get(langIdx)
+                    .append("\t\"")
+                    .append(data.getId())
+                    .append("\": [\"")
+                    .append(weaponName.get(langIdx).replaceAll("\"", "\\\\\""))
+                    .append(" (")
+                    .append(WEAPON.get(langIdx))
+                    .append(")\", \"")
+                    .append(color)
+                    .append("\"],\n");
+            }
+        });
+
+        for (int langIdx = 0; langIdx < NUM_LANGUAGES; langIdx++) {
+            sbs.get(langIdx)
+                .append("\t\"200\": \"")
+                .append(STANDARD_WISH.get(langIdx))
+                .append("\",\n\t\"301\": \"")
+                .append(CHARACTER_EVENT_WISH.get(langIdx))
+                .append("\",\n\t\"400\": \"")
+                .append(CHARACTER_EVENT_WISH_2.get(langIdx))
+                .append("\",\n\t\"302\": \"")
+                .append(WEAPON_EVENT_WISH.get(langIdx))
+                .append("\"\n}");
+        }
+        return sbs.stream().map(StringBuilder::toString).toList();
+    }
+
+    public static void createGachaMappings(Path location) throws IOException {
+        ResourceLoader.loadResources();
+        List<String> jsons = createGachaMappingJsons();
+        var usedLocales = new HashSet<String>();
+        StringBuilder sb = new StringBuilder("mappings = {\n");
+        for (int i = 0; i < Language.TextStrings.NUM_LANGUAGES; i++) {
+            String locale = Language.TextStrings.ARR_GC_LANGUAGES[i].toLowerCase();  // TODO: change the templates to not use lowercased locale codes
+            if (usedLocales.add(locale)) {  // Some locales fallback to en-us, we don't want to redefine en-us with vietnamese strings
+                sb.append("\t\"%s\": ".formatted(locale));
+                sb.append(jsons.get(i).replace("\n", "\n\t") + ",\n");
+            }
+        }
+        sb.setLength(sb.length() - 2);  // Delete trailing ",\n"
+        sb.append("\n}");
+
+        Files.createDirectories(location.getParent());
+        Files.writeString(location, sb);
+        Grasscutter.getLogger().info("Mappings generated to " + location);
+    }
+
+    public static List<String> getAvailableLanguage() {
+        List<String> availableLangList = new ArrayList<>();
+        try {
+            Files.newDirectoryStream(getResourcePath("TextMap"), "TextMap*.json").forEach(path -> {
+                availableLangList.add(path.getFileName().toString().replace("TextMap", "").replace(".json", "").toLowerCase());
+            });
+        } catch (IOException e) {
+            Grasscutter.getLogger().error("Failed to get available languages:", e);
+        }
+        return availableLangList;
+    }
+
+    @Deprecated(forRemoval = true, since = "1.2.3")
+    public static String getLanguageOption() {
+        List<String> availableLangList = getAvailableLanguage();
+
+        // Use system out for better format
+        if (availableLangList.size() == 1) {
+            return availableLangList.get(0).toUpperCase();
+        }
+        StringBuilder stagedMessage = new StringBuilder();
+        stagedMessage.append("The following languages mappings are available, please select one: [default: EN] \n");
+
+        StringBuilder groupedLangList = new StringBuilder(">\t"); String input;
+        int groupedLangCount = 0;
+
+        for (String availableLanguage: availableLangList) {
+            groupedLangCount++;
+            groupedLangList.append(availableLanguage).append("\t");
+
+            if (groupedLangCount == 6) {
+                stagedMessage.append(groupedLangList).append("\n");
+                groupedLangCount = 0;
+                groupedLangList = new StringBuilder(">\t");
+            }
+        }
+
+        if (groupedLangCount > 0) {
+            stagedMessage.append(groupedLangList).append("\n");
+        }
+
+        stagedMessage.append("\nYour choice: [EN] ");
+
+        input = Grasscutter.getConsole().readLine(stagedMessage.toString());
+        if (availableLangList.contains(input.toLowerCase())) {
+            return input.toUpperCase();
+        }
+
+        Grasscutter.getLogger().info("Invalid option. Will use EN (English) as fallback."); return "EN";
+    }
+}
--- a/Source/GrasscutterTools/Resources/WeaponColor.txt
+++ b/Source/GrasscutterTools/Resources/WeaponColor.txt
@@ -14,21 +14,25 @@
 11408:purple
 11409:purple
 11410:purple
-11411:purple
 11412:purple
 11413:purple
 11414:purple
 11415:purple
+11416:purple
+11417:purple
+11418:purple
+11419:purple
+11420:purple
+11421:purple
+11422:purple
 11501:yellow
 11502:yellow
 11503:yellow
 11504:yellow
 11505:yellow
-11506:yellow
-11507:yellow
-11508:yellow
 11509:yellow
 11510:yellow
+11511:yellow
 12301:blue
 12302:blue
 12303:blue
@@ -48,15 +52,13 @@
 12411:purple
 12412:purple
 12414:purple
+12415:purple
 12416:purple
+12417:purple
 12501:yellow
 12502:yellow
 12503:yellow
 12504:yellow
-12505:yellow
-12506:yellow
-12508:yellow
-12509:yellow
 12510:yellow
 13301:blue
 13302:blue
@@ -74,14 +76,15 @@
 13414:purple
 13415:purple
 13416:purple
+13417:purple
+13419:purple
 13501:yellow
 13502:yellow
-13503:yellow
 13504:yellow
 13505:yellow
-13506:yellow
 13507:yellow
 13509:yellow
+13511:yellow
 14301:blue
 14302:blue
 14303:blue
@@ -98,19 +101,19 @@
 14408:purple
 14409:purple
 14410:purple
-14411:purple
 14412:purple
 14413:purple
 14414:purple
 14415:purple
+14416:purple
+14417:purple
 14501:yellow
 14502:yellow
-14503:yellow
 14504:yellow
-14505:yellow
 14506:yellow
-14508:yellow
 14509:yellow
+14511:yellow
+14512:yellow
 15301:blue
 15302:blue
 15303:blue
@@ -133,13 +136,13 @@
 15414:purple
 15415:purple
 15416:purple
+15417:purple
+15418:purple
 15501:yellow
 15502:yellow
 15503:yellow
-15504:yellow
-15505:yellow
-15506:yellow
 15507:yellow
 15508:yellow
 15509:yellow
-15511:yellow
+15511:yellow
+20001:yellow
--- a/Source/GrasscutterTools/Resources/en-us/Artifact.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Artifact.txt
@@ -38,6 +38,46 @@
 21544:Dreaming Steelbloom
 21553:The Sunken Years
 21554:The Sunken Years
+27412:Defender of the Enchanting Dream
+27413:Defender of the Enchanting Dream
+27422:End of the Golden Realm
+27423:End of the Golden Realm
+27432:Legacy of the Desert High-Born
+27433:Legacy of the Desert High-Born
+27442:The First Days of the City of Kings
+27443:The First Days of the City of Kings
+27452:Timepiece of the Lost Path
+27453:Timepiece of the Lost Path
+27513:Defender of the Enchanting Dream
+27514:Defender of the Enchanting Dream
+27523:End of the Golden Realm
+27524:End of the Golden Realm
+27533:Legacy of the Desert High-Born
+27534:Legacy of the Desert High-Born
+27543:The First Days of the City of Kings
+27544:The First Days of the City of Kings
+27553:Timepiece of the Lost Path
+27554:Timepiece of the Lost Path
+28412:Secret-Keeper's Magic Bottle
+28413:Secret-Keeper's Magic Bottle
+28422:Wilting Feast
+28423:Wilting Feast
+28432:Amethyst Crown
+28433:Amethyst Crown
+28442:Ay-Khanoum's Myriad
+28443:Ay-Khanoum's Myriad
+28452:A Moment Congealed
+28453:A Moment Congealed
+28513:Secret-Keeper's Magic Bottle
+28514:Secret-Keeper's Magic Bottle
+28523:Wilting Feast
+28524:Wilting Feast
+28533:Amethyst Crown
+28534:Amethyst Crown
+28543:Ay-Khanoum's Myriad
+28544:Ay-Khanoum's Myriad
+28553:A Moment Congealed
+28554:A Moment Congealed
 51110:Goblet of the Sojourner
 51111:Goblet of the Sojourner
 51112:Goblet of the Sojourner
--- a/Source/GrasscutterTools/Resources/en-us/ArtifactCat.txt
+++ b/Source/GrasscutterTools/Resources/en-us/ArtifactCat.txt
@@ -1,5 +1,7 @@
 20:Deepwood Memories
 21:Gilded Dreams
+27:Desert Pavilion Chronicle
+28:Flower of Paradise Lost
 51:Resolution of Sojourner
 52:Brave Heart
 53:Defender's Will
--- a/Source/GrasscutterTools/Resources/en-us/Avatar.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Avatar.txt
@@ -57,4 +57,8 @@
 1071:Cyno
 1072:Candace
 1073:Nahida
-1074:Layla
+1074:Layla
+1075:Wanderer
+1076:Faruzan
+1077:Yaoyao
+1078:Alhaitham
--- a/Source/GrasscutterTools/Resources/en-us/Item.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Item.txt
--- a/Source/GrasscutterTools/Resources/en-us/Monsters.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Monsters.txt
@@ -9,9 +9,11 @@
 20010403:Large Anemo Slime
 20010501:Electro Slime
 20010502:Electro Slime (Mechanicus)
+20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010601:Large Electro Slime
 20010602:Large Electro Slime (Mechanicus)
 20010604:Large Electro Slime
+20010605:Slime_Electric_03_SimpleStick - [N/A] 3051091649
 20010701:Mutant Electro Slime
 20010702:Mutant Electro Slime
 20010703:Mutant Electro Slime
@@ -22,6 +24,7 @@
 20010902:Large Cryo Slime
 20010903:Large Cryo Slime
 20010904:Large Cryo Slime
+20010905:Slime_Ice_03_SimpleStick - [N/A] 3152089697
 20011001:Hydro Slime
 20011002:Hydro Slime
 20011101:Large Hydro Slime
@@ -30,9 +33,11 @@
 20011201:Pyro Slime
 20011202:Pyro Slime
 20011203:Pyro Slime
+20011204:Slime_Fire_02_SimpleStick - [N/A] 1669508241
 20011301:Large Pyro Slime
 20011302:Large Pyro Slime
 20011304:Large Pyro Slime
+20011305:Slime_Fire_03_SimpleStick - [N/A] 771419505
 20011401:Geo Slime
 20011402:Geo Slime
 20011501:Large Geo Slime
@@ -42,6 +47,9 @@
 20011701:Hydro Hypostasis Summon: Split (S)
 20011801:Hydro Hypostasis Summon: Self-Destruct
 20011901:Hydro Hypostasis Summon: Heal
+20012001:Effigy_Water_Underling_Ooze_05 - [N/A] 3817659321
+20012101:Effigy_Water_Underling_Ooze_06 - [N/A] 2054683281
+20012201:Effigy_Water_Underling_Ooze_07 - [N/A] 716714657
 20020101:Eye of the Storm
 20050201:Oceanid Boar
 20050202:Oceanid Boar
@@ -68,7 +76,7 @@
 20060401:Cryo Specter
 20060501:Electro Specter
 20060601:Pyro Specter
-20060701:[N/A] 586909705
+20060701:Sylph_Grass_01 - [N/A] 586909705
 21010101:Hilichurl
 21010102:Hilichurl
 21010201:Hilichurl Fighter
@@ -153,10 +161,10 @@
 22010404:Electro Abyss Mage
 22020101:Abyss Herald: Wicked Torrents
 22020102:Abyss Herald: Wicked Torrents
-22020103:[N/A] 3179556369
+22020103:Invoker_Herald_Water_01 - [N/A] 3179556369
 22030101:Abyss Lector: Violet Lightning
 22030102:Abyss Lector: Violet Lightning
-22030103:[N/A] 577563505
+22030103:Invoker_Deacon_Electric_01 - [N/A] 577563505
 22030201:Abyss Lector: Fathomless Flames
 22030202:Abyss Lector: Fathomless Flames
 22040101:Rockfond Rifthound Whelp
@@ -171,6 +179,7 @@
 22070302:Shadowy Husk: Defender
 22080101:Black Serpent Knight: Windcutter
 22090101:Guess!
+22100101:Invoker_Archdeacon_01 - Hilichurl
 23010101:Fatui Skirmisher - Cryogunner Legionnaire
 23010201:Fatui Skirmisher - Hydrogunner Legionnaire
 23010301:Fatui Skirmisher - Electrohammer Vanguard
@@ -193,7 +202,7 @@
 24010301:Ruin Grader
 24010302:Ruin Grader
 24010303:Ruin Grader
-24010304:[N/A] 4152683505
+24010304:Konungmathr_None_WQ - [N/A] 4152683505
 24020101:Ruin Cruiser
 24020102:Ruin Cruiser
 24020103:Ruin Cruiser
@@ -203,15 +212,15 @@
 24020301:Ruin Defender
 24020302:Ruin Defender
 24020303:Ruin Defender
-24020304:[N/A] 3323395121
+24020304:Apparatus_Enigma_BionicInsecta_Karkata - [N/A] 3323395121
 24020401:Ruin Scout
 24020402:Ruin Scout
 24020403:Ruin Scout
-24030101:[N/A] 765448937
-24030201:[N/A] 3903929633
-24040101:[N/A] 1462919497
-24040201:[N/A] 285953129
-24040301:[N/A] 3626535649
+24030101:Gargoyle_Airborne_01 - [N/A] 765448937
+24030201:Gargoyle_Ground_01 - [N/A] 3903929633
+24040101:Monolith_Ordinator_01 - [N/A] 1462919497
+24040201:Monolith_Ordinator_02 - [N/A] 285953129
+24040301:Monolith_Ordinator_03 - [N/A] 3626535649
 25010101:Liuliu
 25010102:Mystery Man
 25010103:Treasure Hoarders: Liuliu
@@ -225,9 +234,9 @@
 25010206:Treasure Hoarders: Scout
 25010207:Treasure Hoarders: Scout
 25010208:Treasure Hoarders: Scout
-25010209:[N/A] 1167900689
-25010210:[N/A] 4032173065
-25010211:[N/A] 392055353
+25010209:Thoarder_Male_Standard_NoWeapon_02_09 - [N/A] 1167900689
+25010210:Thoarder_Male_Standard_NoWeapon_02_10 - [N/A] 4032173065
+25010211:Thoarder_Male_Standard_NoWeapon_02_11 - [N/A] 392055353
 25010301:Treasure Hoarders: Pyro Potioneer
 25010302:Treasure Hoarders: Pyro Potioneer
 25010401:Treasure Hoarders: Hydro Potioneer
@@ -253,6 +262,7 @@
 25050402:Shogunate Infantry Captain
 25050501:Sangonomiya Cohort
 25050502:Sangonomiya Cohort
+25050503:Ahigaru_Male_03 - [FR] - (test)心海个人线反抗军足轻
 25060101:Treasure Hoarders: Pugilist
 25060102:Treasure Hoarders: Pugilist
 25070101:Treasure Hoarders: Crusher
@@ -264,59 +274,73 @@
 25080301:Nobushi: Kikouban
 25080401:Yoriki Samurai
 25080402:Yoriki Samurai
-25080403:[N/A] 1581579825
-25080404:[N/A] 400320561
+25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
+25080404:Samurai_Hatamoto_03 - [N/A] 400320561
+25080405:Samurai_Hatamoto_04 - [N/A] 400320561
 25100101:Kairagi: Dancing Thunder
 25100102:Kairagi: Dancing Thunder
 25100201:Kairagi: Fiery Might
+25100202:Samurai_Kairagi_07 - Pyro Kairagi
 25100301:Ochimusha: Ensorcelled Thunder
 25100302:Ochimusha: Ensorcelled Thunder
 25100401:Ochimusha: Cankered Flame
-25110101:[N/A] 1820584137
-25110102:[N/A] 2361510321
-25110201:[N/A] 3397827697
-25110202:[N/A] 1458817257
-25210101:[N/A] 593962337
-25210102:[N/A] 655804089
-25210103:[N/A] 3189818729
-25210104:[N/A] 2655106977
-25210105:[N/A] 2175825297
-25210106:[N/A] 660925665
-25210107:[N/A] 2260729353
-25210201:[N/A] 1998919569
-25210202:[N/A] 2119181617
-25210203:[N/A] 3425185161
-25210204:[N/A] 3201394457
-25210205:[N/A] 3735395833
-25210206:[N/A] 1444996537
-25210207:[N/A] 1636753185
-25210301:[N/A] 4008986473
-25210302:[N/A] 2939413633
-25210303:[N/A] 2517557169
-25210304:[N/A] 3890286705
-25210305:[N/A] 1664946217
-25210306:[N/A] 696066441
-25210307:[N/A] 2671081977
-25210401:[N/A] 998410809
-25210402:[N/A] 839477089
-25210403:[N/A] 2628038825
-25210404:[N/A] 509218169
-25210405:[N/A] 4366953
-25210406:[N/A] 1385944497
-25210501:[N/A] 914092905
-25210502:[N/A] 3484979137
-25210503:[N/A] 2747515289
-25210504:[N/A] 1621612097
-25210505:[N/A] 4251715865
-25210506:[N/A] 124112617
-25210601:[N/A] 3480498409
-25210602:[N/A] 1531750897
-25310101:[N/A] 2984077569
-25310201:[N/A] 3154173257
-25310202:[N/A] 3503187145
-25310301:[N/A] 863506833
-25410101:[N/A] 1317576089
-25410201:[N/A] 1223193297
+25110101:Gator_Eremite_Rock_01 - [N/A] 1820584137
+25110102:Gator_Eremite_Rock_02 - [N/A] 2361510321
+25110201:Vulture_Eremite_Wind_01 - [N/A] 3397827697
+25110202:Vulture_Eremite_Wind_02 - [N/A] 1458817257
+25110301:Scorpion_Eremite_Fire_01 - [N/A] 1458817257
+25110401:Chrysopelea_Eremite_Grass_01 - [N/A] 1458817257
+25210101:Eremite_Female_Hatchet_01 - [N/A] 593962337
+25210102:Eremite_Female_Hatchet_02 - [N/A] 655804089
+25210103:Eremite_Female_Hatchet_03 - [N/A] 3189818729
+25210104:EremiteElite_Female_Hatchet_01 - [N/A] 2655106977
+25210105:EremiteElite_Female_Hatchet_02 - [N/A] 2175825297
+25210106:EremiteElite_Female_Hatchet_03 - [N/A] 660925665
+25210107:Eremite_Female_Hatchet_04 - [N/A] 2260729353
+25210108:Eremite_Female_Hatchet_05 - [N/A] 1446861633
+25210201:Eremite_Male_Standard_Crossbow_01 - [N/A] 1998919569
+25210202:Eremite_Male_Standard_Crossbow_02 - [N/A] 2119181617
+25210203:Eremite_Male_Standard_Crossbow_03 - [N/A] 3425185161
+25210204:EremiteElite_Male_Standard_Crossbow_01 - [N/A] 3201394457
+25210205:EremiteElite_Male_Standard_Crossbow_02 - [N/A] 3735395833
+25210206:EremiteElite_Male_Standard_Crossbow_03 - [N/A] 1444996537
+25210207:Eremite_Male_Standard_Crossbow_04 - [N/A] 1636753185
+25210208:NPC_Quest_Male_Standard_Eremite_01 - [N/A] 2050456833
+25210209:NPC_Quest_Male_Standard_Eremite_02 - [N/A] 3171996801
+25210301:Eremite_Male_Standard_Pole_01 - [N/A] 4008986473
+25210302:Eremite_Male_Standard_Pole_02 - [N/A] 2939413633
+25210303:Eremite_Male_Standard_Pole_03 - [N/A] 2517557169
+25210304:EremiteElite_Male_Standard_Pole_01 - [N/A] 3890286705
+25210305:EremiteElite_Male_Standard_Pole_02 - [N/A] 1664946217
+25210306:EremiteElite_Male_Standard_Pole_03 - [N/A] 696066441
+25210307:Eremite_Male_Standard_Pole_01 - [N/A] 2671081977
+25210401:Eremite_MuscleMan_Gloves_01 - [N/A] 998410809
+25210402:Eremite_MuscleMan_Gloves_02 - [N/A] 839477089
+25210403:Eremite_MuscleMan_Gloves_03 - [N/A] 2628038825
+25210404:EremiteElite_MuscleMan_Gloves_01 - [N/A] 509218169
+25210405:EremiteElite_MuscleMan_Gloves_02 - [N/A] 4366953
+25210406:EremiteElite_MuscleMan_Gloves_03 - [N/A] 1385944497
+25210407:NPC_Quest_MuscleMan_Standard_Eremite_01 - [N/A] 3844535385
+25210501:Eremite_MuscleMan_Simitar_01 - [N/A] 914092905
+25210502:Eremite_MuscleMan_Simitar_02 - [N/A] 3484979137
+25210503:Eremite_MuscleMan_Simitar_03 - [N/A] 2747515289
+25210504:EremiteElite_MuscleMan_Simitar_01 - [N/A] 1621612097
+25210505:EremiteElite_MuscleMan_Simitar_02 - [N/A] 4251715865
+25210506:EremiteElite_MuscleMan_Simitar_03 - [N/A] 124112617
+25210507:Eremite_MuscleMan_Simitar_04 - [N/A] 1714026825
+25210601:Eremite_Male_Standard_NoWeapon_01 - [N/A] 3480498409
+25210602:Eremite_Male_Standard_NoWeapon_02 - [N/A] 1531750897
+25310101:Eremite_Female_Slim_PushDagger_01 - [N/A] 2984077569
+25310201:Eremite_Male_Standard_Glaive_01 - [N/A] 3154173257
+25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
+25310301:Eremite_Male_Standard_Polearm_01 - [N/A] 863506833
+25410101:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410102:Eremite_Male_Strong_Katar_02 - [N/A] 1317576089
+25410103:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410201:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410202:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410301:Eremite_Female_Standard_Oracle_01 - [N/A] 1223193297
+25410401:Monster_Eremite_Female_Standard_Dancer_01 - [N/A] 1223193297
 26010101:Cryo Whopperflower
 26010102:Cryo Whopperflower
 26010201:Pyro Whopperflower
@@ -335,28 +359,51 @@
 26060201:Hydro Cicin
 26060301:Cryo Cicin
 26090101:Floating Hydro Fungus
-26090201:[N/A] 4206793049
-26090202:[N/A] 3825581857
-26090301:[N/A] 243798441
-26090401:[N/A] 2774139065
-26090501:[N/A] 1181717657
-26090601:[N/A] 4148148753
-26090701:[N/A] 2130513233
-26090801:[N/A] 554072617
-26090901:[N/A] 2734459225
-26091001:[N/A] 1409125529
-26120101:[N/A] 198051785
-26120201:[N/A] 2368019041
-26120301:[N/A] 3299184601
-26120401:[N/A] 4098645257
+26090190:Fungus_Un_Gamma_Water_Enemy - [N/A] 2798916145
+26090191:Fungus_Un_Gamma_Water_01_Capture - [N/A] 4229105793
+26090201:Fungus_Un_Delta_Grass_01 - [N/A] 4206793049
+26090202:Fungus_Un_Delta_Grass_01_02 - [N/A] 3825581857
+26090290:Fungus_Un_Delta_Grass_Enemy - [N/A] 2834173953
+26090291:Fungus_Un_Delta_Grass_01_Capture - [N/A] 3005241825
+26090301:Fungus_Un_Delta_Wind_01 - [N/A] 243798441
+26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
+26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090401:Fungus_Trois_Epsilon_Electric_01 - [N/A] 2774139065
+26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
+26090491:Fungus_Trois_Epsilon_Electric_01_Capture - [N/A] 3709881913
+26090501:Fungus_Trois_Alpha_Ice_01 - [N/A] 1181717657
+26090590:Fungus_Trois_Alpha_Ice_Enemy - [N/A] 4208292977
+26090591:Fungus_Trois_Alpha_Ice_01_Capture - [N/A] 1798960849
+26090601:Fungus_Trois_Gamma_Fire_01 - [N/A] 4148148753
+26090690:Fungus_Trois_Gamma_Fire_Enemy - [N/A] 4223971953
+26090691:Fungus_Trois_Gamma_Fire_01_Capture - [N/A] 3680085465
+26090701:Fungus_Deux_Alpha_Fire_01 - [N/A] 2130513233
+26090790:Fungus_Deux_Alpha_Fire_Enemy - [N/A] 1078684105
+26090791:Fungus_Deux_Alpha_Fire_01_Capture - [N/A] 2097382481
+26090801:Fungus_Deux_Epsilon_Wind_01 - [N/A] 554072617
+26090890:Fungus_Deux_Epsilon_Wind_Enemy - [N/A] 466604457
+26090891:Fungus_Deux_Epsilon_Wind_01_Capture - [N/A] 3913813441
+26090901:Fungus_Deux_Beta_Rock_01 - [N/A] 2734459225
+26090990:Fungus_Deux_Beta_Rock_Enemy - [N/A] 287229801
+26090991:Fungus_Deux_Beta_Rock_01_Capture - [N/A] 4221967233
+26091001:Fungus_Deux_Delta_Electric_01 - [N/A] 1409125529
+26091090:Fungus_Deux_Delta_Electric_Enemy - [N/A] 2977465545
+26091091:Fungus_Deux_Delta_Electric_01_Capture - [N/A] 2399196673
+26100301:Monster_Vulture_Sacred_Fire_01 - [N/A] 2399196673
+26100401:Monster_Scorpion_Sacred_Electric_01 - [N/A] 2399196673
+26100501:Monster_Chrysopelea_Sacred_Wind_01 - [N/A] 2399196673
+26120101:Fungus_Amanita_Unu_Anudatta_Grass_01 - [N/A] 198051785
+26120201:Fungus_Amanita_Unu_Svarita_Ices_01 - [N/A] 2368019041
+26120301:Fungus_Amanita_Du_Anudatta_Water_01 - [N/A] 3299184601
+26120401:Fungus_Amanita_Du_Udatta_Rock_01 - [N/A] 4098645257
 28020101:Snow Fox
 28020102:Crimson Fox
 28020103:Gifting Snow Fox
 28020104:Super-Gifting Snow Fox
 28020105:Snow Fox
 28020106:Crimson Fox
-28020107:[N/A] 378885401
-28020108:[N/A] 2121972905
+28020107:Fox_02 - [N/A] 378885401
+28020108:Fox_01_03 - [N/A] 2121972905
 28020201:Squirrel
 28020301:Forest Boar
 28020302:Forest Piglet
@@ -367,12 +414,12 @@
 28020307:Forest Boar
 28020308:Frozen Snowboar
 28020309:Great Snowboar King
-28020310:[N/A] 1922000329
-28020311:[N/A] 3804855321
-28020312:[N/A] 1052664969
-28020313:[N/A] 2391061289
-28020314:[N/A] 2761000073
-28020315:[N/A] 977650529
+28020310:Boar_02_Hunt - [N/A] 1922000329
+28020311:Boar_01_Hunt - [N/A] 3804855321
+28020312:Boar_03_Hunt - [N/A] 1052664969
+28020313:Boar_Grass - [N/A] 2391061289
+28020314:Boar_Grass_Small - [N/A] 2761000073
+28020315:Boar_09 - [N/A] 977650529
 28020401:Northland Hound
 28020402:Forest-Patrol Hound
 28020403:Shiba
@@ -409,10 +456,11 @@
 28020901:Samurai Dog Diversion (test)
 28020902:Samurai dog boss (test)
 28020903:Taroumaru
+28020904:Inu_Shihandai_04 - [N/A] 467002241
 28030101:Azure Crane
 28030102:Violet Ibis
-28030103:[N/A] 434877481
-28030104:[N/A] 3431473329
+28030103:Crane_01 - [N/A] 434877481
+28030104:Crane_01_Lbis - [N/A] 3431473329
 28030201:Brownwing Falcon
 28030202:Umbertail Falcon
 28030203:Lapis Glede
@@ -428,8 +476,9 @@
 28030309:Graywing Pigeon
 28030310:Crimsonflank Pigeon
 28030311:Black King Pigeon
-28030312:[N/A] 1045054721
-28030313:[N/A] 45487625
+28030312:Pigeon_01 - [N/A] 1045054721
+28030313:Pigeon_Beak_01 - [N/A] 45487625
+28030314:Crow_01 - [N/A] 3254419441
 28030401:Crimson Finch
 28030402:Golden Finch
 28030403:Snow Finch
@@ -443,7 +492,7 @@
 28030502:Emerald Duck
 28030503:Golden Duck
 28030504:Scarletbeak Duck
-28030505:[N/A] 3375863305
+28030505:Wigeon_01 - [N/A] 3375863305
 28040703:Floating Ray
 28050201:Amateur Weasel Thief
 28050202:Hoarder Weasel Thief
@@ -455,49 +504,49 @@
 28050221:Amateur Weasel Thief
 28050222:Hoarder Weasel Thief
 28050223:Golden Weasel Thief
-28060101:[N/A] 128716817
-28060102:[N/A] 2866718929
-28060103:[N/A] 1328271489
-28060201:[N/A] 2538068521
-28060202:[N/A] 3539690529
-28060203:[N/A] 3418949673
-28060301:[N/A] 1575409961
-28060302:[N/A] 35400545
-28060401:[N/A] 2550380273
-28060402:[N/A] 1827515817
-28060501:[N/A] 2910802777
-28060502:[N/A] 3424336233
-28060503:[N/A] 3938050385
-28060504:[N/A] 457094737
-28060505:[N/A] 3374220305
-28060506:[N/A] 1349374089
-28060509:[N/A] 1497649297
-28060510:[N/A] 3380533609
-28060511:[N/A] 423020265
-28060512:[N/A] 112703337
-28060513:[N/A] 2396817929
-28060601:[N/A] 2825466249
-28060602:[N/A] 409501041
-28060603:[N/A] 2740821897
-28060604:[N/A] 2340527241
-28060605:[N/A] 37512633
-28060606:[N/A] 2214856321
-28060609:[N/A] 1426424937
-28060610:[N/A] 3717654113
-28060611:[N/A] 1648208073
-28060612:[N/A] 2053098161
-28060613:[N/A] 276253497
-28060614:[N/A] 465761521
-28060701:[N/A] 3963893857
-28060801:[N/A] 3494586161
-28060901:[N/A] 3910686713
-28061001:[N/A] 3720242777
-28061002:[N/A] 3801760225
-28061101:[N/A] 3407624849
-28061201:[N/A] 2733673945
-28061301:[N/A] 3469996769
-28061401:[N/A] 2330015681
-28061402:[N/A] 3443985385
+28060101:Gator_01 - [N/A] 128716817
+28060102:Gator_Strong_01 - [N/A] 2866718929
+28060103:Gator_01 - [N/A] 1328271489
+28060201:Panther_01 - [N/A] 2538068521
+28060202:Panther_Strong_01 - [N/A] 3539690529
+28060203:Panther_01 - [N/A] 3418949673
+28060301:Vulture_01 - [N/A] 1575409961
+28060302:Vulture_01 - [N/A] 35400545
+28060401:Scorpion_01 - [N/A] 2550380273
+28060402:Scorpion_01 - [N/A] 1827515817
+28060501:Megamoth_Desert_01 - [N/A] 2910802777
+28060502:Megamoth_Desert_02 - [N/A] 3424336233
+28060503:Megamoth_Desert_03 - [N/A] 3938050385
+28060504:Megamoth_Desert_01 - [N/A] 457094737
+28060505:Megamoth_Desert_02 - [N/A] 3374220305
+28060506:Megamoth_Desert_03 - [N/A] 1349374089
+28060509:Megamoth_Desert_04 - [N/A] 1497649297
+28060510:Megamoth_Desert_05 - [N/A] 3380533609
+28060511:Megamoth_Desert_06 - [N/A] 423020265
+28060512:Megamoth_Desert_07 - [N/A] 112703337
+28060513:Megamoth_Desert_08 - [N/A] 2396817929
+28060601:Megamoth_Jungle_01 - [N/A] 2825466249
+28060602:Megamoth_Jungle_02 - [N/A] 409501041
+28060603:Megamoth_Jungle_03 - [N/A] 2740821897
+28060604:Megamoth_Jungle_01 - [N/A] 2340527241
+28060605:Megamoth_Jungle_02 - [N/A] 37512633
+28060606:Megamoth_Jungle_03 - [N/A] 2214856321
+28060609:Megamoth_Jungle_Strong_01 - [N/A] 1426424937
+28060610:Megamoth_Jungle_04 - [N/A] 3717654113
+28060611:Megamoth_Jungle_05 - [N/A] 1648208073
+28060612:Megamoth_Jungle_06 - [N/A] 2053098161
+28060613:Megamoth_Jungle_07 - [N/A] 276253497
+28060614:Megamoth_Jungle_08 - [N/A] 465761521
+28060701:Megamoth_Desert_04 - [N/A] 3963893857
+28060801:Megamoth_Desert_05 - [N/A] 3494586161
+28060901:Megamoth_Desert_06 - [N/A] 3910686713
+28061001:Megamoth_Desert_07 - [N/A] 3720242777
+28061002:Megamoth_Desert_08 - [N/A] 3801760225
+28061101:Megamoth_Jungle_04 - [N/A] 3407624849
+28061201:Megamoth_Jungle_05 - [N/A] 2733673945
+28061301:Megamoth_Jungle_06 - [N/A] 3469996769
+28061401:Megamoth_Jungle_07 - [N/A] 2330015681
+28061402:Megamoth_Jungle_08 - [N/A] 3443985385
 28210101:Serenitea Pot: Golden Crab
 28210102:Serenitea Pot: Sun Crab
 28210103:Serenitea Pot: Ocean Crab
@@ -510,23 +559,23 @@
 28210205:Serenitea Pot: Golden Loach
 28210206:Serenitea Pot: Sunny Loach
 28210207:Serenitea Pot: Marrow Lizard
-28210208:[N/A] 4168682209
+28210208:Homeworld_Lizard_05 - [N/A] 4168682209
 28210301:Serenitea Pot: Frog
 28210302:Serenitea Pot: Mud Frog
 28210303:Serenitea Pot: Blue Frog
-28210304:[N/A] 1743923249
+28210304:Homeworld_Frog_04 - [N/A] 1743923249
 28210401:Serenitea Pot: Adorned Unagi
 28210402:Serenitea Pot: Deep Sea Unagi
 28210403:Serenitea Pot: Red-Finned Unagi
-28210404:[N/A] 1020919801
+28210404:Homeworld_Eel_04 - [N/A] 1020919801
 28220101:Serenitea Pot: Snow Fox
 28220102:Serenitea Pot: Crimson Fox
-28220108:[N/A] 3596224209
+28220108:Homeworld_Fox_03 - [N/A] 3596224209
 28220201:Serenitea Pot: Squirrel
 28220301:Serenitea Pot: Forest Boar
 28220303:Serenitea Pot: Snowboar
-28220313:[N/A] 2460569713
-28220314:[N/A] 3974077529
+28220313:Homeworld_Boar_Grass - [N/A] 2460569713
+28220314:Homeworld_Boar_Grass_Small - [N/A] 3974077529
 28220401:Serenitea Pot: Northland Hound
 28220402:Serenitea Pot: Forest-Patrol Hound
 28220403:Serenitea Pot: Shiba
@@ -540,20 +589,20 @@
 28220601:Serenitea Pot: Snow Weasel
 28220602:Serenitea Pot: Red-Tailed Weasel
 28220603:Serenitea Pot: Boot Weasel
-28220604:[N/A] 3102074185
+28220604:Homeworld_Marten_04 - [N/A] 3102074185
 28220605:Serenitea Pot: Bluethunder Weasel
 28220701:Serenitea Pot: Kitsune
 28220901:Serenitea Pot: Kageroumaru
 28230101:Serenitea Pot: Azure Crane
 28230102:Serenitea Pot: Violet Ibis
-28230104:[N/A] 811422561
+28230104:Homeworld_Crane_01_Lbis - [N/A] 811422561
 28230301:Serenitea Pot: White Pigeon
 28230302:Serenitea Pot: Brightcrown Pigeon
 28230303:Serenitea Pot: Graywing Pigeon
 28230304:Serenitea Pot: Crimsonflank Pigeon
 28230305:Serenitea Pot: Black King Pigeon
 28230306:Serenitea Pot: Crow
-28230313:[N/A] 3724967537
+28230313:Homeworld_Pigeon_Beak_01 - [N/A] 3724967537
 28230401:Serenitea Pot: Crimson Finch
 28230402:Serenitea Pot: Golden Finch
 28230403:Serenitea Pot: Snow Finch
@@ -581,20 +630,20 @@
 28240602:Serenitea Pot: Bitter Pufferfish
 28240701:Serenitea Pot: Divda Ray
 28240702:Serenitea Pot: Formalo Ray
-28240801:[N/A] 2213501889
-28240802:[N/A] 2420839809
-28240803:[N/A] 619347953
-28240804:[N/A] 2847515857
-28240901:[N/A] 4288334729
-28240902:[N/A] 2843011617
+28240801:Homeworld_Fishable_Maritime_Batdiodan_01 - [N/A] 2213501889
+28240802:Homeworld_Fishable_Maritime_Batdiodan_02 - [N/A] 2420839809
+28240803:Homeworld_Fishable_Maritime_Batdiodan_03 - [N/A] 619347953
+28240804:Homeworld_Fishable_Maritime_Batdiodan_04 - [N/A] 2847515857
+28240901:Homeworld_Fishable_Maritime_Apsva_01 - [N/A] 4288334729
+28240902:Homeworld_Fishable_Maritime_Apsva_02 - [N/A] 2843011617
 28250101:Serenitea Pot: Anemo Crystalfly
 28250102:Serenitea Pot: Geo Crystalfly
 28250103:Serenitea Pot: Cryo Crystalfly
 28250104:Serenitea Pot: Electro Crystalfly
 28250105:Serenitea Pot: Coral Butterfly
-28250106:[N/A] 3343647737
+28250106:Homeworld_Wisp_Grass_01 - [N/A] 3343647737
 28250301:Serenitea Pot: Lucklight Fly
-28250401:[N/A] 741074761
+28250401:Homeworld_Boltbug_Scarab_01 - [N/A] 741074761


 // BOSS
@@ -605,8 +654,13 @@
 20040301:Geo Hypostasis
 20040302:Geo Hypostasis
 20040401:Hydro Hypostasis
+20040402:Effigy_Water_02 - [N/A] 2510499945
 20040501:Cryo Hypostasis
+20040502:Effigy_Ice_01 - [N/A] 244519785
 20040601:Pyro Hypostasis
+20040602:Effigy_Fire_02 - [N/A] 802657121
+20040701:Effigy_Grass_01 - [N/A] 572615921
+20040702:Effigy_Grass_02 - [N/A] 2410347593
 20050101:Oceanid
 20050102:Oceanid
 20070101:Thunder Manifestation
@@ -614,12 +668,13 @@
 24010401:Ruin Serpent
 24021101:Perpetual Mechanical Array
 24021102:Perpetual Mechanical Array
-24030301:[N/A] 3108339881
-24050101:[N/A] 2629579681
+24030301:Gargoyle_Fafnir_01 - [N/A] 3108339881
+24050101:Monolith_Starchild - [N/A] 2629579681
 25090101:Maguu Kenki
 25090102:Maguu Kenki: Wind Bunshin
 25090103:Maguu Kenki: Ice Bunshin
 25090104:Maguu Kenki: Masked Bunshin
+25090105:Samurai_Ningyo_05 - Marionette General: Masked Bunshin
 25090201:Maguu Kenki: Lone Gale
 25090301:Maguu Kenki: Galloping Frost
 25090401:Maguu Kenki: Mask of Terror
@@ -628,7 +683,7 @@
 26020101:Cryo Regisvine
 26020102:Cryo Regisvine
 26020201:Pyro Regisvine
-26020301:[N/A] 67218681
+26020301:Regisvine_Electric - [N/A] 67218681
 26050101:Primo Geovishap (Hydro)
 26050201:Primo Geovishap (Pyro)
 26050301:Primo Geovishap (Cryo)
@@ -639,7 +694,8 @@
 26050801:Bolteater Bathysmal Vishap
 26050802:Bolteater Bathysmal Vishap
 26080101:Beisht
-26110101:[N/A] 4290207929
+26110101:Fungus_Raptor - [N/A] 4290207929
+26130101:Sandworm_01 - [N/A] 4098645257
 29010101:Stormterror
 29010102:Stormterror
 29010103:Stormterror
@@ -666,6 +722,12 @@
 29060201:Magatsu Mitake Narukami no Mikoto
 29060202:Magatsu Mitake Narukami no Mikoto
 29060203:Magatsu Mitake Narukami no Mikoto
+29070101:Monster_Nada - [N/A] 3425649649
+29070102:Monster_Nada - [N/A] 996756049
+29070103:Monster_Nada - [N/A] 887141825
+29070104:Monster_Nada - [N/A] 3834332121
+29070105:Monster_Nada - [N/A] 1547264913
+29070106:Monster_Nada - [N/A] 641768601


 // Animal
@@ -682,15 +744,15 @@
 28010205:Golden Loach
 28010206:Sunny Loach
 28010207:Pith Lizard
-28010208:[N/A] 404479849
+28010208:Lizard_05 - [N/A] 404479849
 28010301:Frog
 28010302:Mud Frog
 28010303:Blue Frog
-28010304:[N/A] 13583441
+28010304:Frog_04 - [N/A] 13583441
 28010401:Adorned Unagi
 28010402:Deep Sea Unagi
 28010403:Red-Finned Unagi
-28010404:[N/A] 2823603497
+28010404:Eel_04 - [N/A] 2823603497
 28040101:Black-Back Bass
 28040102:Blue-Fin Bass
 28040103:Golden Bass
@@ -704,9 +766,15 @@
 28050103:Cryo Crystalfly
 28050104:Electro Crystalfly
 28050105:Coral Butterfly
-28050106:[N/A] 149328065
+28050106:Wisp_Grass_01 - [N/A] 149328065
 28050301:Lucklight Fly
-28050401:[N/A] 2466918521
+28050401:Boltbug_Scarab_01 - [N/A] 2466918521
+28050501:Electrohercules_01 - [N/A] 2466918521
+28050502:Electrohercules_02 - [N/A] 2466918521
+28050503:Electrohercules_03 - [N/A] 2466918521
+28050504:Electrohercules_04 - [N/A] 2466918521
+28050505:Electrohercules_05 - [N/A] 2466918521
+28050506:Electrohercules_06 - [N/A] 2466918521


 // Fish
@@ -733,12 +801,12 @@
 28040602:Bitter Pufferfish
 28040701:Divda Ray
 28040702:Formalo Ray
-28040801:[N/A] 1381140681
-28040802:[N/A] 3230531961
-28040803:[N/A] 2534877817
-28040804:[N/A] 1321673065
-28040901:[N/A] 3639121545
-28040902:[N/A] 3476332937
+28040801:Fishable_Maritime_Batdiodan_01 - [N/A] 1381140681
+28040802:Fishable_Maritime_Batdiodan_02 - [N/A] 3230531961
+28040803:Fishable_Maritime_Batdiodan_03 - [N/A] 2534877817
+28040804:Fishable_Maritime_Batdiodan_04 - [N/A] 1321673065
+28040901:Fishable_Maritime_Apsva_01 - [N/A] 3639121545
+28040902:Fishable_Maritime_Apsva_02 - [N/A] 3476332937

 // Partner
 35210101:Gilded Brigade - One-Handed Axe (Forest Book)
@@ -747,8 +815,8 @@
 35210303:Gilded NPC - 3.2 Garrison Soldier C
 35210401:Gold Plated NPC - Luxembourg
 35210501:NPC - Habachi
-35310101:Gilded Brigade <EFBFBD><EFBFBD> Sand Water Purification (Golden Dreamland)
-35310301:The Gilded Brigade <EFBFBD><EFBFBD> Thunder in the Daytime (Golden Dreamland)
+35310101:Gilded Brigade ¡¤ Sand Water Purification (Golden Dreamland)
+35310301:The Gilded Brigade ¡¤ Thunder in the Daytime (Golden Dreamland)
 35210102:Jungle Leopard
 36090190:Activity - Friendly Flying Water
 36090290:Activity - Friendly Flying Grass
--- a/Source/GrasscutterTools/Resources/en-us/Quest.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Quest.txt
@@ -24,6 +24,7 @@
 30325:Goddess Statue Unlocked - [N/A] 1854299071
 30326:Goddess Statue Unlocked - [N/A] 853608247
 30327:Goddess Statue Unlocked - [N/A] 416738111
+30328:Goddess Statue Unlocked - [N/A] 416738111
 30600:Winds of the Past - Meet Amber at the temple
 30601:Winds of the Past - Talk to Amber
 30602:Winds of the Past - Enter the temple
@@ -112,7 +113,7 @@
 35101:Wanderer's Trail - Follow Paimon
 35102:Wanderer's Trail - Climb to the top of the rock face
 35103:Wanderer's Trail - [N/A] 469284815
-35104:Wanderer's Trail - Where Dreams Begin (Catch Paimon CG)
+35104:Wanderer's Trail - [N/A] 2858699967
 35105:Wanderer's Trail - Go to the foot of the cliff
 35106:Wanderer's Trail - Unlock the Teleport Waypoint
 35107:Wanderer's Trail - [N/A] 2743942591
@@ -1975,87 +1976,87 @@
 302114:Secret of the Scorching Desert - Wait until the following morning (06:00 – 08:00)
 302115:Secret of the Scorching Desert - [CHS] - 播放CS$HIDDEN
 302116:Secret of the Scorching Desert - Proceed deeper within the ruins
-302201:[N/A] 0 - Wait till 8:00 – 12:00 the next day
-302202:[N/A] 0 - Go to the Akademiya to meet up with Alhaitham
-302203:[N/A] 0 - Enter the Akademiya together with Alhaitham
-302204:[N/A] 0 - Enter the House of Daena
-302205:[N/A] 0 - Talk to Alhaitham
-302206:[N/A] 0 - Hide for now and wait for an opportunity
-302207:[N/A] 0 - [N/A] 3442967412
-302208:[N/A] 0 - Talk to Paimon
-302209:[N/A] 0 - Find a way to connect to Nahida's consciousness
-302210:[N/A] 0 - Talk to Nahida's consciousness
-302211:[N/A] 0 - Talk to Sheikh Zubayr
-302212:[N/A] 0 - Go to the Akademiya
-302213:[N/A] 0 - Go to the Akademiya
-302214:[N/A] 0 - [N/A] 1732046580
-302215:[N/A] 0 - Talk to Paimon
-302216:[N/A] 0 - Interlude: Conversation Between Dehya and Rahman
-302217:[N/A] 0 - Lure the Akademiya guards into the trap
-302218:[N/A] 0 - Interlude: Grand Sage Azar Arriving at the Sanctuary of Surasthana
-302219:[N/A] 0 - Interlude: Grand Sage Azar's Suspicion
-302220:[N/A] 0 - Interlude: Grand Sage Azar Arriving at the Sanctuary of Surasthana
-302221:[N/A] 0 - Talk to Paimon
-302222:[N/A] 0 - Go to the Sanctuary of Surasthana
-302223:[N/A] 0 - Talk to Nahida
-302224:[N/A] 0 - Lure the Akademiya guards into the trap
-302225:[N/A] 0 - [N/A] 1295878188
-302226:[N/A] 0 - Talk to Sheikh Zubayr
-302227:[N/A] 0 - Talk to Paimon
-302228:[N/A] 0 - Interlude: Conversation Between Dehya and Rahman
-302229:[N/A] 0 - Interlude: Grand Sage Azar's Suspicion
-302230:[N/A] 0 - Talk to Paimon
-302231:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302232:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302233:[N/A] 0 - Talk to Paimon
-302234:[N/A] 0 - [N/A] 403262332
-302235:[N/A] 0 - [N/A] 3258363788
-302236:[N/A] 0 - [N/A] 2830775676
-302237:[N/A] 0 - [N/A] 33960564
-302238:[N/A] 0 - [N/A] 3034910092
-302239:[N/A] 0 - [N/A] 1042508412
-302240:[N/A] 0 - [N/A] 2334919076
-302241:[N/A] 0 - Leave the Sanctuary of Surasthana
-302242:[N/A] 0 - [N/A] 2103971276
-302243:[N/A] 0 - [N/A] 2524469860
-302244:[N/A] 0 - [N/A] 3247687540
-302245:[N/A] 0 - [N/A] 4115109332
-302246:[N/A] 0 - [N/A] 2898922556
-302247:[N/A] 0 - [N/A] 1634110884
-302248:[N/A] 0 - [N/A] 1799067076
-302249:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302201:Secret of the Scorching Desert - Wait till 8:00 – 12:00 the next day
+302202:Secret of the Scorching Desert - Go to the Akademiya to meet up with Alhaitham
+302203:Secret of the Scorching Desert - Enter the Akademiya together with Alhaitham
+302204:Secret of the Scorching Desert - Enter the House of Daena
+302205:Secret of the Scorching Desert - Talk to Alhaitham
+302206:Secret of the Scorching Desert - Hide for now and wait for an opportunity
+302207:Secret of the Scorching Desert - [N/A] 3442967412
+302208:Secret of the Scorching Desert - Talk to Paimon
+302209:Secret of the Scorching Desert - Find a way to connect to Nahida's consciousness
+302210:Secret of the Scorching Desert - Talk to Nahida's consciousness
+302211:Secret of the Scorching Desert - Talk to Sheikh Zubayr
+302212:Secret of the Scorching Desert - Go to the Akademiya
+302213:Secret of the Scorching Desert - Go to the Akademiya
+302214:Secret of the Scorching Desert - [N/A] 1732046580
+302215:Secret of the Scorching Desert - Talk to Paimon
+302216:Secret of the Scorching Desert - Interlude: Conversation Between Dehya and Rahman
+302217:Secret of the Scorching Desert - Lure the Akademiya guards into the trap
+302218:Secret of the Scorching Desert - Interlude: Grand Sage Azar Arriving at the Sanctuary of Surasthana
+302219:Secret of the Scorching Desert - Interlude: Grand Sage Azar's Suspicion
+302220:Secret of the Scorching Desert - Interlude: Grand Sage Azar Arriving at the Sanctuary of Surasthana
+302221:Secret of the Scorching Desert - Talk to Paimon
+302222:Secret of the Scorching Desert - Go to the Sanctuary of Surasthana
+302223:Secret of the Scorching Desert - Talk to Nahida
+302224:Secret of the Scorching Desert - Lure the Akademiya guards into the trap
+302225:Secret of the Scorching Desert - [N/A] 1295878188
+302226:Secret of the Scorching Desert - Talk to Sheikh Zubayr
+302227:Secret of the Scorching Desert - Talk to Paimon
+302228:Secret of the Scorching Desert - Interlude: Conversation Between Dehya and Rahman
+302229:Secret of the Scorching Desert - Interlude: Grand Sage Azar's Suspicion
+302230:Secret of the Scorching Desert - Talk to Paimon
+302231:Secret of the Scorching Desert - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302232:Secret of the Scorching Desert - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302233:Secret of the Scorching Desert - Talk to Paimon
+302234:Secret of the Scorching Desert - [N/A] 403262332
+302235:Secret of the Scorching Desert - [N/A] 3258363788
+302236:Secret of the Scorching Desert - [N/A] 2830775676
+302237:Secret of the Scorching Desert - [N/A] 33960564
+302238:Secret of the Scorching Desert - [N/A] 3034910092
+302239:Secret of the Scorching Desert - [N/A] 1042508412
+302240:Secret of the Scorching Desert - [N/A] 2334919076
+302241:Secret of the Scorching Desert - Leave the Sanctuary of Surasthana
+302242:Secret of the Scorching Desert - [N/A] 2103971276
+302243:Secret of the Scorching Desert - [N/A] 2524469860
+302244:Secret of the Scorching Desert - [N/A] 3247687540
+302245:Secret of the Scorching Desert - [N/A] 4115109332
+302246:Secret of the Scorching Desert - [N/A] 2898922556
+302247:Secret of the Scorching Desert - [N/A] 1634110884
+302248:Secret of the Scorching Desert - [N/A] 1799067076
+302249:Secret of the Scorching Desert - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
 302301:[N/A] 0 - [CHS] - （test）隐藏子任务带闲置对话$HIDDEN
-302401:[N/A] 0 - Talk to Candace
-302402:[N/A] 0 - Meet up with Alhaitham
-302403:[N/A] 0 - Go to the Eremite base
-302404:[N/A] 0 - Go to Caravan Ribat and meet up with Cyno
-302405:[N/A] 0 - Talk to the soldiers stationed in Caravan Ribat
-302406:[N/A] 0 - Wait until the appointed time (two days later)
-302407:[N/A] 0 - Go to the east side of the desert
-302408:[N/A] 0 - Help Cyno arrest the Eremites
-302409:[N/A] 0 - Talk to Cyno
-302410:[N/A] 0 - Wait until the next day
-302411:[N/A] 0 - Enter the village chief's house
-302412:[N/A] 0 - Talk to Candace
-302413:[N/A] 0 - Enter the village chief's house
-302414:[N/A] 0 - Leave the village chief's house
-302501:[N/A] 0 - Go to Caravan Ribat to meet up with Dehya
-302502:[N/A] 0 - Find Tighnari at Pardis Dhyai
-302503:[N/A] 0 - Go to Port Ormos
-302504:[N/A] 0 - Follow the Fatui soldiers
-302505:[N/A] 0 - Talk to Dehya
-302506:[N/A] 0 - Return to Pardis Dhyai as quickly as possible
-302507:[N/A] 0 - Defeat the attacking Fatui
-302508:[N/A] 0 - Talk to Tighnari
-302509:[N/A] 0 - Check on Tighnari and Dehya
-302510:[N/A] 0 - Go to where Haypasia is
-302511:[N/A] 0 - Wait until the agreed time (19:00 – 21:00)
-302512:[N/A] 0 - Go to the Grand Bazaar
-302513:[N/A] 0 - Hide yourself in Wikala Funduq
-302514:[N/A] 0 - Track The Doctor down together with Dehya
-302515:[N/A] 0 - Talk to Dehya
-302516:[N/A] 0 - Talk to Dehya after leaving Pardis Dhyai
-302517:[N/A] 0 - [CHS] - (test)(hide)删除船只$HIDDEN
+302401:Secret of the Scorching Desert - Talk to Candace
+302402:Secret of the Scorching Desert - Meet up with Alhaitham
+302403:Secret of the Scorching Desert - Go to the Eremite base
+302404:Secret of the Scorching Desert - Go to Caravan Ribat and meet up with Cyno
+302405:Secret of the Scorching Desert - Talk to the soldiers stationed in Caravan Ribat
+302406:Secret of the Scorching Desert - Wait until the appointed time (two days later)
+302407:Secret of the Scorching Desert - Go to the east side of the desert
+302408:Secret of the Scorching Desert - Help Cyno arrest the Eremites
+302409:Secret of the Scorching Desert - Talk to Cyno
+302410:Secret of the Scorching Desert - Wait until the next day
+302411:Secret of the Scorching Desert - Enter the village chief's house
+302412:Secret of the Scorching Desert - Talk to Candace
+302413:Secret of the Scorching Desert - Enter the village chief's house
+302414:Secret of the Scorching Desert - Leave the village chief's house
+302501:Secret of the Scorching Desert - Go to Caravan Ribat to meet up with Dehya
+302502:Secret of the Scorching Desert - Find Tighnari at Pardis Dhyai
+302503:Secret of the Scorching Desert - Go to Port Ormos
+302504:Secret of the Scorching Desert - Follow the Fatui soldiers
+302505:Secret of the Scorching Desert - Talk to Dehya
+302506:Secret of the Scorching Desert - Return to Pardis Dhyai as quickly as possible
+302507:Secret of the Scorching Desert - Defeat the attacking Fatui
+302508:Secret of the Scorching Desert - Talk to Tighnari
+302509:Secret of the Scorching Desert - Check on Tighnari and Dehya
+302510:Secret of the Scorching Desert - Go to where Haypasia is
+302511:Secret of the Scorching Desert - Wait until the agreed time (19:00 – 21:00)
+302512:Secret of the Scorching Desert - Go to the Grand Bazaar
+302513:Secret of the Scorching Desert - Hide yourself in Wikala Funduq
+302514:Secret of the Scorching Desert - Track The Doctor down together with Dehya
+302515:Secret of the Scorching Desert - Talk to Dehya
+302516:Secret of the Scorching Desert - Talk to Dehya after leaving Pardis Dhyai
+302517:Secret of the Scorching Desert - [CHS] - (test)(hide)删除船只$HIDDEN
 302601:[N/A] 0 - [CHS] - (test)(hide)刷柯莱的早餐$HIDDEN
 302602:[N/A] 0 - Talk to Collei
 302603:[N/A] 0 - Go to the Grand Bazaar
@@ -3588,7 +3589,7 @@
 1300803:The Reason We Are Gathered Here - [N/A] 2411157060
 1300804:The Reason We Are Gathered Here - Talk to Nilou
 1300805:The Reason We Are Gathered Here - [N/A] 2748820748
-1300806:The Reason We Are Gathered Here - Wait for the debate two days later (20:00 – 22:00)
+1300806:The Reason We Are Gathered Here - Wait until two days later (20:00 – 22:00)
 1300807:The Reason We Are Gathered Here - Go to the theater to see Inayah
 1300808:The Reason We Are Gathered Here - [N/A] 3480922884
 1300901:Suspicious Smuggling Case - Take a look around the Akademiya
@@ -3652,7 +3653,7 @@
 1301302:[N/A] 0 - Talk to Pedrush
 1301303:[N/A] 0 - Follow Pedrush to "A Moment of Dreams"
 1301304:[N/A] 0 - Go to the place Ilman mentioned
-1301305:[N/A] 0 - Defeat the monsters
+1301305:[N/A] 0 - Defeat the monsters in front of you
 1301306:[N/A] 0 - Talk to Ilman
 1301307:[N/A] 0 - Return to "A Moment of Dreams" to ascertain the situation
 1301308:[N/A] 0 - Check on Ilman, who is depressed
@@ -6710,7 +6711,7 @@
 2303905:Run, Hilmi, Run! - Talk to Hilmi
 2304001:Warehousing Business - [CHS] - (test)随机分支用$HIDDEN
 2304002:Warehousing Business - Talk to Najat
-2304003:Warehousing Business - Defeat all vultures
+2304003:Warehousing Business - Defeat all Red Vultures
 2304004:Warehousing Business - Report back to Najat
 2304005:Warehousing Business - Talk to Najat
 2304006:Warehousing Business - Retrieve the goods
@@ -6724,8 +6725,8 @@
 2304105:Desert Bloom - Go back and water the plants
 2304106:Desert Bloom - Search for the kitten
 2304107:Desert Bloom - Report back to Nermin
-2304109:Desert Bloom - Give Nermin a Zaytun Peach
-2304110:Desert Bloom - Give Nermin a Zaytun Peach
+2304109:Desert Bloom - Give Nermin the Zaytun Peach(es)
+2304110:Desert Bloom - Give Nermin the Zaytun Peach(es)
 2304111:Desert Bloom - [CHS] - 刷新氛围脚印辅助环$HIDDEN
 2304112:Desert Bloom - Search for the kitten
 2304113:Desert Bloom - Search for the kitten
@@ -9158,7 +9159,7 @@
 7066109:Exploding Population - Talk to Nantuck
 7066110:Exploding Population - [CHS] - (test)检测是否获取观赏鱼$HIDDEN
 7066201:[CHS] - (test)钓鱼引导任务$HIDDEN - [CHS] - (test)发鱼竿的隐藏任务$HIDDEN
-7066301:[N/A] 0 - [CHS] - （test）测试任务$UNRELEASED
+7066301:[N/A] 0 - [N/A] 556097052
 7066401:Windswept Domain - Talk to Honglang
 7070001:Helen's Special Blend - Give 10 Sweet Flowers to Helen
 7070002:Helen's Special Blend - Talk to Helen
@@ -12165,12 +12166,12 @@
 7223006:[CHS] - （test）破坏栖木$HIDDEN - [N/A] 2555605244
 7223101:[CHS] - test 寝子是只猫最后 后续$HIDDEN - [CHS] - test 对话用$HIDDEN
 7223201:Clean House - [CHS] - (test)(隐藏)善后处理默认接取的任务$HIDDEN
-7223202:Clean House - Go to Jakotsu Mine to negotiate with the Shogunate Samurai.
-7223203:Clean House - Defeat the Brutish Samurai.
-7223204:Clean House - Read the notes that the samurai left behind.
-7223205:Clean House - Go to the port to investigate the Fatui.
-7223206:Clean House - Defeat Borenka and his minions.
-7223207:Clean House - Talk to Shizuru.
+7223202:Clean House - Go to Jakotsu Mine to negotiate with the Shogunate Samurai
+7223203:Clean House - Defeat the Brutish Samurai
+7223204:Clean House - Read the notes that the samurai left behind
+7223205:Clean House - Go to the port to investigate the Fatui
+7223206:Clean House - Defeat Borenka and his minions
+7223207:Clean House - Talk to Shizuru
 7223301:The Still Water's Flow - [CHS] - (test)自动完成播reminder$HIDDEN
 7223302:The Still Water's Flow - Talk to Tsuyuko
 7223303:The Still Water's Flow - Talk to Tsuyuko at the altar
@@ -13344,7 +13345,7 @@
 7302309:A Short Encounter with a Rare Bird - [CHS] - (test)交付材料
 7302310:A Short Encounter with a Rare Bird - [CHS] - (test)与坏调查员对话
 7302311:A Short Encounter with a Rare Bird - Hunt Dusk Birds in the north of Apam Woods
-7302312:A Short Encounter with a Rare Bird - Talk to The Eremites
+7302312:A Short Encounter with a Rare Bird - Talk to the Eremites
 7302313:A Short Encounter with a Rare Bird - Hunt Dusk Birds on the mountains east of Apam Woods
 7302314:A Short Encounter with a Rare Bird - Talk to Shefket
 7302315:A Short Encounter with a Rare Bird - Fight the Treasure Hoarders
@@ -13583,11 +13584,11 @@
 7304102:Garden Fairies - Find Aralila!
 7304103:Garden Fairies - Find Aranishat!
 7304104:Garden Fairies - Find Aranishat!
-7304201:Rishboland Tiger, roaaar - [N/A] 3315626476
-7304202:Rishboland Tiger, roaaar - Act as the Rishboland Tiger and catch all the Aranara
-7304203:Rishboland Tiger, roaaar - Talk to Arakanta
-7304204:Rishboland Tiger, roaaar - Talk to Arakanta
-7304205:Rishboland Tiger, roaaar - Talk to Arakanta
+7304201:Rishboland Tiger, Roaaar - [N/A] 3315626476
+7304202:Rishboland Tiger, Roaaar - Act as the Rishboland Tiger and catch all the Aranara
+7304203:Rishboland Tiger, Roaaar - Talk to Arakanta
+7304204:Rishboland Tiger, Roaaar - Talk to Arakanta
+7304205:Rishboland Tiger, Roaaar - Talk to Arakanta
 7304301:[CHS] - (test)正法炬书后续二级wq后日谈$HIDDEN - [CHS] - （test）后日谈$HIDDEN
 7304302:[CHS] - (test)正法炬书后续二级wq后日谈$HIDDEN - [CHS] - （test）等一天之后$HIDDEN
 7304401:Rescue the Aranara - [CHS] - (test)1判断是否击败丘丘人
@@ -13830,7 +13831,7 @@
 7305545:Dreams Beneath the Searing Sand - Escape from Khaj-Nisut
 7305546:Dreams Beneath the Searing Sand - Search for clues in the Eremites' camp
 7305547:Dreams Beneath the Searing Sand - Report back to Jebrael on the discovered clues
-7305548:Dreams Beneath the Searing Sand - Talk to The Eremites
+7305548:Dreams Beneath the Searing Sand - Talk to the Eremites
 7305549:Dreams Beneath the Searing Sand - Descend further
 7305550:Dreams Beneath the Searing Sand - Go to Khaj-Nisut's upper floor
 7305551:Dreams Beneath the Searing Sand - Talk to Jebrael
@@ -15314,7 +15315,7 @@
 7366801:Hilichurl Hullaballoo - Defeat the hilichurls
 7366901:Ruin Drake Maelstrom - Defeat the Ruin Drakes
 7367001:Eremite Mayhem - Defeat the Eremites
-7367101:Ruin Drake Maelstrom - Defeat the Ruin Drake
+7367101:Ruin Drake Maelstrom - Defeat the Ruin Drake(s)
 7367201:Fungal Fracas - Defeat the Fungi
 7367301:Corps of Thirty Recruitment - Talk to Effendi
 7367302:Corps of Thirty Recruitment - Talk to Effendi
@@ -15371,7 +15372,7 @@
 7380106:The Price - Investigate the call for help
 7380107:The Price - Defeat the monsters
 7380108:The Price - Talk to Alexandra
-7380109:The Price - Take Nika to The Eremites
+7380109:The Price - Take Nika to the Eremites
 7380110:The Price - Go back and check on Alexandra
 7380201:Adventure Takes Courage! - Talk to Katheryne
 7380301:Garcia's Paean: A Gift of Compatibility - Talk to Garcia
--- a/Source/GrasscutterTools/Resources/en-us/Scene.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Scene.txt
--- a/Source/GrasscutterTools/Resources/en-us/Weapon.txt
+++ b/Source/GrasscutterTools/Resources/en-us/Weapon.txt
@@ -22,17 +22,16 @@
 11415:Cinnabar Spindle
 11416:Kagotsurube Isshin
 11417:Sapwood Blade
-11418:Xiphos’ Moonlight
+11418:Xiphos' Moonlight
 11419:Prized Isshin Blade
 11420:Prized Isshin Blade
 11421:Prized Isshin Blade
+11422:Toukabou Shigure
 11501:Aquila Favonia
 11502:Skyward Blade
 11503:Freedom-Sworn
 11504:Summit Shaper
 11505:Primordial Jade Cutter
-11506:Primordial Jade Cutter
-11507:One Side
 11509:Mistsplitter Reforged
 11510:Haran Geppaku Futsu
 11511:Key of Khaj-Nisut
@@ -64,8 +63,6 @@
 12502:Wolf's Gravestone
 12503:Song of Broken Pines
 12504:The Unforged
-12505:Primordial Jade Greatsword
-12506:The Other Side
 12510:Redhorn Stonethresher
 13101:Beginner's Protector
 13201:Iron Point
@@ -91,7 +88,6 @@
 13502:Skyward Spine
 13504:Vortex Vanquisher
 13505:Primordial Jade Winged-Spear
-13506:Deicide
 13507:Calamity Queller
 13509:Engulfing Lightning
 13511:Staff of the Scarlet Sands
@@ -121,12 +117,11 @@
 14417:Fruit of Fulfillment
 14501:Skyward Atlas
 14502:Lost Prayer to the Sacred Winds
-14503:Lost Ballade
 14504:Memory of Dust
-14505:Primordial Jade Regalia
 14506:Everlasting Moonglow
 14509:Kagura's Verity
 14511:A Thousand Floating Dreams
+14512:Tulaytullah's Remembrance
 15101:Hunter's Bow
 15201:Seasoned Hunter's Bow
 15301:Raven Bow
@@ -156,9 +151,6 @@
 15501:Skyward Harp
 15502:Amos' Bow
 15503:Elegy for the End
-15504:Kunwu's Wyrmbane
-15505:Primordial Jade Vista
-15506:Mirror Breaker
 15507:Polar Star
 15508:Aqua Simulacra
 15509:Thundering Pulse
--- a/Source/GrasscutterTools/Resources/ru-ru/Artifact.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Artifact.txt
@@ -38,6 +38,46 @@
 21544:Сон железного цветка
 21553:Золотые годы
 21554:Золотые годы
+27412:Хранитель дивной мечты
+27413:Хранитель дивной мечты
+27422:Конец золотого царства
+27423:Конец золотого царства
+27432:Наследие пустынной знати
+27433:Наследие пустынной знати
+27442:Рождение города королей
+27443:Рождение города королей
+27452:Часы потерянного пути
+27453:Часы потерянного пути
+27513:Хранитель дивной мечты
+27514:Хранитель дивной мечты
+27523:Конец золотого царства
+27524:Конец золотого царства
+27533:Наследие пустынной знати
+27534:Наследие пустынной знати
+27543:Рождение города королей
+27544:Рождение города королей
+27553:Часы потерянного пути
+27554:Часы потерянного пути
+28412:Магический сосуд хранителя тайн
+28413:Магический сосуд хранителя тайн
+28422:Угасающий пир
+28423:Угасающий пир
+28432:Аметистовый венец
+28433:Аметистовый венец
+28442:Великолепие Ай-Ханум
+28443:Великолепие Ай-Ханум
+28452:Застывшее мгновение
+28453:Застывшее мгновение
+28513:Магический сосуд хранителя тайн
+28514:Магический сосуд хранителя тайн
+28523:Угасающий пир
+28524:Угасающий пир
+28533:Аметистовый венец
+28534:Аметистовый венец
+28543:Великолепие Ай-Ханум
+28544:Великолепие Ай-Ханум
+28553:Застывшее мгновение
+28554:Застывшее мгновение
 51110:Кубок временщика
 51111:Кубок временщика
 51112:Кубок временщика
--- a/Source/GrasscutterTools/Resources/ru-ru/ArtifactCat.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/ArtifactCat.txt
@@ -1,5 +1,7 @@
 20:Воспоминания дремучего леса
 21:Позолоченные сны
+27:Хроники Чертогов в пустыне
+28:Цветок потерянного рая
 51:Решимость временщика
 52:Душа храбреца
 53:Воля защитника
--- a/Source/GrasscutterTools/Resources/ru-ru/Avatar.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Avatar.txt
@@ -57,4 +57,8 @@
 1071:Сайно
 1072:Кандакия
 1073:Нахида
-1074:Лайла
+1074:Лайла
+1075:Странник
+1076:Фарузан
+1077:[EN] - Yaoyao
+1078:[EN] - Alhaitham
--- a/Source/GrasscutterTools/Resources/ru-ru/Item.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Item.txt
--- a/Source/GrasscutterTools/Resources/ru-ru/Monsters.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Monsters.txt
@@ -9,9 +9,11 @@
 20010403:Большой Анемо слайм
 20010501:Электро слайм
 20010502:Электро слайм
+20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010601:Большой Электро слайм
 20010602:Большой Электро слайм
 20010604:Большой Электро слайм
+20010605:Slime_Electric_03_SimpleStick - [N/A] 3051091649
 20010701:Электро слайм-мутант
 20010702:Электро слайм-мутант
 20010703:Электро слайм-мутант
@@ -22,6 +24,7 @@
 20010902:Большой крио слайм
 20010903:Большой Крио слайм
 20010904:Большой Крио слайм
+20010905:Slime_Ice_03_SimpleStick - [N/A] 3152089697
 20011001:Гидро слайм
 20011002:Гидро слайм
 20011101:Большой Гидро слайм
@@ -30,9 +33,11 @@
 20011201:Пиро слайм
 20011202:Пиро слайм
 20011203:Пиро слайм
+20011204:Slime_Fire_02_SimpleStick - [N/A] 1669508241
 20011301:Большой Пиро слайм
 20011302:Большой Пиро слайм
 20011304:Большой Пиро слайм
+20011305:Slime_Fire_03_SimpleStick - [N/A] 771419505
 20011401:Гео слайм
 20011402:Гео слайм
 20011501:Большой Гео слайм
@@ -42,6 +47,9 @@
 20011701:Призыв Гидро гипостазиса - Малая половина
 20011801:Призыв Гидро гипостазиса - Самоуничтожение
 20011901:Призыв Гидро гипостазиса - Лечение
+20012001:Effigy_Water_Underling_Ooze_05 - [N/A] 3817659321
+20012101:Effigy_Water_Underling_Ooze_06 - [N/A] 2054683281
+20012201:Effigy_Water_Underling_Ooze_07 - [N/A] 716714657
 20020101:Глаз бури
 20050201:Гидро мимик: Кабан
 20050202:Гидро мимик: Кабан
@@ -68,7 +76,7 @@
 20060401:Крио призрак
 20060501:Электро призрак
 20060601:Пиро призрак
-20060701:[N/A] 586909705
+20060701:Sylph_Grass_01 - [N/A] 586909705
 21010101:Хиличурл
 21010102:Хиличурл
 21010201:Хиличурл-боец
@@ -153,10 +161,10 @@
 22010404:Электро маг Бездны
 22020101:Вестник Бездны: Злые течения
 22020102:Вестник Бездны: Злые течения
-22020103:[N/A] 3179556369
+22020103:Invoker_Herald_Water_01 - [N/A] 3179556369
 22030101:Чтец Бездны: Пурпурная молния
 22030102:Чтец Бездны: Пурпурная молния
-22030103:[N/A] 577563505
+22030103:Invoker_Deacon_Electric_01 - [N/A] 577563505
 22030201:Чтец Бездны: Пламя бездны
 22030202:Чтец Бездны: Пламя бездны
 22040101:Щенок Разрыва: Камнегрыз
@@ -171,6 +179,7 @@
 22070302:Чёрный доспех: Гвардеец
 22080101:Рыцарь Чёрного Змея: Разрезающий ветер
 22090101:Угадай!
+22100101:Invoker_Archdeacon_01 - Хиличурл
 23010101:Застрельщик Фатуи: Крио бомбардир
 23010201:Застрельщик Фатуи: Гидро бомбардир
 23010301:Застрельщик Фатуи: Электро молотобоец
@@ -193,7 +202,7 @@
 24010301:Руинный молотильщик
 24010302:Руинный молотильщик
 24010303:Руинный молотильщик
-24010304:[N/A] 4152683505
+24010304:Konungmathr_None_WQ - [N/A] 4152683505
 24020101:Руинный патрульный
 24020102:Руинный патрульный
 24020103:Руинный патрульный
@@ -203,15 +212,15 @@
 24020301:Руинный защитник
 24020302:Руинный защитник
 24020303:Руинный защитник
-24020304:[N/A] 3323395121
+24020304:Apparatus_Enigma_BionicInsecta_Karkata - [N/A] 3323395121
 24020401:Руинный шпион
 24020402:Руинный шпион
 24020403:Руинный шпион
-24030101:[N/A] 765448937
-24030201:[N/A] 3903929633
-24040101:[N/A] 1462919497
-24040201:[N/A] 285953129
-24040301:[N/A] 3626535649
+24030101:Gargoyle_Airborne_01 - [N/A] 765448937
+24030201:Gargoyle_Ground_01 - [N/A] 3903929633
+24040101:Monolith_Ordinator_01 - [N/A] 1462919497
+24040201:Monolith_Ordinator_02 - [N/A] 285953129
+24040301:Monolith_Ordinator_03 - [N/A] 3626535649
 25010101:«Лю Лю»
 25010102:Таинственный человек
 25010103:Похитители сокровищ: Лю Лю
@@ -225,9 +234,9 @@
 25010206:Похитители сокровищ: Разведчик
 25010207:Похитители сокровищ: Разведчик
 25010208:Похитители сокровищ: Разведчик
-25010209:[N/A] 1167900689
-25010210:[N/A] 4032173065
-25010211:[N/A] 392055353
+25010209:Thoarder_Male_Standard_NoWeapon_02_09 - [N/A] 1167900689
+25010210:Thoarder_Male_Standard_NoWeapon_02_10 - [N/A] 4032173065
+25010211:Thoarder_Male_Standard_NoWeapon_02_11 - [N/A] 392055353
 25010301:Похитители сокровищ: Пиро химик
 25010302:Похитители сокровищ: Пиро химик
 25010401:Похитители сокровищ: Гидро химик
@@ -253,6 +262,7 @@
 25050402:Капитан пехоты сёгуната
 25050501:Сторонник Сангономии
 25050502:Сторонник Сангономии
+25050503:Ahigaru_Male_03 - (test)心海个人线反抗军足轻
 25060101:Похитители сокровищ: Боксёр
 25060102:Похитители сокровищ: Боксёр
 25070101:Похитители сокровищ: Сокрушитель
@@ -264,59 +274,73 @@
 25080301:Нобуси: Кикобан
 25080401:Самурай-ёрики
 25080402:Самурай-ёрики
-25080403:[N/A] 1581579825
-25080404:[N/A] 400320561
+25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
+25080404:Samurai_Hatamoto_03 - [N/A] 400320561
+25080405:Samurai_Hatamoto_04 - [N/A] 400320561
 25100101:Кайраги: Громовое вознесение
 25100102:Кайраги: Громовое вознесение
 25100201:Кайраги: Огненная мощь
+25100202:Samurai_Kairagi_07 - Пиро кайраги
 25100301:Отимуся: Проклятый гром
 25100302:Отимуся: Проклятый гром
 25100401:Отимуся: Нечестивое пламя
-25110101:[N/A] 1820584137
-25110102:[N/A] 2361510321
-25110201:[N/A] 3397827697
-25110202:[N/A] 1458817257
-25210101:[N/A] 593962337
-25210102:[N/A] 655804089
-25210103:[N/A] 3189818729
-25210104:[N/A] 2655106977
-25210105:[N/A] 2175825297
-25210106:[N/A] 660925665
-25210107:[N/A] 2260729353
-25210201:[N/A] 1998919569
-25210202:[N/A] 2119181617
-25210203:[N/A] 3425185161
-25210204:[N/A] 3201394457
-25210205:[N/A] 3735395833
-25210206:[N/A] 1444996537
-25210207:[N/A] 1636753185
-25210301:[N/A] 4008986473
-25210302:[N/A] 2939413633
-25210303:[N/A] 2517557169
-25210304:[N/A] 3890286705
-25210305:[N/A] 1664946217
-25210306:[N/A] 696066441
-25210307:[N/A] 2671081977
-25210401:[N/A] 998410809
-25210402:[N/A] 839477089
-25210403:[N/A] 2628038825
-25210404:[N/A] 509218169
-25210405:[N/A] 4366953
-25210406:[N/A] 1385944497
-25210501:[N/A] 914092905
-25210502:[N/A] 3484979137
-25210503:[N/A] 2747515289
-25210504:[N/A] 1621612097
-25210505:[N/A] 4251715865
-25210506:[N/A] 124112617
-25210601:[N/A] 3480498409
-25210602:[N/A] 1531750897
-25310101:[N/A] 2984077569
-25310201:[N/A] 3154173257
-25310202:[N/A] 3503187145
-25310301:[N/A] 863506833
-25410101:[N/A] 1317576089
-25410201:[N/A] 1223193297
+25110101:Gator_Eremite_Rock_01 - [N/A] 1820584137
+25110102:Gator_Eremite_Rock_02 - [N/A] 2361510321
+25110201:Vulture_Eremite_Wind_01 - [N/A] 3397827697
+25110202:Vulture_Eremite_Wind_02 - [N/A] 1458817257
+25110301:Scorpion_Eremite_Fire_01 - [N/A] 1458817257
+25110401:Chrysopelea_Eremite_Grass_01 - [N/A] 1458817257
+25210101:Eremite_Female_Hatchet_01 - [N/A] 593962337
+25210102:Eremite_Female_Hatchet_02 - [N/A] 655804089
+25210103:Eremite_Female_Hatchet_03 - [N/A] 3189818729
+25210104:EremiteElite_Female_Hatchet_01 - [N/A] 2655106977
+25210105:EremiteElite_Female_Hatchet_02 - [N/A] 2175825297
+25210106:EremiteElite_Female_Hatchet_03 - [N/A] 660925665
+25210107:Eremite_Female_Hatchet_04 - [N/A] 2260729353
+25210108:Eremite_Female_Hatchet_05 - [N/A] 1446861633
+25210201:Eremite_Male_Standard_Crossbow_01 - [N/A] 1998919569
+25210202:Eremite_Male_Standard_Crossbow_02 - [N/A] 2119181617
+25210203:Eremite_Male_Standard_Crossbow_03 - [N/A] 3425185161
+25210204:EremiteElite_Male_Standard_Crossbow_01 - [N/A] 3201394457
+25210205:EremiteElite_Male_Standard_Crossbow_02 - [N/A] 3735395833
+25210206:EremiteElite_Male_Standard_Crossbow_03 - [N/A] 1444996537
+25210207:Eremite_Male_Standard_Crossbow_04 - [N/A] 1636753185
+25210208:NPC_Quest_Male_Standard_Eremite_01 - [N/A] 2050456833
+25210209:NPC_Quest_Male_Standard_Eremite_02 - [N/A] 3171996801
+25210301:Eremite_Male_Standard_Pole_01 - [N/A] 4008986473
+25210302:Eremite_Male_Standard_Pole_02 - [N/A] 2939413633
+25210303:Eremite_Male_Standard_Pole_03 - [N/A] 2517557169
+25210304:EremiteElite_Male_Standard_Pole_01 - [N/A] 3890286705
+25210305:EremiteElite_Male_Standard_Pole_02 - [N/A] 1664946217
+25210306:EremiteElite_Male_Standard_Pole_03 - [N/A] 696066441
+25210307:Eremite_Male_Standard_Pole_01 - [N/A] 2671081977
+25210401:Eremite_MuscleMan_Gloves_01 - [N/A] 998410809
+25210402:Eremite_MuscleMan_Gloves_02 - [N/A] 839477089
+25210403:Eremite_MuscleMan_Gloves_03 - [N/A] 2628038825
+25210404:EremiteElite_MuscleMan_Gloves_01 - [N/A] 509218169
+25210405:EremiteElite_MuscleMan_Gloves_02 - [N/A] 4366953
+25210406:EremiteElite_MuscleMan_Gloves_03 - [N/A] 1385944497
+25210407:NPC_Quest_MuscleMan_Standard_Eremite_01 - [N/A] 3844535385
+25210501:Eremite_MuscleMan_Simitar_01 - [N/A] 914092905
+25210502:Eremite_MuscleMan_Simitar_02 - [N/A] 3484979137
+25210503:Eremite_MuscleMan_Simitar_03 - [N/A] 2747515289
+25210504:EremiteElite_MuscleMan_Simitar_01 - [N/A] 1621612097
+25210505:EremiteElite_MuscleMan_Simitar_02 - [N/A] 4251715865
+25210506:EremiteElite_MuscleMan_Simitar_03 - [N/A] 124112617
+25210507:Eremite_MuscleMan_Simitar_04 - [N/A] 1714026825
+25210601:Eremite_Male_Standard_NoWeapon_01 - [N/A] 3480498409
+25210602:Eremite_Male_Standard_NoWeapon_02 - [N/A] 1531750897
+25310101:Eremite_Female_Slim_PushDagger_01 - [N/A] 2984077569
+25310201:Eremite_Male_Standard_Glaive_01 - [N/A] 3154173257
+25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
+25310301:Eremite_Male_Standard_Polearm_01 - [N/A] 863506833
+25410101:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410102:Eremite_Male_Strong_Katar_02 - [N/A] 1317576089
+25410103:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410201:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410202:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410301:Eremite_Female_Standard_Oracle_01 - [N/A] 1223193297
+25410401:Monster_Eremite_Female_Standard_Dancer_01 - [N/A] 1223193297
 26010101:Крио попрыгунья
 26010102:Крио попрыгунья
 26010201:Пиро попрыгунья
@@ -335,28 +359,51 @@
 26060201:Гидро цицин
 26060301:Крио цицин
 26090101:Плавучий Гидро плесенник
-26090201:[N/A] 4206793049
-26090202:[N/A] 3825581857
-26090301:[N/A] 243798441
-26090401:[N/A] 2774139065
-26090501:[N/A] 1181717657
-26090601:[N/A] 4148148753
-26090701:[N/A] 2130513233
-26090801:[N/A] 554072617
-26090901:[N/A] 2734459225
-26091001:[N/A] 1409125529
-26120101:[N/A] 198051785
-26120201:[N/A] 2368019041
-26120301:[N/A] 3299184601
-26120401:[N/A] 4098645257
+26090190:Fungus_Un_Gamma_Water_Enemy - [N/A] 2798916145
+26090191:Fungus_Un_Gamma_Water_01_Capture - [N/A] 4229105793
+26090201:Fungus_Un_Delta_Grass_01 - [N/A] 4206793049
+26090202:Fungus_Un_Delta_Grass_01_02 - [N/A] 3825581857
+26090290:Fungus_Un_Delta_Grass_Enemy - [N/A] 2834173953
+26090291:Fungus_Un_Delta_Grass_01_Capture - [N/A] 3005241825
+26090301:Fungus_Un_Delta_Wind_01 - [N/A] 243798441
+26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
+26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090401:Fungus_Trois_Epsilon_Electric_01 - [N/A] 2774139065
+26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
+26090491:Fungus_Trois_Epsilon_Electric_01_Capture - [N/A] 3709881913
+26090501:Fungus_Trois_Alpha_Ice_01 - [N/A] 1181717657
+26090590:Fungus_Trois_Alpha_Ice_Enemy - [N/A] 4208292977
+26090591:Fungus_Trois_Alpha_Ice_01_Capture - [N/A] 1798960849
+26090601:Fungus_Trois_Gamma_Fire_01 - [N/A] 4148148753
+26090690:Fungus_Trois_Gamma_Fire_Enemy - [N/A] 4223971953
+26090691:Fungus_Trois_Gamma_Fire_01_Capture - [N/A] 3680085465
+26090701:Fungus_Deux_Alpha_Fire_01 - [N/A] 2130513233
+26090790:Fungus_Deux_Alpha_Fire_Enemy - [N/A] 1078684105
+26090791:Fungus_Deux_Alpha_Fire_01_Capture - [N/A] 2097382481
+26090801:Fungus_Deux_Epsilon_Wind_01 - [N/A] 554072617
+26090890:Fungus_Deux_Epsilon_Wind_Enemy - [N/A] 466604457
+26090891:Fungus_Deux_Epsilon_Wind_01_Capture - [N/A] 3913813441
+26090901:Fungus_Deux_Beta_Rock_01 - [N/A] 2734459225
+26090990:Fungus_Deux_Beta_Rock_Enemy - [N/A] 287229801
+26090991:Fungus_Deux_Beta_Rock_01_Capture - [N/A] 4221967233
+26091001:Fungus_Deux_Delta_Electric_01 - [N/A] 1409125529
+26091090:Fungus_Deux_Delta_Electric_Enemy - [N/A] 2977465545
+26091091:Fungus_Deux_Delta_Electric_01_Capture - [N/A] 2399196673
+26100301:Monster_Vulture_Sacred_Fire_01 - [N/A] 2399196673
+26100401:Monster_Scorpion_Sacred_Electric_01 - [N/A] 2399196673
+26100501:Monster_Chrysopelea_Sacred_Wind_01 - [N/A] 2399196673
+26120101:Fungus_Amanita_Unu_Anudatta_Grass_01 - [N/A] 198051785
+26120201:Fungus_Amanita_Unu_Svarita_Ices_01 - [N/A] 2368019041
+26120301:Fungus_Amanita_Du_Anudatta_Water_01 - [N/A] 3299184601
+26120401:Fungus_Amanita_Du_Udatta_Rock_01 - [N/A] 4098645257
 28020101:Снежная лиса
 28020102:Алая лиса
 28020103:Снежная лиса с подарками
 28020104:Снежная лиса с суперподарками
 28020105:Снежная лиса
 28020106:Алая лиса
-28020107:[N/A] 378885401
-28020108:[N/A] 2121972905
+28020107:Fox_02 - [N/A] 378885401
+28020108:Fox_01_03 - [N/A] 2121972905
 28020201:Белка
 28020301:Лесной кабан
 28020302:Лесной кабанчик
@@ -367,12 +414,12 @@
 28020307:Лесной кабан
 28020308:Замороженный снежный кабан
 28020309:Король снежных кабанов
-28020310:[N/A] 1922000329
-28020311:[N/A] 3804855321
-28020312:[N/A] 1052664969
-28020313:[N/A] 2391061289
-28020314:[N/A] 2761000073
-28020315:[N/A] 977650529
+28020310:Boar_02_Hunt - [N/A] 1922000329
+28020311:Boar_01_Hunt - [N/A] 3804855321
+28020312:Boar_03_Hunt - [N/A] 1052664969
+28020313:Boar_Grass - [N/A] 2391061289
+28020314:Boar_Grass_Small - [N/A] 2761000073
+28020315:Boar_09 - [N/A] 977650529
 28020401:Полярная гончая
 28020402:Лесная патрульная
 28020403:Сиба-ину
@@ -409,10 +456,11 @@
 28020901:Пёс-самурай (Патруль)
 28020902:Пёс-самурай (Бой)
 28020903:Таромару
+28020904:Inu_Shihandai_04 - [N/A] 467002241
 28030101:Лазурный журавль
 28030102:Фиолетовый ибис
-28030103:[N/A] 434877481
-28030104:[N/A] 3431473329
+28030103:Crane_01 - [N/A] 434877481
+28030104:Crane_01_Lbis - [N/A] 3431473329
 28030201:Бурокрылый сокол
 28030202:Янтарнохвостый сокол
 28030203:Каменный коршун
@@ -428,8 +476,9 @@
 28030309:Среброкрылый голубь
 28030310:Багровый голубь
 28030311:Чёрный голубь
-28030312:[N/A] 1045054721
-28030313:[N/A] 45487625
+28030312:Pigeon_01 - [N/A] 1045054721
+28030313:Pigeon_Beak_01 - [N/A] 45487625
+28030314:Crow_01 - [N/A] 3254419441
 28030401:Алый зяблик
 28030402:Золотой зяблик
 28030403:Снежный зяблик
@@ -441,9 +490,8 @@
 28030409:Изумрудный зяблик
 28030501:Красноклювая утка
 28030502:Изумрудная утка
-28030503:Жёлтая утка
 28030504:Красноклювая утка
-28030505:[N/A] 3375863305
+28030505:Wigeon_01 - [N/A] 3375863305
 28040703:Дрейфующий скат
 28050201:Хорёк-воришка
 28050202:Хорёк-барахольщик
@@ -455,49 +503,49 @@
 28050221:Хорёк-воришка
 28050222:Хорёк-барахольщик
 28050223:Золотой хорёк-воришка
-28060101:[N/A] 128716817
-28060102:[N/A] 2866718929
-28060103:[N/A] 1328271489
-28060201:[N/A] 2538068521
-28060202:[N/A] 3539690529
-28060203:[N/A] 3418949673
-28060301:[N/A] 1575409961
-28060302:[N/A] 35400545
-28060401:[N/A] 2550380273
-28060402:[N/A] 1827515817
-28060501:[N/A] 2910802777
-28060502:[N/A] 3424336233
-28060503:[N/A] 3938050385
-28060504:[N/A] 457094737
-28060505:[N/A] 3374220305
-28060506:[N/A] 1349374089
-28060509:[N/A] 1497649297
-28060510:[N/A] 3380533609
-28060511:[N/A] 423020265
-28060512:[N/A] 112703337
-28060513:[N/A] 2396817929
-28060601:[N/A] 2825466249
-28060602:[N/A] 409501041
-28060603:[N/A] 2740821897
-28060604:[N/A] 2340527241
-28060605:[N/A] 37512633
-28060606:[N/A] 2214856321
-28060609:[N/A] 1426424937
-28060610:[N/A] 3717654113
-28060611:[N/A] 1648208073
-28060612:[N/A] 2053098161
-28060613:[N/A] 276253497
-28060614:[N/A] 465761521
-28060701:[N/A] 3963893857
-28060801:[N/A] 3494586161
-28060901:[N/A] 3910686713
-28061001:[N/A] 3720242777
-28061002:[N/A] 3801760225
-28061101:[N/A] 3407624849
-28061201:[N/A] 2733673945
-28061301:[N/A] 3469996769
-28061401:[N/A] 2330015681
-28061402:[N/A] 3443985385
+28060101:Gator_01 - [N/A] 128716817
+28060102:Gator_Strong_01 - [N/A] 2866718929
+28060103:Gator_01 - [N/A] 1328271489
+28060201:Panther_01 - [N/A] 2538068521
+28060202:Panther_Strong_01 - [N/A] 3539690529
+28060203:Panther_01 - [N/A] 3418949673
+28060301:Vulture_01 - [N/A] 1575409961
+28060302:Vulture_01 - [N/A] 35400545
+28060401:Scorpion_01 - [N/A] 2550380273
+28060402:Scorpion_01 - [N/A] 1827515817
+28060501:Megamoth_Desert_01 - [N/A] 2910802777
+28060502:Megamoth_Desert_02 - [N/A] 3424336233
+28060503:Megamoth_Desert_03 - [N/A] 3938050385
+28060504:Megamoth_Desert_01 - [N/A] 457094737
+28060505:Megamoth_Desert_02 - [N/A] 3374220305
+28060506:Megamoth_Desert_03 - [N/A] 1349374089
+28060509:Megamoth_Desert_04 - [N/A] 1497649297
+28060510:Megamoth_Desert_05 - [N/A] 3380533609
+28060511:Megamoth_Desert_06 - [N/A] 423020265
+28060512:Megamoth_Desert_07 - [N/A] 112703337
+28060513:Megamoth_Desert_08 - [N/A] 2396817929
+28060601:Megamoth_Jungle_01 - [N/A] 2825466249
+28060602:Megamoth_Jungle_02 - [N/A] 409501041
+28060603:Megamoth_Jungle_03 - [N/A] 2740821897
+28060604:Megamoth_Jungle_01 - [N/A] 2340527241
+28060605:Megamoth_Jungle_02 - [N/A] 37512633
+28060606:Megamoth_Jungle_03 - [N/A] 2214856321
+28060609:Megamoth_Jungle_Strong_01 - [N/A] 1426424937
+28060610:Megamoth_Jungle_04 - [N/A] 3717654113
+28060611:Megamoth_Jungle_05 - [N/A] 1648208073
+28060612:Megamoth_Jungle_06 - [N/A] 2053098161
+28060613:Megamoth_Jungle_07 - [N/A] 276253497
+28060614:Megamoth_Jungle_08 - [N/A] 465761521
+28060701:Megamoth_Desert_04 - [N/A] 3963893857
+28060801:Megamoth_Desert_05 - [N/A] 3494586161
+28060901:Megamoth_Desert_06 - [N/A] 3910686713
+28061001:Megamoth_Desert_07 - [N/A] 3720242777
+28061002:Megamoth_Desert_08 - [N/A] 3801760225
+28061101:Megamoth_Jungle_04 - [N/A] 3407624849
+28061201:Megamoth_Jungle_05 - [N/A] 2733673945
+28061301:Megamoth_Jungle_06 - [N/A] 3469996769
+28061401:Megamoth_Jungle_07 - [N/A] 2330015681
+28061402:Megamoth_Jungle_08 - [N/A] 3443985385
 28210101:Чайник безмятежности: золотистый краб
 28210102:Чайник безмятежности: солнечный краб
 28210103:Чайник безмятежности: водный краб
@@ -510,23 +558,23 @@
 28210205:Чайник безмятежности: золотистый аксолотль
 28210206:Чайник безмятежности: небесный аксолотль
 28210207:Чайник безмятежности: мозгоядный ящер
-28210208:[N/A] 4168682209
+28210208:Homeworld_Lizard_05 - [N/A] 4168682209
 28210301:Чайник безмятежности: лягушка
 28210302:Чайник безмятежности: грязевая лягушка
 28210303:Чайник безмятежности: синяя лягушка
-28210304:[N/A] 1743923249
+28210304:Homeworld_Frog_04 - [N/A] 1743923249
 28210401:Чайник безмятежности: узорный унаги
 28210402:Чайник безмятежности: Глубоководный унаги
 28210403:Чайник безмятежности: краснопёрый унаги
-28210404:[N/A] 1020919801
+28210404:Homeworld_Eel_04 - [N/A] 1020919801
 28220101:Чайник безмятежности: снежная лиса
 28220102:Чайник безмятежности: алая лиса
-28220108:[N/A] 3596224209
+28220108:Homeworld_Fox_03 - [N/A] 3596224209
 28220201:Чайник безмятежности: белка
 28220301:Чайник безмятежности: лесной кабан
 28220303:Чайник безмятежности: снежный кабан
-28220313:[N/A] 2460569713
-28220314:[N/A] 3974077529
+28220313:Homeworld_Boar_Grass - [N/A] 2460569713
+28220314:Homeworld_Boar_Grass_Small - [N/A] 3974077529
 28220401:Чайник безмятежности: полярная гончая
 28220402:Чайник безмятежности: лесная патрульная гончая
 28220403:Чайник безмятежности: сиба-ину
@@ -540,20 +588,20 @@
 28220601:Чайник безмятежности: снежный хорёк
 28220602:Чайник безмятежности: краснохвостый хорёк
 28220603:Чайник безмятежности: сапожный хорёк
-28220604:[N/A] 3102074185
+28220604:Homeworld_Marten_04 - [N/A] 3102074185
 28220605:Чайник безмятежности: Хорёк сиреневой молнии
 28220701:Чайник безмятежности: кицунэ
 28220901:Чайник безмятежности: Кагэромару
 28230101:Чайник безмятежности: лазурный журавль
 28230102:Чайник безмятежности: фиолетовый ибис
-28230104:[N/A] 811422561
+28230104:Homeworld_Crane_01_Lbis - [N/A] 811422561
 28230301:Чайник безмятежности: белый голубь
 28230302:Чайник безмятежности: коронованный голубь
 28230303:Чайник безмятежности: среброкрылый голубь
 28230304:Чайник безмятежности: багровый голубь
 28230305:Чайник безмятежности: чёрный голубь
 28230306:Чайник безмятежности: ворон
-28230313:[N/A] 3724967537
+28230313:Homeworld_Pigeon_Beak_01 - [N/A] 3724967537
 28230401:Чайник безмятежности: алый зяблик
 28230402:Чайник безмятежности: золотой зяблик
 28230403:Чайник безмятежности: снежный зяблик
@@ -581,20 +629,20 @@
 28240602:Чайник безмятежности: горький иглобрюх
 28240701:Чайник безмятежности: Дивдинский скат
 28240702:Чайник безмятежности: Фумарольный скат
-28240801:[N/A] 2213501889
-28240802:[N/A] 2420839809
-28240803:[N/A] 619347953
-28240804:[N/A] 2847515857
-28240901:[N/A] 4288334729
-28240902:[N/A] 2843011617
+28240801:Homeworld_Fishable_Maritime_Batdiodan_01 - [N/A] 2213501889
+28240802:Homeworld_Fishable_Maritime_Batdiodan_02 - [N/A] 2420839809
+28240803:Homeworld_Fishable_Maritime_Batdiodan_03 - [N/A] 619347953
+28240804:Homeworld_Fishable_Maritime_Batdiodan_04 - [N/A] 2847515857
+28240901:Homeworld_Fishable_Maritime_Apsva_01 - [N/A] 4288334729
+28240902:Homeworld_Fishable_Maritime_Apsva_02 - [N/A] 2843011617
 28250101:Чайник безмятежности: кристальная бабочка Анемо
 28250102:Чайник безмятежности: кристальная бабочка Гео
 28250103:Чайник безмятежности: кристальная бабочка Крио
 28250104:Чайник безмятежности: кристальная бабочка Электро
 28250105:Чайник безмятежности: Коралловая бабочка
-28250106:[N/A] 3343647737
+28250106:Homeworld_Wisp_Grass_01 - [N/A] 3343647737
 28250301:Чайник безмятежности: Светлячок удачи
-28250401:[N/A] 741074761
+28250401:Homeworld_Boltbug_Scarab_01 - [N/A] 741074761


 // BOSS
@@ -605,8 +653,13 @@
 20040301:Гео гипостазис Гимель
 20040302:Гео гипостазис Гимель
 20040401:Гидро гипостазис
+20040402:Effigy_Water_02 - [N/A] 2510499945
 20040501:Крио гипостазис
+20040502:Effigy_Ice_01 - [N/A] 244519785
 20040601:Пиро гипостазис
+20040602:Effigy_Fire_02 - [N/A] 802657121
+20040701:Effigy_Grass_01 - [N/A] 572615921
+20040702:Effigy_Grass_02 - [N/A] 2410347593
 20050101:Океанид
 20050102:Океанид
 20070101:Манифестация грома
@@ -614,12 +667,13 @@
 24010401:Змей руин
 24021101:Бесконечный механический массив
 24021102:Бесконечный механический массив
-24030301:[N/A] 3108339881
-24050101:[N/A] 2629579681
+24030301:Gargoyle_Fafnir_01 - [N/A] 3108339881
+24050101:Monolith_Starchild - [N/A] 2629579681
 25090101:Магу кэнки
 25090102:Магу кэнки: Бунсин ветра
 25090103:Магу кэнки: Бунсин льда
 25090104:Магу кэнки: Бунсин маски
+25090105:Samurai_Ningyo_05 - Генерал-марионетка: Бунсин маски
 25090201:Магу кэнки: Одинокий ветер
 25090301:Магу кэнки: Бегущий иней
 25090401:Магу кэнки: Маска ужаса
@@ -628,7 +682,7 @@
 26020101:Крио папоротник
 26020102:Крио папоротник
 26020201:Пиро орхидея
-26020301:[N/A] 67218681
+26020301:Regisvine_Electric - [N/A] 67218681
 26050101:Древний геовишап - Гидро
 26050201:Древний геовишап - Пиро
 26050301:Древний геовишап - Крио
@@ -639,7 +693,8 @@
 26050801:Вишап глубин: Громоглот
 26050802:Вишап глубин: Громоглот
 26080101:Бешт
-26110101:[N/A] 4290207929
+26110101:Fungus_Raptor - [N/A] 4290207929
+26130101:Sandworm_01 - [N/A] 4098645257
 29010101:Ужас Бури
 29010102:Ужас Бури
 29010103:Ужас Бури
@@ -666,6 +721,12 @@
 29060201:Магацу митакэ Наруками но микото
 29060202:Магацу митакэ Наруками но микото
 29060203:Магацу митакэ Наруками но микото
+29070101:Monster_Nada - [N/A] 3425649649
+29070102:Monster_Nada - [N/A] 996756049
+29070103:Monster_Nada - [N/A] 887141825
+29070104:Monster_Nada - [N/A] 3834332121
+29070105:Monster_Nada - [N/A] 1547264913
+29070106:Monster_Nada - [N/A] 641768601


 // Животное
@@ -682,15 +743,15 @@
 28010205:Золотистый аксолотль
 28010206:Небесный аксолотль
 28010207:Мозгоядный ящер
-28010208:[N/A] 404479849
+28010208:Lizard_05 - [N/A] 404479849
 28010301:Лягушка
 28010302:Грязевая лягушка
 28010303:Синяя лягушка
-28010304:[N/A] 13583441
+28010304:Frog_04 - [N/A] 13583441
 28010401:Узорный унаги
 28010402:Глубоководный унаги
 28010403:Краснопёрый унаги
-28010404:[N/A] 2823603497
+28010404:Eel_04 - [N/A] 2823603497
 28040101:Чёрный окунь
 28040102:Голубой окунь
 28040103:Золотистый окунь
@@ -704,9 +765,15 @@
 28050103:Кристальная бабочка Крио
 28050104:Кристальная бабочка Электро
 28050105:Коралловая бабочка
-28050106:[N/A] 149328065
+28050106:Wisp_Grass_01 - [N/A] 149328065
 28050301:Светлячок удачи
-28050401:[N/A] 2466918521
+28050401:Boltbug_Scarab_01 - [N/A] 2466918521
+28050501:Electrohercules_01 - [N/A] 2466918521
+28050502:Electrohercules_02 - [N/A] 2466918521
+28050503:Electrohercules_03 - [N/A] 2466918521
+28050504:Electrohercules_04 - [N/A] 2466918521
+28050505:Electrohercules_05 - [N/A] 2466918521
+28050506:Electrohercules_06 - [N/A] 2466918521


 // Рыбы
@@ -733,12 +800,12 @@
 28040602:Горький иглобрюх
 28040701:Дивдинский скат
 28040702:Фумарольный скат
-28040801:[N/A] 1381140681
-28040802:[N/A] 3230531961
-28040803:[N/A] 2534877817
-28040804:[N/A] 1321673065
-28040901:[N/A] 3639121545
-28040902:[N/A] 3476332937
+28040801:Fishable_Maritime_Batdiodan_01 - [N/A] 1381140681
+28040802:Fishable_Maritime_Batdiodan_02 - [N/A] 3230531961
+28040803:Fishable_Maritime_Batdiodan_03 - [N/A] 2534877817
+28040804:Fishable_Maritime_Batdiodan_04 - [N/A] 1321673065
+28040901:Fishable_Maritime_Apsva_01 - [N/A] 3639121545
+28040902:Fishable_Maritime_Apsva_02 - [N/A] 3476332937


 // Партнёр
--- a/Source/GrasscutterTools/Resources/ru-ru/Quest.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Quest.txt
@@ -24,6 +24,7 @@
 30325:[EN] - Goddess Statue Unlocked - [N/A] 1854299071
 30326:[EN] - Goddess Statue Unlocked - [N/A] 853608247
 30327:[EN] - Goddess Statue Unlocked - [N/A] 416738111
+30328:[EN] - Goddess Statue Unlocked - [N/A] 416738111
 30600:Ветра прошлого - Встретьте Эмбер у входа в храм
 30601:Ветра прошлого - Поговорите с Эмбер
 30602:Ветра прошлого - Войдите в храм
@@ -597,7 +598,7 @@
 48618:Когда поднимается западный ветер - Завершите задание Сары.
 48619:Когда поднимается западный ветер - Завершите все поручения
 48701:Тоска Маргариты - Поговорите с Маргаритой
-48702:Тоска Маргариты - Найдите Маленького Принца
+48702:Тоска Маргариты - Найдите Принца
 48703:Тоска Маргариты - Выполните поручение Маргариты
 48704:Тоска Маргариты - Найдите кошку
 48705:Тоска Маргариты - Найдите кошку
@@ -1909,7 +1910,7 @@
 301803:Четыре обнажённых клинка - Поговорите с аль-Хайтамом
 301804:Четыре обнажённых клинка - Направляйтесь в деревню Аару
 301805:Четыре обнажённых клинка - Обменяйтесь информацией с жителями
-301806:Четыре обнажённых клинка - Направляйтесь к дому старосты деревни Аару и проверьте обстановку
+301806:Четыре обнажённых клинка - Проверьте обстановку около дома старосты деревни Аару
 301807:Четыре обнажённых клинка - Одолейте появившихся монстров
 301808:Четыре обнажённых клинка - Поговорите с толпой
 301809:Четыре обнажённых клинка - Отправляйтесь в другое место и обсудите всё с Сайно
@@ -1933,7 +1934,7 @@
 301916:Пропавшие хранители деревни - Поговорите с Дэхьей
 301917:Пропавшие хранители деревни - Победите радикалов
 301918:Пропавшие хранители деревни - Поговорите с Дэхьей
-301919:Пропавшие хранители деревни - Дождитесь утра (06:00 - 12:00)
+301919:Пропавшие хранители деревни - Дождитесь утра следующего дня (6:00 - 12:00)
 301920:Пропавшие хранители деревни - Поговорите с Кандакией
 301921:Пропавшие хранители деревни - Поговорите с Дэхьей
 302001:Плач из больницы - Найдите человека, о котором рассказал аль-Хайтам
@@ -1945,7 +1946,7 @@
 302007:Плач из больницы - Исследуйте элементальные монументы возле больницы
 302008:Плач из больницы - Спуститесь на нижний этаж больницы
 302009:Плач из больницы - Поговорите с людьми, которые находятся перед вами
-302010:Плач из больницы - Вернитесь в дом старосты деревни Аару, чтобы встретиться с остальными
+302010:Плач из больницы - Вернитесь к дому деревенского старосты и встретьтесь с остальными
 302011:Плач из больницы - Следуйте за Сайно
 302012:Плач из больницы - Поговорите с Сайно
 302013:Плач из больницы - Следуйте за Сайно
@@ -1975,94 +1976,94 @@
 302114:Тайна знойной пустыни - Дождитесь утра следующего дня (06:00 - 08:00)
 302115:Тайна знойной пустыни - [CHS] - 播放CS$HIDDEN
 302116:Тайна знойной пустыни - Отправляйтесь вглубь руин
-302201:[N/A] 0 - Дождитесь следующего дня (8:00 - 12:00)
-302202:[N/A] 0 - Направляйтесь в Академию и найдите аль-Хайтама
-302203:[N/A] 0 - Войдите в Академию вместе с аль-Хайтамом
-302204:[N/A] 0 - Войдите в Дом даэны
-302205:[N/A] 0 - Поговорите с аль-Хайтамом
-302206:[N/A] 0 - Спрячьтесь и дождитесь подходящего момента
-302207:[N/A] 0 - [N/A] 3442967412
-302208:[N/A] 0 - Поговорите с Паймон
-302209:[N/A] 0 - Найдите способ связаться с сознанием Нахиды
-302210:[N/A] 0 - Поговорите с сознанием Нахиды
-302211:[N/A] 0 - Поговорите с шейхом Зубаиром
-302212:[N/A] 0 - Направляйтесь к Академии
-302213:[N/A] 0 - Направляйтесь к Академии
-302214:[N/A] 0 - [N/A] 1732046580
-302215:[N/A] 0 - Поговорите с Паймон
-302216:[N/A] 0 - Антракт: Дэхья разговаривает с Рахманом
-302217:[N/A] 0 - Заманите стражу в ловушку
-302218:[N/A] 0 - Антракт: великий мудрец Азар направляется в Храм Сурастаны
-302219:[N/A] 0 - Антракт: беспокойство великого мудреца Азара
-302220:[N/A] 0 - Антракт: великий мудрец Азар направляется в Храм Сурастаны
-302221:[N/A] 0 - Поговорите с Паймон
-302222:[N/A] 0 - Отправляйтесь в Храм Сурастаны
-302223:[N/A] 0 - Поговорите с Нахидой
-302224:[N/A] 0 - Заманите стражу в ловушку
-302225:[N/A] 0 - [N/A] 1295878188
-302226:[N/A] 0 - Поговорите с шейхом Зубаиром
-302227:[N/A] 0 - Поговорите с Паймон
-302228:[N/A] 0 - Антракт: Дэхья разговаривает с Рахманом
-302229:[N/A] 0 - Антракт: беспокойство великого мудреца Азара
-302230:[N/A] 0 - Поговорите с Паймон
-302231:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302232:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302233:[N/A] 0 - Поговорите с Паймон
-302234:[N/A] 0 - [N/A] 403262332
-302235:[N/A] 0 - [N/A] 3258363788
-302236:[N/A] 0 - [N/A] 2830775676
-302237:[N/A] 0 - [N/A] 33960564
-302238:[N/A] 0 - [N/A] 3034910092
-302239:[N/A] 0 - [N/A] 1042508412
-302240:[N/A] 0 - [N/A] 2334919076
-302241:[N/A] 0 - Покиньте Храм Сурастаны
-302242:[N/A] 0 - [N/A] 2103971276
-302243:[N/A] 0 - [N/A] 2524469860
-302244:[N/A] 0 - [N/A] 3247687540
-302245:[N/A] 0 - [N/A] 4115109332
-302246:[N/A] 0 - [N/A] 2898922556
-302247:[N/A] 0 - [N/A] 1634110884
-302248:[N/A] 0 - [N/A] 1799067076
-302249:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302201:Тайна знойной пустыни - Дождитесь следующего дня (8:00 - 12:00)
+302202:Тайна знойной пустыни - Направляйтесь в Академию и найдите аль-Хайтама
+302203:Тайна знойной пустыни - Войдите в Академию вместе с аль-Хайтамом
+302204:Тайна знойной пустыни - Войдите в Дом даэны
+302205:Тайна знойной пустыни - Поговорите с аль-Хайтамом
+302206:Тайна знойной пустыни - Спрячьтесь и дождитесь подходящего момента
+302207:Тайна знойной пустыни - [N/A] 3442967412
+302208:Тайна знойной пустыни - Поговорите с Паймон
+302209:Тайна знойной пустыни - Найдите способ связаться с сознанием Нахиды
+302210:Тайна знойной пустыни - Поговорите с сознанием Нахиды
+302211:Тайна знойной пустыни - Поговорите с шейхом Зубаиром
+302212:Тайна знойной пустыни - Направляйтесь к Академии
+302213:Тайна знойной пустыни - Направляйтесь к Академии
+302214:Тайна знойной пустыни - [N/A] 1732046580
+302215:Тайна знойной пустыни - Поговорите с Паймон
+302216:Тайна знойной пустыни - Антракт: Дэхья разговаривает с Рахманом
+302217:Тайна знойной пустыни - Заманите стражу в ловушку
+302218:Тайна знойной пустыни - Антракт: великий мудрец Азар направляется в Храм Сурастаны
+302219:Тайна знойной пустыни - Антракт: беспокойство великого мудреца Азара
+302220:Тайна знойной пустыни - Антракт: великий мудрец Азар направляется в Храм Сурастаны
+302221:Тайна знойной пустыни - Поговорите с Паймон
+302222:Тайна знойной пустыни - Отправляйтесь в Храм Сурастаны
+302223:Тайна знойной пустыни - Поговорите с Нахидой
+302224:Тайна знойной пустыни - Заманите стражу в ловушку
+302225:Тайна знойной пустыни - [N/A] 1295878188
+302226:Тайна знойной пустыни - Поговорите с шейхом Зубаиром
+302227:Тайна знойной пустыни - Поговорите с Паймон
+302228:Тайна знойной пустыни - Антракт: Дэхья разговаривает с Рахманом
+302229:Тайна знойной пустыни - Антракт: беспокойство великого мудреца Азара
+302230:Тайна знойной пустыни - Поговорите с Паймон
+302231:Тайна знойной пустыни - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302232:Тайна знойной пустыни - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302233:Тайна знойной пустыни - Поговорите с Паймон
+302234:Тайна знойной пустыни - [N/A] 403262332
+302235:Тайна знойной пустыни - [N/A] 3258363788
+302236:Тайна знойной пустыни - [N/A] 2830775676
+302237:Тайна знойной пустыни - [N/A] 33960564
+302238:Тайна знойной пустыни - [N/A] 3034910092
+302239:Тайна знойной пустыни - [N/A] 1042508412
+302240:Тайна знойной пустыни - [N/A] 2334919076
+302241:Тайна знойной пустыни - Покиньте Храм Сурастаны
+302242:Тайна знойной пустыни - [N/A] 2103971276
+302243:Тайна знойной пустыни - [N/A] 2524469860
+302244:Тайна знойной пустыни - [N/A] 3247687540
+302245:Тайна знойной пустыни - [N/A] 4115109332
+302246:Тайна знойной пустыни - [N/A] 2898922556
+302247:Тайна знойной пустыни - [N/A] 1634110884
+302248:Тайна знойной пустыни - [N/A] 1799067076
+302249:Тайна знойной пустыни - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
 302301:[N/A] 0 - [CHS] - （test）隐藏子任务带闲置对话$HIDDEN
-302401:[N/A] 0 - Поговорите с Кандакией
-302402:[N/A] 0 - Отправляйтесь на встречу с аль-Хайтамом
-302403:[N/A] 0 - Отправляйтесь на базу к Пустынникам
-302404:[N/A] 0 - Отправляйтесь в Караван-рибат на встречу с Сайно
-302405:[N/A] 0 - Поговорите со стражниками в Караван-рибате
-302406:[N/A] 0 - Дождитесь назначенного времени (через два дня)
-302407:[N/A] 0 - Отправляйтесь в восточную часть Моря красных песков
-302408:[N/A] 0 - Помогите Сайно арестовать Пустынников
-302409:[N/A] 0 - Поговорите с Сайно
-302410:[N/A] 0 - Дождитесь следующего дня
-302411:[N/A] 0 - Войдите в дом старосты деревни Аару
-302412:[N/A] 0 - Поговорите с Кандакией
-302413:[N/A] 0 - Войдите в дом старосты деревни Аару
-302414:[N/A] 0 - Покиньте дом старосты деревни Аару
-302501:[N/A] 0 - Отправляйтесь в Караван-рибат на встречу с Дэхьей
-302502:[N/A] 0 - Отправляйтесь в Пардис Дхяй и отыщите Тигнари
-302503:[N/A] 0 - Отправляйтесь в Порт-Ормос
-302504:[N/A] 0 - Следуйте за солдатами Фатуи
-302505:[N/A] 0 - Поговорите с Дэхьей
-302506:[N/A] 0 - Как можно скорее отправляйтесь в Пардис Дхяй
-302507:[N/A] 0 - Победите атакующих Фатуи
-302508:[N/A] 0 - Поговорите с Тигнари
-302509:[N/A] 0 - Найдите Тигнари и Дэхью
-302510:[N/A] 0 - Отправляйтесь к Хайпасии
-302511:[N/A] 0 - Дождитесь назначенного времени (19:00 - 21:00)
-302512:[N/A] 0 - Отправляйтесь на Большой базар
-302513:[N/A] 0 - Спрячьтесь в викале «Фундук»
-302514:[N/A] 0 - Вместе с Дэхьей проследите за Доктором
-302515:[N/A] 0 - Поговорите с Дэхьей
-302516:[N/A] 0 - Покиньте Пардис Дхяй и поговорите с Дэхьей
-302517:[N/A] 0 - [CHS] - (test)(hide)删除船只$HIDDEN
+302401:Тайна знойной пустыни - Поговорите с Кандакией
+302402:Тайна знойной пустыни - Отправляйтесь на встречу с аль-Хайтамом
+302403:Тайна знойной пустыни - Отправляйтесь на базу к Пустынникам
+302404:Тайна знойной пустыни - Отправляйтесь в Караван-рибат на встречу с Сайно
+302405:Тайна знойной пустыни - Поговорите со стражниками в Караван-рибате
+302406:Тайна знойной пустыни - Дождитесь назначенного времени (через два дня)
+302407:Тайна знойной пустыни - Отправляйтесь в восточную часть Моря красных песков
+302408:Тайна знойной пустыни - Помогите Сайно арестовать Пустынников
+302409:Тайна знойной пустыни - Поговорите с Сайно
+302410:Тайна знойной пустыни - Дождитесь следующего дня
+302411:Тайна знойной пустыни - Войдите в дом старосты деревни Аару
+302412:Тайна знойной пустыни - Поговорите с Кандакией
+302413:Тайна знойной пустыни - Войдите в дом старосты деревни Аару
+302414:Тайна знойной пустыни - Покиньте дом старосты деревни Аару
+302501:Тайна знойной пустыни - Отправляйтесь в Караван-рибат на встречу с Дэхьей
+302502:Тайна знойной пустыни - Отправляйтесь в Пардис Дхяй и отыщите Тигнари
+302503:Тайна знойной пустыни - Отправляйтесь в Порт-Ормос
+302504:Тайна знойной пустыни - Следуйте за солдатами Фатуи
+302505:Тайна знойной пустыни - Поговорите с Дэхьей
+302506:Тайна знойной пустыни - Как можно скорее отправляйтесь в Пардис Дхяй
+302507:Тайна знойной пустыни - Победите атакующих Фатуи
+302508:Тайна знойной пустыни - Поговорите с Тигнари
+302509:Тайна знойной пустыни - Найдите Тигнари и Дэхью
+302510:Тайна знойной пустыни - Отправляйтесь к Хайпасии
+302511:Тайна знойной пустыни - Дождитесь назначенного времени (19:00 - 21:00)
+302512:Тайна знойной пустыни - Отправляйтесь на Большой базар
+302513:Тайна знойной пустыни - Спрячьтесь в викале «Фундук»
+302514:Тайна знойной пустыни - Вместе с Дэхьей проследите за Доктором
+302515:Тайна знойной пустыни - Поговорите с Дэхьей
+302516:Тайна знойной пустыни - Покиньте Пардис Дхяй и поговорите с Дэхьей
+302517:Тайна знойной пустыни - [CHS] - (test)(hide)删除船只$HIDDEN
 302601:[N/A] 0 - [CHS] - (test)(hide)刷柯莱的早餐$HIDDEN
 302602:[N/A] 0 - Поговорите с Коллеи
 302603:[N/A] 0 - Отправляйтесь на Большой базар
 302604:[N/A] 0 - Войдите в Дом даэны и отыщите аль-Хайтама
 302605:[N/A] 0 - Отправляйтесь в Порт-Ормос
 302606:[N/A] 0 - Направляйтесь в деревню Аару
-302607:[N/A] 0 - Дождитесь начала праздника (19:00 - 24:00)
+302607:[N/A] 0 - Дождитесь начала праздника через два дня (19:00 - 24:00)
 302608:[N/A] 0 - Отправляйтесь на праздник, который устроили на Большом базаре
 302611:[N/A] 0 - Поговорите с присутствующими на празднике
 302612:[N/A] 0 - Поговорите с присутствующими на празднике
@@ -2589,7 +2590,7 @@
 1101336:Созерцатель Морей - Разыщите Шэнь Хэ на строительной площадке Нефритового дворца
 1101337:Созерцатель Морей - [CHS] - (test)对话2开始调时间$HIDDEN
 1101401:Пыль прошлого - Получите сведения на строительной площадке
-1101402:Пыль прошлого - Спросите у старого Чжана о ядрах чудес
+1101402:Пыль прошлого - Спросите у мастера Чжана о ядрах чудес
 1101403:Пыль прошлого - Найдите <color=#00E1FFFF>руду осколков звёзд</color> с помощью Глаза Бога
 1101404:Пыль прошлого - Спросите старика в деревне о суброзии
 1101405:Пыль прошлого - [CHS] - (test)寻找矿石文献$HIDDEN
@@ -2597,7 +2598,7 @@
 1101407:Пыль прошлого - Найдите суброзий
 1101408:Пыль прошлого - [CHS] - (test)【废弃】与申鹤对话
 1101409:Пыль прошлого - [CHS] - (test)【废弃】返回将草药交给小孩子
-1101410:Пыль прошлого - Отдайте два куска руды старому Чжану
+1101410:Пыль прошлого - Отдайте два куска руды мастеру Чжану
 1101411:Пыль прошлого - [CHS] - (test)与云堇对话$HIDDEN
 1101412:Пыль прошлого - [CHS] - (test)寻找矿石文献$HIDDEN
 1101413:Пыль прошлого - [CHS] - (test)与云堇对话$HIDDEN
@@ -3583,12 +3584,12 @@
 1300712:Когда пьесы больше не ставят - Вместе вернитесь в Сумеру
 1300713:Когда пьесы больше не ставят - Отправляйтесь за город на поиски Инайи
 1300714:Когда пьесы больше не ставят - [N/A] 964770692
-1300801:Ценность единства - Дождитесь начала дебатов через два дня (15:00 - 18:00)
+1300801:Ценность единства - Подождите два дня до начала дебатов (15:00 - 18:00)
 1300802:Ценность единства - Отправляйтесь в театр и посмотрите дебаты
 1300803:Ценность единства - [N/A] 2411157060
 1300804:Ценность единства - Поговорите с Нилу
 1300805:Ценность единства - [N/A] 2748820748
-1300806:Ценность единства - Дождитесь дебатов через два дня (20:00 - 22:00)
+1300806:Ценность единства - Подождите два дня (до 20:00 - 22:00)
 1300807:Ценность единства - Отправляйтесь в театр, чтобы увидеться с Инайей
 1300808:Ценность единства - [N/A] 3480922884
 1300901:Подозрения по поводу контрабанды - Осмотритесь в Академии
@@ -3652,7 +3653,7 @@
 1301302:[N/A] 0 - Поговорите с Петрушем
 1301303:[N/A] 0 - Отправляйтесь следом за Петрушем на Мгновение сновидений
 1301304:[N/A] 0 - Отправляйтесь к месту, указанному Ильманом
-1301305:[N/A] 0 - Одолейте нападающих монстров
+1301305:[N/A] 0 - Победите монстров перед вами
 1301306:[N/A] 0 - Поговорите с Ильманом
 1301307:[N/A] 0 - Вернитесь на Мгновение сновидений, чтобы узнать, как обстоят дела
 1301308:[N/A] 0 - Позаботьтесь о расстроенном Ильмане
@@ -5793,7 +5794,7 @@
 2102910:Небольшое путешествие: Выученные рецепты - Научите малыша Мэна готовить
 2103001:Небольшое путешествие: Способы самозащиты - Поговорите с малышом Мэном
 2103002:Небольшое путешествие: Способы самозащиты - Идите к скоплению монстров и победите их
-2103003:Небольшое путешествие: Способы самозащиты - Поговорите со Старым Чжаном
+2103003:Небольшое путешествие: Способы самозащиты - Поговорите с мастером Чжаном
 2103101:Незваные гости - Поговорите с Хуай Анем
 2103102:Незваные гости - Идите в лагерь монстров и победите их
 2103103:Незваные гости - Осмотрите окрестности
@@ -6492,7 +6493,7 @@
 2301101:Ещё один равноценный обмен - Поговорите с Виктором
 2301102:Ещё один равноценный обмен - Поговорите с Хамави
 2301103:Ещё один равноценный обмен - Вернитесь к тому месту, где стоит повозка
-2301104:Ещё один равноценный обмен - Победите всех плесенников и верните деревянную доску
+2301104:Ещё один равноценный обмен - Победите плесенников и заберите деревянную доску
 2301105:Ещё один равноценный обмен - Вернитесь к Хамави
 2301106:Ещё один равноценный обмен - Поговорите с Виктором
 2301107:Ещё один равноценный обмен - [CHS] - 打倒所有蕈兽$HIDDEN
@@ -6646,20 +6647,20 @@
 2303201:Ещё один равноценный обмен! - Поговорите с Виктором
 2303202:Ещё один равноценный обмен! - Поговорите с Хамави
 2303203:Ещё один равноценный обмен! - Вернитесь к тому месту, где стоит повозка
-2303204:Ещё один равноценный обмен! - Победите всех плесенников и верните деревянную доску
+2303204:Ещё один равноценный обмен! - Победите плесенников и заберите деревянную доску
 2303205:Ещё один равноценный обмен! - Вернитесь к Хамави
 2303206:Ещё один равноценный обмен! - Поговорите с Виктором
 2303207:Ещё один равноценный обмен! - Поговорите с Ламбадом
 2303208:Ещё один равноценный обмен! - Поговорите с Виктором
-2303209:Ещё один равноценный обмен! - Поговорите с Джут
+2303209:Ещё один равноценный обмен! - Поговорите с Джутом
 2303210:Ещё один равноценный обмен! - Поговорите с Виктором
 2303211:Ещё один равноценный обмен! - Поговорите с Ламбадом
-2303212:Ещё один равноценный обмен! - Поговорите с Джут
+2303212:Ещё один равноценный обмен! - Поговорите с Джутом
 2303213:Ещё один равноценный обмен! - Поговорите с Виктором
 2303214:Ещё один равноценный обмен! - Поговорите с Виктором
 2303215:Ещё один равноценный обмен! - Поговорите с Виктором
 2303216:Ещё один равноценный обмен! - Поговорите с Ламбадом
-2303217:Ещё один равноценный обмен! - Поговорите с Джут
+2303217:Ещё один равноценный обмен! - Поговорите с Джутом
 2303218:Ещё один равноценный обмен! - [CHS] - 打倒所有蕈兽$HIDDEN
 2303301:Король заклинаний - Поговорите с Фукумото
 2303302:Король заклинаний - Идите к подходящему месту
@@ -6710,7 +6711,7 @@
 2303905:Беги, Хилми, беги - Поговорите с Хилми
 2304001:Управление складом - [CHS] - (test)随机分支用$HIDDEN
 2304002:Управление складом - Поговорите с Наджат
-2304003:Управление складом - Победите всех стервятников
+2304003:Управление складом - Одолейте всех красных стервятников
 2304004:Управление складом - Вернитесь к Наджат
 2304005:Управление складом - Поговорите с Наджат
 2304006:Управление складом - Верните товары
@@ -9158,7 +9159,7 @@
 7066109:Взрывной рост популяции - Поговорите с Нантаком
 7066110:Взрывной рост популяции - (test)检测是否获取观赏鱼$HIDDEN
 7066201:(test)钓鱼引导任务$HIDDEN - (test)发鱼竿的隐藏任务$HIDDEN
-7066301:[N/A] 0 - [CHS] - （test）测试任务$UNRELEASED
+7066301:[N/A] 0 - [N/A] 556097052
 7066401:Ветер из подземелья - Поговорите с Хун Ланом
 7070001:Особый чай для Хелен - Принести Хелен 10 цветков-сахарков
 7070002:Особый чай для Хелен - Поговорите с Хелен
@@ -10334,8 +10335,8 @@
 7171102:Мондштадтские деликатесы для Гери - Поговорите с Гери
 7171201:Мондштадтские деликатесы для Гери - Отдайте Гери две порции пасты с томатным соусом
 7171202:Мондштадтские деликатесы для Гери - Поговорите с Гери
-7171301:Железо для старого Чжана - Отдайте Старому Чжану 10 кусков железа
-7171302:Железо для старого Чжана - Поговорите со Старым Чжаном
+7171301:Железо для мастера Чжана - Отдайте мастеру Чжану десять кусков железа
+7171302:Железо для мастера Чжана - Поговорите с мастером Чжаном
 7171401:Сладости для И Чжу - Отдайте И Чжу миндальный тофу
 7171402:Сладости для И Чжу - Поговорите с И Чжу
 7180001:[CHS] - 先扫一屋$UNRELEASED - [CHS] - 与萍姥姥对话$UNRELEASED
--- a/Source/GrasscutterTools/Resources/ru-ru/Scene.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Scene.txt
--- a/Source/GrasscutterTools/Resources/ru-ru/Weapon.txt
+++ b/Source/GrasscutterTools/Resources/ru-ru/Weapon.txt
@@ -11,7 +11,7 @@
 11403:Церемониальный меч
 11404:Меч аристократов
 11405:Драконий рык
-11406:Прототип:Злоба
+11406:Прототип: Злоба
 11407:Стальное жало
 11408:Черногорский длинный меч
 11409:Чёрный меч
@@ -26,13 +26,12 @@
 11419:Легендарный клинок Иссин
 11420:Легендарный клинок Иссин
 11421:Легендарный клинок Иссин
+11422:Токабо сигурэ
 11501:Меч Сокола
 11502:Небесный меч
 11503:Клятва свободы
 11504:Кромсатель пиков
 11505:Драгоценный омут
-11506:Древний Нефритовый Резак
-11507:Одна Сторона
 11509:Рассекающий туман
 11510:Харан гэппаку фуцу
 11511:Ключ Хадж-нисут
@@ -49,7 +48,7 @@
 12403:Церемониальный двуручный меч
 12404:Королевский двуручный меч
 12405:Дождерез
-12406:Прототип:Архаичный
+12406:Прототип: Архаичный
 12407:Белая тень
 12408:Черногорская бритва
 12409:Меч драконьей кости
@@ -64,8 +63,6 @@
 12502:Волчья погибель
 12503:Песнь разбитых сосен
 12504:Некованый
-12505:Древний Нефритовый Двуручный Меч
-12506:Другая Сторона
 12510:Краснорогий камнеруб
 13101:Копьё новичка
 13201:Железный наконечник
@@ -74,7 +71,7 @@
 13303:Чёрная кисть
 13304:Флагшток
 13401:Гроза драконов
-13402:Прототип:Звёздный блеск
+13402:Прототип: Звёздный блеск
 13403:Пика полумесяца
 13404:Черногорская пика
 13405:Смертельный бой
@@ -91,7 +88,6 @@
 13502:Небесная ось
 13504:Покоритель вихря
 13505:Нефритовый коршун
-13506:Богоубийство
 13507:Усмиритель бед
 13509:Сияющая жатва
 13511:Посох алых песков
@@ -108,7 +104,7 @@
 14403:Церемониальные мемуары
 14404:Королевский гримуар
 14405:Солнечная жемчужина
-14406:Прототип:Янтарь
+14406:Прототип: Янтарь
 14407:Морской атлас
 14408:Черногорский агат
 14409:Око сознания
@@ -121,12 +117,11 @@
 14417:Плод восполнения
 14501:Небесный атлас
 14502:Молитва святым ветрам
-14503:Утерянная Баллада
 14504:Память о пыли
-14505:Древняя Нефритовая Регалия
 14506:Вечное лунное сияние
 14509:Истина кагура
 14511:Сновидения тысячи ночей
+14512:Воспоминания Тулайтуллы
 15101:Лук охотника
 15201:Лук опытного охотника
 15301:Лук ворона
@@ -140,7 +135,7 @@
 15403:Церемониальный лук
 15404:Королевский лук
 15405:Ржавый лук
-15406:Прототип:Полумесяц
+15406:Прототип: Полумесяц
 15407:Составной лук
 15408:Черногорский боевой лук
 15409:Зелёный лук
@@ -156,9 +151,6 @@
 15501:Небесное крыло
 15502:Лук Амоса
 15503:Элегия погибели
-15504:Убийца Драконов Кунву
-15505:Древняя Нефритовая Виста
-15506:Разбитое зеркало
 15507:Полярная звезда
 15508:Аква симулякрум
 15509:Громовой пульс
--- a/Source/GrasscutterTools/Resources/zh-cn/Artifact.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Artifact.txt
@@ -38,6 +38,46 @@
 21544:梦中的铁花
 21553:沉金的岁月
 21554:沉金的岁月
+27412:迷醉长梦的守护
+27413:迷醉长梦的守护
+27422:黄金邦国的结末
+27423:黄金邦国的结末
+27432:流沙贵嗣的遗宝
+27433:流沙贵嗣的遗宝
+27442:众王之都的开端
+27443:众王之都的开端
+27452:失落迷途的机芯
+27453:失落迷途的机芯
+27513:迷醉长梦的守护
+27514:迷醉长梦的守护
+27523:黄金邦国的结末
+27524:黄金邦国的结末
+27533:流沙贵嗣的遗宝
+27534:流沙贵嗣的遗宝
+27543:众王之都的开端
+27544:众王之都的开端
+27553:失落迷途的机芯
+27554:失落迷途的机芯
+28412:守秘的魔瓶
+28413:守秘的魔瓶
+28422:谢落的筵席
+28423:谢落的筵席
+28432:紫晶的花冠
+28433:紫晶的花冠
+28442:月女的华彩
+28443:月女的华彩
+28452:凝结的时刻
+28453:凝结的时刻
+28513:守秘的魔瓶
+28514:守秘的魔瓶
+28523:谢落的筵席
+28524:谢落的筵席
+28533:紫晶的花冠
+28534:紫晶的花冠
+28543:月女的华彩
+28544:月女的华彩
+28553:凝结的时刻
+28554:凝结的时刻
 51110:异国之盏
 51111:异国之盏
 51112:异国之盏
--- a/Source/GrasscutterTools/Resources/zh-cn/ArtifactCat.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/ArtifactCat.txt
@@ -1,5 +1,7 @@
 20:深林的记忆
 21:饰金之梦
+27:沙上楼阁史话
+28:乐园遗落之花
 51:行者之心
 52:勇士之心
 53:守护之心
--- a/Source/GrasscutterTools/Resources/zh-cn/Avatar.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Avatar.txt
@@ -57,4 +57,8 @@
 1071:赛诺
 1072:坎蒂丝
 1073:纳西妲
-1074:莱依拉
+1074:莱依拉
+1075:流浪者
+1076:珐露珊
+1077:瑶瑶
+1078:艾尔海森
--- a/Source/GrasscutterTools/Resources/zh-cn/Item.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Item.txt
--- a/Source/GrasscutterTools/Resources/zh-cn/Monsters.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Monsters.txt
@@ -9,9 +9,11 @@
 20010403:大型风史莱姆-强攻强化
 20010501:雷史莱姆
 20010502:雷史莱姆（塔防）
+20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010601:大型雷史莱姆
 20010602:大型雷史莱姆（塔防）
 20010604:大型雷史莱姆-强攻强化
+20010605:Slime_Electric_03_SimpleStick - [N/A] 3051091649
 20010701:变异雷史莱姆
 20010702:变异雷史莱姆-强攻强化
 20010703:变异雷史莱姆（塔防）
@@ -22,6 +24,7 @@
 20010902:大型冰史莱姆-雪山活动
 20010903:大型冰史莱姆（塔防）
 20010904:大型冰史莱姆-强攻强化
+20010905:Slime_Ice_03_SimpleStick - [N/A] 3152089697
 20011001:水史莱姆
 20011002:水史莱姆（塔防）
 20011101:大型水史莱姆
@@ -30,9 +33,11 @@
 20011201:火史莱姆
 20011202:火史莱姆
 20011203:火史莱姆（塔防）
+20011204:Slime_Fire_02_SimpleStick - [N/A] 1669508241
 20011301:大型火史莱姆
 20011302:大型火史莱姆（塔防）
 20011304:大型火史莱姆-强攻强化
+20011305:Slime_Fire_03_SimpleStick - [N/A] 771419505
 20011401:岩史莱姆
 20011402:岩史莱姆（塔防）
 20011501:大型岩史莱姆
@@ -42,6 +47,9 @@
 20011701:无相之水-召唤物-小分裂
 20011801:无相之水-召唤物-自爆
 20011901:无相之水-召唤物-回血
+20012001:Effigy_Water_Underling_Ooze_05 - [N/A] 3817659321
+20012101:Effigy_Water_Underling_Ooze_06 - [N/A] 2054683281
+20012201:Effigy_Water_Underling_Ooze_07 - [N/A] 716714657
 20020101:狂风之核
 20050201:纯水之猪
 20050202:纯水之猪（强化）
@@ -171,6 +179,7 @@
 22070302:壳之剑士-盾弓-脱甲
 22080101:黑蛇剑士-风
 22090101:浮舍残念
+22100101:Invoker_Archdeacon_01 - [EN] - Hilichurl
 23010101:愚人众先遣队·冰铳重卫士
 23010201:愚人众先遣队·水铳重卫士
 23010301:愚人众先遣队·雷锤前锋军
@@ -253,6 +262,7 @@
 25050402:今谷佳祐
 25050501:珊瑚宫众
 25050502:心海个人线反抗军足轻
+25050503:Ahigaru_Male_03 - [FR] - (test)心海个人线反抗军足轻
 25060101:盗宝团肌肉男空手
 25060102:Rongshi(稻妻前置任务）
 25070101:盗宝团肌肉男单手锤
@@ -266,9 +276,11 @@
 25080402:幕府武士（剑道）
 25080403:幕府武士（一二阶段）
 25080404:幕府武士（三阶段）
+25080405:Samurai_Hatamoto_04 - [N/A] 400320561
 25100101:海乱鬼-雷
 25100102:海乱鬼-雷（剑道）
 25100201:海乱鬼-火
+25100202:Samurai_Kairagi_07 - [EN] - Pyro Kairagi
 25100301:海乱鬼-雷幽灵
 25100302:海乱鬼-雷幽灵
 25100401:海乱鬼-火幽灵
@@ -276,6 +288,8 @@
 25110102:鳄鱼-镀金旅团（赛诺个人线，独立）
 25110201:秃鹫-镀金旅团（召唤用）
 25110202:秃鹫-镀金旅团（赛诺个人线，独立）
+25110301:Scorpion_Eremite_Fire_01 - [N/A] 1458817257
+25110401:Chrysopelea_Eremite_Grass_01 - [N/A] 1458817257
 25210101:镀金旅团-单手斧(常规肤色)
 25210102:镀金旅团-单手斧(浅褐皮肤)
 25210103:镀金旅团-单手斧(深褐皮肤)
@@ -283,6 +297,7 @@
 25210105:[任务专用]教令院-单手斧(浅褐皮肤)
 25210106:[任务专用]教令院-单手斧(深褐皮肤)
 25210107:镀金旅团-单手斧（特殊）
+25210108:Eremite_Female_Hatchet_05 - [N/A] 1446861633
 25210201:镀金旅团-弩(常规肤色)
 25210202:镀金旅团-弩(浅褐皮肤)
 25210203:镀金旅团-弩(深褐皮肤)
@@ -290,6 +305,8 @@
 25210205:[任务专用]教令院-弩(浅褐皮肤)
 25210206:[任务专用]教令院-弩(深褐皮肤)
 25210207:镀金旅团-弩（特殊）
+25210208:NPC_Quest_Male_Standard_Eremite_01 - [N/A] 2050456833
+25210209:NPC_Quest_Male_Standard_Eremite_02 - [N/A] 3171996801
 25210301:镀金旅团-长柄(常规肤色)
 25210302:镀金旅团-长柄(浅褐皮肤)
 25210303:镀金旅团-长柄(深褐皮肤)
@@ -303,12 +320,14 @@
 25210404:[任务专用]教令院-拳刃(常规肤色)
 25210405:[任务专用]教令院-拳刃(浅褐皮肤)
 25210406:[任务专用]教令院-拳刃(深褐皮肤)
+25210407:NPC_Quest_MuscleMan_Standard_Eremite_01 - [N/A] 3844535385
 25210501:镀金旅团-弯刀(常规肤色)
 25210502:镀金旅团-弯刀(浅褐皮肤)
 25210503:镀金旅团-弯刀(深褐皮肤)
 25210504:[任务专用]教令院-弯刀(常规肤色)
 25210505:[任务专用]教令院-弯刀(浅褐皮肤)
 25210506:[任务专用]教令院-弯刀(深褐皮肤)
+25210507:Eremite_MuscleMan_Simitar_04 - [N/A] 1714026825
 25210601:镀金NPC - Tariq 塔里克
 25210602:镀金NPC - Tumart图马特
 25310101:镀金旅团_双刃_水
@@ -316,7 +335,12 @@
 25310202:镀金NPC - 萨梅尔
 25310301:镀金旅团_战斧_雷
 25410101:镀金旅团_盾枪_岩
+25410102:Eremite_Male_Strong_Katar_02 - [N/A] 1317576089
+25410103:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
 25410201:镀金旅团_长弓_风
+25410202:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410301:Eremite_Female_Standard_Oracle_01 - [N/A] 1223193297
+25410401:Monster_Eremite_Female_Standard_Dancer_01 - [N/A] 1223193297
 26010101:冰骗骗花
 26010102:冰骗骗花（雪山活动）
 26010201:火骗骗花
@@ -335,16 +359,39 @@
 26060201:水萤
 26060301:冰萤
 26090101:蕈兽-小-飞-水
+26090190:Fungus_Un_Gamma_Water_Enemy - [N/A] 2798916145
+26090191:Fungus_Un_Gamma_Water_01_Capture - [N/A] 4229105793
 26090201:蕈兽-小-飞-草
 26090202:蕈兽-小-飞-草-挑战召唤
+26090290:Fungus_Un_Delta_Grass_Enemy - [N/A] 2834173953
+26090291:Fungus_Un_Delta_Grass_01_Capture - [N/A] 3005241825
 26090301:蕈兽-小-飞-风
+26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
+26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
 26090401:蕈兽-小-转-雷
+26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
+26090491:Fungus_Trois_Epsilon_Electric_01_Capture - [N/A] 3709881913
 26090501:蕈兽-小-转-冰
+26090590:Fungus_Trois_Alpha_Ice_Enemy - [N/A] 4208292977
+26090591:Fungus_Trois_Alpha_Ice_01_Capture - [N/A] 1798960849
 26090601:蕈兽-小-转-火
+26090690:Fungus_Trois_Gamma_Fire_Enemy - [N/A] 4223971953
+26090691:Fungus_Trois_Gamma_Fire_01_Capture - [N/A] 3680085465
 26090701:蕈兽-小-伸-火
+26090790:Fungus_Deux_Alpha_Fire_Enemy - [N/A] 1078684105
+26090791:Fungus_Deux_Alpha_Fire_01_Capture - [N/A] 2097382481
 26090801:蕈兽-小-伸-风
+26090890:Fungus_Deux_Epsilon_Wind_Enemy - [N/A] 466604457
+26090891:Fungus_Deux_Epsilon_Wind_01_Capture - [N/A] 3913813441
 26090901:蕈兽-小-伸-岩
+26090990:Fungus_Deux_Beta_Rock_Enemy - [N/A] 287229801
+26090991:Fungus_Deux_Beta_Rock_01_Capture - [N/A] 4221967233
 26091001:蕈兽-小-伸-雷
+26091090:Fungus_Deux_Delta_Electric_Enemy - [N/A] 2977465545
+26091091:Fungus_Deux_Delta_Electric_01_Capture - [N/A] 2399196673
+26100301:Monster_Vulture_Sacred_Fire_01 - [N/A] 2399196673
+26100401:Monster_Scorpion_Sacred_Electric_01 - [N/A] 2399196673
+26100501:Monster_Chrysopelea_Sacred_Wind_01 - [N/A] 2399196673
 26120101:有翼草本真蕈
 26120201:有翼冰本真蕈
 26120301:陆行水本真蕈
@@ -409,6 +456,7 @@
 28020901:武士狗（巡逻）
 28020902:武士狗（战斗）
 28020903:武士狗（2.6剑道）
+28020904:Inu_Shihandai_04 - [N/A] 467002241
 28030101:蓝翎鹭
 28030102:菫鹮
 28030103:蓝翎鹭
@@ -430,6 +478,7 @@
 28030311:黑王鸽
 28030312:白鸽(3.1专用）
 28030313:暝彩鸟
+28030314:Crow_01 - [N/A] 3254419441
 28030401:赤团雀
 28030402:金团雀
 28030403:雪团雀
@@ -605,8 +654,13 @@
 20040301:无相之岩 基末尔
 20040302:（活动）无相之岩 基末尔
 20040401:无相之水
+20040402:Effigy_Water_02 - [N/A] 2510499945
 20040501:无相之冰 塔勒特
+20040502:Effigy_Ice_01 - [N/A] 244519785
 20040601:无相之火 亚因
+20040602:Effigy_Fire_02 - [N/A] 802657121
+20040701:Effigy_Grass_01 - [N/A] 572615921
+20040702:Effigy_Grass_02 - [N/A] 2410347593
 20050101:纯水精灵
 20050102:纯水精灵（本体）
 20070101:雷音权现
@@ -620,6 +674,7 @@
 25090102:魔偶剑鬼-风分身
 25090103:魔偶剑鬼-冰分身
 25090104:魔偶剑鬼-面具分身
+25090105:Samurai_Ningyo_05 - [EN] - Marionette General: Masked Bunshin
 25090201:魔偶剑鬼-风分身（有图标）
 25090301:魔偶剑鬼-冰分身（有图标）
 25090401:魔偶剑鬼-面具分身（有图标）
@@ -640,6 +695,7 @@
 26050802:深海龙蜥·吞雷（2.5魔改）
 26080101:跋掣
 26110101:翠翎恐蕈
+26130101:Sandworm_01 - [N/A] 4098645257
 29010101:风魔龙 特瓦林
 29010102:风魔龙 特瓦林
 29010103:风魔龙
@@ -666,6 +722,12 @@
 29060201:雷电将军
 29060202:雷电将军
 29060203:雷电将军
+29070101:Monster_Nada - [N/A] 3425649649
+29070102:Monster_Nada - [N/A] 996756049
+29070103:Monster_Nada - [N/A] 887141825
+29070104:Monster_Nada - [N/A] 3834332121
+29070105:Monster_Nada - [N/A] 1547264913
+29070106:Monster_Nada - [N/A] 641768601


 // 动物
@@ -707,6 +769,12 @@
 28050106:草晶蝶
 28050301:吉光虫
 28050401:圣金虫
+28050501:Electrohercules_01 - [N/A] 2466918521
+28050502:Electrohercules_02 - [N/A] 2466918521
+28050503:Electrohercules_03 - [N/A] 2466918521
+28050504:Electrohercules_04 - [N/A] 2466918521
+28050505:Electrohercules_05 - [N/A] 2466918521
+28050506:Electrohercules_06 - [N/A] 2466918521


 // 鱼
--- a/Source/GrasscutterTools/Resources/zh-cn/Quest.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Quest.txt
@@ -24,6 +24,7 @@
 30325:女神像解锁$HIDDEN - [N/A] 1854299071
 30326:女神像解锁$HIDDEN - [N/A] 853608247
 30327:女神像解锁$HIDDEN - [N/A] 416738111
+30328:女神像解锁$HIDDEN - [N/A] 416738111
 30600:昔日的风 - 在庙宇门口跟安柏见面
 30601:昔日的风 - 与安柏对话
 30602:昔日的风 - 进入庙宇
@@ -1975,87 +1976,87 @@
 302114:热沙中的秘密 - 等待至第二天早上（6-8点）
 302115:热沙中的秘密 - 播放CS$HIDDEN
 302116:热沙中的秘密 - 深入探索遗迹
-302201:[N/A] 0 - 等到第二天8点-12点
-302202:[N/A] 0 - 前往教令院外与艾尔海森汇合
-302203:[N/A] 0 - 与艾尔海森一起进入教令院
-302204:[N/A] 0 - 进入智慧宫
-302205:[N/A] 0 - 与艾尔海森对话
-302206:[N/A] 0 - 暂时躲藏起来，等待机会
-302207:[N/A] 0 - [N/A] 3442967412
-302208:[N/A] 0 - 与派蒙对话
-302209:[N/A] 0 - 设法与纳西妲的意识进行连接
-302210:[N/A] 0 - 与纳西妲的意识对话
-302211:[N/A] 0 - 与谢赫祖拜尔对话
-302212:[N/A] 0 - 前往教令院附近
-302213:[N/A] 0 - 前往教令院附近
-302214:[N/A] 0 - [N/A] 1732046580
-302215:[N/A] 0 - 与派蒙对话
-302216:[N/A] 0 - 幕间·迪希雅与拉赫曼的对话
-302217:[N/A] 0 - 吸引教令院卫兵进入埋伏圈
-302218:[N/A] 0 - 幕间·大贤者阿扎尔前往净善宫
-302219:[N/A] 0 - 幕间·大贤者阿扎尔的疑虑
-302220:[N/A] 0 - 幕间·大贤者阿扎尔前往净善宫
-302221:[N/A] 0 - 与派蒙对话
-302222:[N/A] 0 - 前往净善宫
-302223:[N/A] 0 - 与纳西妲对话
-302224:[N/A] 0 - 吸引教令院卫兵进入埋伏圈
-302225:[N/A] 0 - [N/A] 1295878188
-302226:[N/A] 0 - 与谢赫祖拜尔对话
-302227:[N/A] 0 - 与派蒙对话
-302228:[N/A] 0 - 幕间·迪希雅与拉赫曼的对话
-302229:[N/A] 0 - 幕间·大贤者阿扎尔的疑虑
-302230:[N/A] 0 - 与派蒙对话
-302231:[N/A] 0 - 设法与纳西妲的意识进行连接$HIDDEN
-302232:[N/A] 0 - 设法与纳西妲的意识进行连接$HIDDEN
-302233:[N/A] 0 - 与派蒙对话
-302234:[N/A] 0 - [N/A] 403262332
-302235:[N/A] 0 - [N/A] 3258363788
-302236:[N/A] 0 - [N/A] 2830775676
-302237:[N/A] 0 - [N/A] 33960564
-302238:[N/A] 0 - [N/A] 3034910092
-302239:[N/A] 0 - [N/A] 1042508412
-302240:[N/A] 0 - [N/A] 2334919076
-302241:[N/A] 0 - 离开净善宫
-302242:[N/A] 0 - [N/A] 2103971276
-302243:[N/A] 0 - [N/A] 2524469860
-302244:[N/A] 0 - [N/A] 3247687540
-302245:[N/A] 0 - [N/A] 4115109332
-302246:[N/A] 0 - [N/A] 2898922556
-302247:[N/A] 0 - [N/A] 1634110884
-302248:[N/A] 0 - [N/A] 1799067076
-302249:[N/A] 0 - 设法与纳西妲的意识进行连接$HIDDEN
+302201:热沙中的秘密 - 等到第二天8点-12点
+302202:热沙中的秘密 - 前往教令院外与艾尔海森汇合
+302203:热沙中的秘密 - 与艾尔海森一起进入教令院
+302204:热沙中的秘密 - 进入智慧宫
+302205:热沙中的秘密 - 与艾尔海森对话
+302206:热沙中的秘密 - 暂时躲藏起来，等待机会
+302207:热沙中的秘密 - [N/A] 3442967412
+302208:热沙中的秘密 - 与派蒙对话
+302209:热沙中的秘密 - 设法与纳西妲的意识进行连接
+302210:热沙中的秘密 - 与纳西妲的意识对话
+302211:热沙中的秘密 - 与谢赫祖拜尔对话
+302212:热沙中的秘密 - 前往教令院附近
+302213:热沙中的秘密 - 前往教令院附近
+302214:热沙中的秘密 - [N/A] 1732046580
+302215:热沙中的秘密 - 与派蒙对话
+302216:热沙中的秘密 - 幕间·迪希雅与拉赫曼的对话
+302217:热沙中的秘密 - 吸引教令院卫兵进入埋伏圈
+302218:热沙中的秘密 - 幕间·大贤者阿扎尔前往净善宫
+302219:热沙中的秘密 - 幕间·大贤者阿扎尔的疑虑
+302220:热沙中的秘密 - 幕间·大贤者阿扎尔前往净善宫
+302221:热沙中的秘密 - 与派蒙对话
+302222:热沙中的秘密 - 前往净善宫
+302223:热沙中的秘密 - 与纳西妲对话
+302224:热沙中的秘密 - 吸引教令院卫兵进入埋伏圈
+302225:热沙中的秘密 - [N/A] 1295878188
+302226:热沙中的秘密 - 与谢赫祖拜尔对话
+302227:热沙中的秘密 - 与派蒙对话
+302228:热沙中的秘密 - 幕间·迪希雅与拉赫曼的对话
+302229:热沙中的秘密 - 幕间·大贤者阿扎尔的疑虑
+302230:热沙中的秘密 - 与派蒙对话
+302231:热沙中的秘密 - 设法与纳西妲的意识进行连接$HIDDEN
+302232:热沙中的秘密 - 设法与纳西妲的意识进行连接$HIDDEN
+302233:热沙中的秘密 - 与派蒙对话
+302234:热沙中的秘密 - [N/A] 403262332
+302235:热沙中的秘密 - [N/A] 3258363788
+302236:热沙中的秘密 - [N/A] 2830775676
+302237:热沙中的秘密 - [N/A] 33960564
+302238:热沙中的秘密 - [N/A] 3034910092
+302239:热沙中的秘密 - [N/A] 1042508412
+302240:热沙中的秘密 - [N/A] 2334919076
+302241:热沙中的秘密 - 离开净善宫
+302242:热沙中的秘密 - [N/A] 2103971276
+302243:热沙中的秘密 - [N/A] 2524469860
+302244:热沙中的秘密 - [N/A] 3247687540
+302245:热沙中的秘密 - [N/A] 4115109332
+302246:热沙中的秘密 - [N/A] 2898922556
+302247:热沙中的秘密 - [N/A] 1634110884
+302248:热沙中的秘密 - [N/A] 1799067076
+302249:热沙中的秘密 - 设法与纳西妲的意识进行连接$HIDDEN
 302301:[N/A] 0 - （test）隐藏子任务带闲置对话$HIDDEN
-302401:[N/A] 0 - 与坎蒂丝对话
-302402:[N/A] 0 - 与艾尔海森会合
-302403:[N/A] 0 - 前往镀金旅团的据点
-302404:[N/A] 0 - 前往喀万驿与赛诺会合
-302405:[N/A] 0 - 与喀万驿驻守士兵交涉
-302406:[N/A] 0 - 等待至约定时间（两天后）
-302407:[N/A] 0 - 前往沙海东部
-302408:[N/A] 0 - 协助赛诺抓捕镀金旅团
-302409:[N/A] 0 - 与赛诺对话
-302410:[N/A] 0 - 等待至次日
-302411:[N/A] 0 - 进入阿如村村长家
-302412:[N/A] 0 - 与坎蒂丝对话
-302413:[N/A] 0 - 进入阿如村村长家
-302414:[N/A] 0 - 离开阿如村村长家
-302501:[N/A] 0 - 前往喀万驿与迪希雅会合
-302502:[N/A] 0 - 到禅那园找提纳里
-302503:[N/A] 0 - 前往奥摩斯港
-302504:[N/A] 0 - 跟踪愚人众士兵
-302505:[N/A] 0 - 与迪希雅对话
-302506:[N/A] 0 - 尽快返回禅那园
-302507:[N/A] 0 - 击退来袭的愚人众
-302508:[N/A] 0 - 与提纳里对话
-302509:[N/A] 0 - 确认提纳里和迪希雅的状况
-302510:[N/A] 0 - 前往海芭夏所在地
-302511:[N/A] 0 - 等待至会合时间（19-21点）
-302512:[N/A] 0 - 前往大巴扎
-302513:[N/A] 0 - 在维卡拉商栈内隐蔽身形
-302514:[N/A] 0 - 跟随迪希雅一同「追踪」博士
-302515:[N/A] 0 - 与迪希雅对话
-302516:[N/A] 0 - 离开禅那园后与迪希雅对话
-302517:[N/A] 0 - (test)(hide)删除船只$HIDDEN
+302401:热沙中的秘密 - 与坎蒂丝对话
+302402:热沙中的秘密 - 与艾尔海森会合
+302403:热沙中的秘密 - 前往镀金旅团的据点
+302404:热沙中的秘密 - 前往喀万驿与赛诺会合
+302405:热沙中的秘密 - 与喀万驿驻守士兵交涉
+302406:热沙中的秘密 - 等待至约定时间（两天后）
+302407:热沙中的秘密 - 前往沙海东部
+302408:热沙中的秘密 - 协助赛诺抓捕镀金旅团
+302409:热沙中的秘密 - 与赛诺对话
+302410:热沙中的秘密 - 等待至次日
+302411:热沙中的秘密 - 进入阿如村村长家
+302412:热沙中的秘密 - 与坎蒂丝对话
+302413:热沙中的秘密 - 进入阿如村村长家
+302414:热沙中的秘密 - 离开阿如村村长家
+302501:热沙中的秘密 - 前往喀万驿与迪希雅会合
+302502:热沙中的秘密 - 到禅那园找提纳里
+302503:热沙中的秘密 - 前往奥摩斯港
+302504:热沙中的秘密 - 跟踪愚人众士兵
+302505:热沙中的秘密 - 与迪希雅对话
+302506:热沙中的秘密 - 尽快返回禅那园
+302507:热沙中的秘密 - 击退来袭的愚人众
+302508:热沙中的秘密 - 与提纳里对话
+302509:热沙中的秘密 - 确认提纳里和迪希雅的状况
+302510:热沙中的秘密 - 前往海芭夏所在地
+302511:热沙中的秘密 - 等待至会合时间（19-21点）
+302512:热沙中的秘密 - 前往大巴扎
+302513:热沙中的秘密 - 在维卡拉商栈内隐蔽身形
+302514:热沙中的秘密 - 跟随迪希雅一同「追踪」博士
+302515:热沙中的秘密 - 与迪希雅对话
+302516:热沙中的秘密 - 离开禅那园后与迪希雅对话
+302517:热沙中的秘密 - (test)(hide)删除船只$HIDDEN
 302601:[N/A] 0 - (test)(hide)刷柯莱的早餐$HIDDEN
 302602:[N/A] 0 - 与柯莱对话
 302603:[N/A] 0 - 前往大巴扎
@@ -3652,7 +3653,7 @@
 1301302:[N/A] 0 - 与皮特交谈
 1301303:[N/A] 0 - 跟随皮特前往「品梦一刻」
 1301304:[N/A] 0 - 前往埃勒曼提到的地方
-1301305:[N/A] 0 - 击败袭来的魔物
+1301305:[N/A] 0 - 击败眼前的魔物
 1301306:[N/A] 0 - 与埃勒曼交谈
 1301307:[N/A] 0 - 返回「品梦一刻」确认现状
 1301308:[N/A] 0 - 关照失落的埃勒曼
@@ -6710,7 +6711,7 @@
 2303905:跑，希尔米，跑 - 与希尔米对话
 2304001:仓储事务 - (test)随机分支用$HIDDEN
 2304002:仓储事务 - 与纳杰特对话
-2304003:仓储事务 - 打倒所有秃鹫
+2304003:仓储事务 - 打倒所有赤鹫
 2304004:仓储事务 - 向纳杰特回报
 2304005:仓储事务 - 与纳杰特对话
 2304006:仓储事务 - 回收货物
@@ -9158,7 +9159,7 @@
 7066109:鱼群大爆发 - 和楠塔克对话
 7066110:鱼群大爆发 - (test)检测是否获取观赏鱼$HIDDEN
 7066201:(test)钓鱼引导任务$HIDDEN - (test)发鱼竿的隐藏任务$HIDDEN
-7066301:[N/A] 0 - （test）测试任务$UNRELEASED
+7066301:[N/A] 0 - [N/A] 556097052
 7066401:秘境来风 - 与宏朗对话
 7070001:海伦的特效润喉茶 - 将十朵甜甜花交给海伦
 7070002:海伦的特效润喉茶 - 与海伦对话
--- a/Source/GrasscutterTools/Resources/zh-cn/Scene.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Scene.txt
@@ -54,15 +54,19 @@
 1073:智慧宫
 1074:须弥咖啡馆
 1075:净善宫
+1076:IndoorScene_Md_CattailTavern
 1077:村长家
 1078:IndoorScene_Xm_Zls
+1079:IndoorScene_Xm_Zls
 2001:罗浮洞
 2002:翠黛峰
 2003:清琼岛
 2004:绘绮庭
+2005:Homeworld_Exterior_Sumeru
 2201:尘歌壶室内_蒙德
 2202:尘歌壶室内_璃月
 2203:尘歌壶室内_稻妻
+2204:Homeworld_Interior_Xm_Apt_01
 20000:关卡玩法测试(test)
 20005:一锤定音的食材
 20006:遗迹遇险点(test)
@@ -144,10 +148,28 @@
 20149:Level_SmrDungeon_Tinali
 20150:世界树地城(test)
 20151:Level_FC_DeshretTemple
+20152:Level_ScaramoucheBoss
+20153:Level_ScaramoucheBoss
+20154:Level_ScaramoucheBoss
+20155:Level_ScaramoucheBoss
+20156:Level_ScaramoucheBoss
 20157:Level_SmrDungeon_Cyno
+20158:Level_FCdungeon_BigTree
 20159:Level_XMDungeon_WQ01
 20160:Level_FC_DeshretTemple
 20161:Level_FC_DeshretTemple
+20162:IndoorScene_Xm_Biglibrary
+20163:Level_ScaramoucheFactory
+20164:Level_VoidWorldTree
+20165:Level_NahidaDungeon_01
+20166:Level_VoidWorldTree_02
+20167:Level_Consciousness
+20168:Level_ScaramoucheBoss
+20169:Level_ScaramoucheRecall
+20170:Level_ScaramoucheFactory
+20171:Level_ScaramoucheBoss
+20172:Level_Consciousness
+20173:Level_Consciousness
 30001:迷雾迷宫(test)
 30100:爬塔第一层-第1关(test)
 30101:爬塔第一层-第2关(test)
@@ -310,6 +332,10 @@
 33740:Level_Tower_Universe_01
 33741:Level_Tower_Moon_01
 33742:Level_Tower_Universe_01
+33743:Level_Tower_Moon_01
+33744:Level_Tower_Universe_01
+33745:Level_Tower_Moon_01
+33746:Level_Tower_Universe_01
 34100:爬塔第二档-ZHT第1关（单路）(test)
 34101:爬塔第二档-ZHT第2关（单路）(test)
 34102:爬塔第二档-ZHT第3关（单路）(test)
@@ -361,6 +387,10 @@
 34740:Level_Tower_Universe_01
 34741:Level_Tower_Moon_01
 34742:Level_Tower_Universe_01
+34743:Level_Tower_Moon_01
+34744:Level_Tower_Universe_01
+34745:Level_Tower_Moon_01
+34746:Level_Tower_Universe_01
 35100:爬塔第三档-ZHT第1关（单路）(test)
 35101:爬塔第三档-ZHT第2关（单路）(test)
 35102:爬塔第三档-ZHT第3关（单路）(test)
@@ -412,6 +442,10 @@
 35740:Level_Tower_Universe_01
 35741:Level_Tower_Moon_01
 35742:Level_Tower_Universe_01
+35743:Level_Tower_Moon_01
+35744:Level_Tower_Universe_01
+35745:Level_Tower_Moon_01
+35746:Level_Tower_Universe_01
 35800:奇趣秘园
 35801:2.1换人挑战1阶段(test)
 35802:2.1换人挑战2阶段(test)
@@ -461,6 +495,13 @@
 35861:Level_SmrDungeon_Challenge
 35862:Level_SmrDungeon_Challenge
 35863:Level_SmrDungeon_Challenge
+35870:Level_BrickBreaker01
+35871:Level_BrickBreaker01
+35872:Level_BrickBreaker01
+35881:Level_BrickBreaker01
+35882:Level_BrickBreaker01
+35883:Level_BrickBreaker01
+35884:Level_BrickBreaker01
 40001:调查遗迹深处的骚动(test)
 40002:Level_UCDungeon01
 40003:Level_UCDungeon01
@@ -514,6 +555,14 @@
 40052:Level_XMDungeon_WQ03
 40053:Level_XMDungeon_WQ01
 40054:Level_XMDungeon_WQ04
+40055:Level_ActivityBoss01_Wind
+40056:Level_ActivityBoss01_Wind
+40057:Level_ActivityBoss01_Wind
+40058:Level_ActivityBoss01_Wind
+40059:Level_ActivityBoss01_Wind
+40060:Level_ActivityBoss01_Wind
+40061:Level_ActivityBoss01_Wind
+40062:Level_ActivityBoss01_Wind
 40100:太山府 I
 40101:太山府 II
 40102:太山府 III
@@ -582,6 +631,10 @@
 40651:Level_Cycle01_XM03
 40652:Level_Cycle01_XM03
 40653:Level_Cycle01_XM03
+40660:Level_Cycle01_XM04
+40661:Level_Cycle01_XM04
+40662:Level_Cycle01_XM04
+40663:Level_Cycle01_XM04
 40700:Level_CycleDungeon01_Rock
 40701:Level_CycleDungeon01_Rock
 40702:Level_CycleDungeon01_Rock
@@ -669,6 +722,12 @@
 41054:角色试玩关-坎蒂丝(test)
 41055:角色试玩关-妮露(test)
 41056:角色试玩关-赛诺(test)
+41057:Level_Tower_01_Open
+41058:Level_Tower_01_Open
+41059:Level_Tower_01_Open
+41060:Level_Tower_01_Open
+41061:Level_Tower_01_Open
+41062:Level_Tower_01_Open
 42001:去年双燕来还去：难度3
 42002:解鞍倚枕画仙桥：难度2
 42003:春水蛾眉各分飞：难度5
@@ -774,6 +833,23 @@
 47023:Level_WindDungeon_03
 47024:Level_WindDungeon_04
 47025:Level_WindDungeon_01
+47101:Level_FungusFighter
+47102:Level_FungusFighter
+47103:Level_FungusFighter
+47201:Level_Smr_LostCity
+47202:Level_Smr_LostCity
+47203:Level_Smr_LostCity
+47204:Level_Smr_LostCity
+47205:Level_Smr_LostCity
+47206:Level_Smr_LostCity
+47207:Level_Smr_LostCity
+47301:LevelEntity_Activity_V3_3_LostCity_47207
+47302:LevelEntity_Activity_V3_3_LostCity_47207
+47303:LevelEntity_Activity_V3_3_LostCity_47207
+47304:LevelEntity_Activity_V3_3_LostCity_47207
+47305:LevelEntity_Activity_V3_3_LostCity_47207
+47306:LevelEntity_Activity_V3_3_LostCity_47207
+47307:LevelEntity_Activity_V3_3_LostCity_47207
 50002:低温关卡白盒(test)
 50003:战斗性能测试(test)
 50004:电桩电源白盒(test)
@@ -857,6 +933,7 @@
 50088:Level_DreamIsland_Fischlroom
 50089:Level_DreamIsland_Fischlcorridor
 50090:TestLevel_WhiteBox_Xm_03
+50091:Level_DahakaBoss01
 50092:WindPuzzle_WhiteboxSll01
 50093:WindPuzzle_WhiteboxSll04
 50094:Level_Tower_Moon_01
@@ -872,4 +949,12 @@
 51004:Level_Tower_Moon_01
 51005:Level_Tower_Moon_01
 51006:TestLevel_TestBox_GJH
-51014:Level_Cycle01_XM03
+51007:BigWorld_LevelStreaming
+51008:Level_Carnival
+51009:Level_SmrDungeon_BigTree
+51010:Level_SmrDungeon_BigTree
+51011:TestLevel_WhiteBox_Xm_04
+51013:Level_SmrDungeon_BigTree
+51015:Level_TestLevel_Pacman_Sll
+51019:TestLevel_WhiteBox_Xm_05
+79999:GcgCardTest
--- a/Source/GrasscutterTools/Resources/zh-cn/Weapon.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Weapon.txt
@@ -26,13 +26,12 @@
 11419:「一心传」名刀
 11420:「一心传」名刀
 11421:「一心传」名刀
+11422:东花坊时雨
 11501:风鹰剑
 11502:天空之刃
 11503:苍古自由之誓
 11504:斫峰之刃
 11505:磐岩结绿
-11506:磐岩结绿
-11507:凭虚
 11509:雾切之回光
 11510:波乱月白经津
 11511:圣显之钥
@@ -64,8 +63,6 @@
 12502:狼的末路
 12503:松籁响起之时
 12504:无工之剑
-12505:砥厄鱼
-12506:异史
 12510:赤角石溃杵
 13101:新手长枪
 13201:铁尖枪
@@ -91,7 +88,6 @@
 13502:天空之脊
 13504:贯虹之槊
 13505:和璞鸢
-13506:弑主
 13507:息灾
 13509:薙草之稻光
 13511:赤沙之杖
@@ -121,12 +117,11 @@
 14417:盈满之实
 14501:天空之卷
 14502:四风原典
-14503:散佚的叙事诗
 14504:尘世之锁
-14505:定土玉圭
 14506:不灭月华
 14509:神乐之真意
 14511:千夜浮梦
+14512:图莱杜拉的回忆
 15101:猎弓
 15201:历练的猎弓
 15301:鸦羽弓
@@ -156,9 +151,6 @@
 15501:天空之翼
 15502:阿莫斯之弓
 15503:终末嗟叹之诗
-15504:陨龙之梦
-15505:悬黎千钧
-15506:破镜
 15507:冬极白星
 15508:若水
 15509:飞雷之弦振
--- a/Source/GrasscutterTools/Resources/zh-tw/Artifact.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Artifact.txt
@@ -38,6 +38,46 @@
 21544:夢中的鐵花
 21553:沉金的歲月
 21554:沉金的歲月
+27412:迷醉長夢的守護
+27413:迷醉長夢的守護
+27422:黃金邦國的結末
+27423:黃金邦國的結末
+27432:流沙貴嗣的遺寶
+27433:流沙貴嗣的遺寶
+27442:眾王之都的開端
+27443:眾王之都的開端
+27452:失落迷途的機芯
+27453:失落迷途的機芯
+27513:迷醉長夢的守護
+27514:迷醉長夢的守護
+27523:黃金邦國的結末
+27524:黃金邦國的結末
+27533:流沙貴嗣的遺寶
+27534:流沙貴嗣的遺寶
+27543:眾王之都的開端
+27544:眾王之都的開端
+27553:失落迷途的機芯
+27554:失落迷途的機芯
+28412:守秘的魔瓶
+28413:守秘的魔瓶
+28422:謝落的筵席
+28423:謝落的筵席
+28432:紫晶的花冠
+28433:紫晶的花冠
+28442:月女的華彩
+28443:月女的華彩
+28452:凝結的時刻
+28453:凝結的時刻
+28513:守秘的魔瓶
+28514:守秘的魔瓶
+28523:謝落的筵席
+28524:謝落的筵席
+28533:紫晶的花冠
+28534:紫晶的花冠
+28543:月女的華彩
+28544:月女的華彩
+28553:凝結的時刻
+28554:凝結的時刻
 51110:異國之盞
 51111:異國之盞
 51112:異國之盞
--- a/Source/GrasscutterTools/Resources/zh-tw/ArtifactCat.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/ArtifactCat.txt
@@ -1,5 +1,7 @@
 20:深林的記憶
 21:飾金之夢
+27:沙上樓閣史話
+28:樂園遺落之花
 51:行者之心
 52:勇士之心
 53:守護之心
--- a/Source/GrasscutterTools/Resources/zh-tw/Avatar.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Avatar.txt
@@ -57,4 +57,8 @@
 1071:賽諾
 1072:坎蒂絲
 1073:納西妲
-1074:萊依拉
+1074:萊依拉
+1075:流浪者
+1076:琺露珊
+1077:瑶瑶
+1078:艾尔海森
--- a/Source/GrasscutterTools/Resources/zh-tw/Item.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Item.txt
--- a/Source/GrasscutterTools/Resources/zh-tw/Monsters.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Monsters.txt
@@ -9,9 +9,11 @@
 20010403:大型風史萊姆
 20010501:雷史萊姆
 20010502:雷史萊姆（塔防）
+20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010601:大型雷史萊姆
 20010602:大型雷史萊姆（塔防）
 20010604:大型雷史萊姆
+20010605:Slime_Electric_03_SimpleStick - [N/A] 3051091649
 20010701:變異雷史萊姆
 20010702:變異雷史萊姆
 20010703:變異雷史萊姆（塔防）
@@ -22,6 +24,7 @@
 20010902:大型冰史萊姆-雪山活動
 20010903:大型冰史萊姆（塔防）
 20010904:大型冰史萊姆
+20010905:Slime_Ice_03_SimpleStick - [N/A] 3152089697
 20011001:水史萊姆
 20011002:水史萊姆（塔防）
 20011101:大型水史萊姆
@@ -30,9 +33,11 @@
 20011201:火史萊姆
 20011202:火史萊姆
 20011203:火史萊姆（塔防）
+20011204:Slime_Fire_02_SimpleStick - [N/A] 1669508241
 20011301:大型火史萊姆
 20011302:大型火史萊姆（塔防）
 20011304:大型火史萊姆
+20011305:Slime_Fire_03_SimpleStick - [N/A] 771419505
 20011401:岩史萊姆
 20011402:岩史萊姆（塔防）
 20011501:大型岩史萊姆
@@ -42,6 +47,9 @@
 20011701:無相之水-召喚物-小分裂
 20011801:無相之水-召喚物-自爆
 20011901:無相之水-召喚物-回血
+20012001:Effigy_Water_Underling_Ooze_05 - [N/A] 3817659321
+20012101:Effigy_Water_Underling_Ooze_06 - [N/A] 2054683281
+20012201:Effigy_Water_Underling_Ooze_07 - [N/A] 716714657
 20020101:狂風之核
 20050201:純水之豬
 20050202:純水之豬（強化）
@@ -153,10 +161,10 @@
 22010404:雷深淵法師-強攻強化
 22020101:深淵使徒·激流（消失）
 22020102:深淵使徒·激流（常駐）
-22020103:[N/A] 3179556369
+22020103:Invoker_Herald_Water_01 - [N/A] 3179556369
 22030101:深淵詠者·紫電（消失）
 22030102:深淵詠者·紫電（常駐）
-22030103:[N/A] 577563505
+22030103:Invoker_Deacon_Electric_01 - [N/A] 577563505
 22030201:深淵詠者·淵火
 22030202:深淵詠者·淵火
 22040101:嗜岩·獸境幼獸
@@ -171,6 +179,7 @@
 22070302:黯色空殼·近衛
 22080101:黑蛇騎士·斬風之劍
 22090101:你猜你猜你猜猜猜
+22100101:Invoker_Archdeacon_01 - 丘丘人
 23010101:愚人眾先遣隊·冰銃重衛士
 23010201:愚人眾先遣隊·水銃重衛士
 23010301:愚人眾先遣隊·雷錘前鋒軍
@@ -193,7 +202,7 @@
 24010301:遺蹟重機
 24010302:遺蹟重機（塔防）
 24010303:遺蹟重機（挖礦版）
-24010304:[N/A] 4152683505
+24010304:Konungmathr_None_WQ - [N/A] 4152683505
 24020101:遺蹟巡弋者
 24020102:遺蹟巡弋者（閹割版）
 24020103:遺蹟巡弋者（強化版）
@@ -203,15 +212,15 @@
 24020301:遺蹟防衛者
 24020302:遺蹟防衛者（閹割版）
 24020303:遺蹟防衛者（強化版）
-24020304:[N/A] 3323395121
+24020304:Apparatus_Enigma_BionicInsecta_Karkata - [N/A] 3323395121
 24020401:遺蹟偵察者
 24020402:遺蹟偵察者（閹割版）
 24020403:遺蹟偵察者（強化版）
 24030101:遺跡龍獸·空巡
 24030201:遺跡龍獸·地巡
-24040101:[N/A] 1462919497
-24040201:[N/A] 285953129
-24040301:[N/A] 3626535649
+24040101:Monolith_Ordinator_01 - [N/A] 1462919497
+24040201:Monolith_Ordinator_02 - [N/A] 285953129
+24040301:Monolith_Ordinator_03 - [N/A] 3626535649
 25010101:「溜溜」
 25010102:神秘人
 25010103:盜寶團·「溜溜」
@@ -225,9 +234,9 @@
 25010206:盜寶團·斥候
 25010207:盜寶團·斥候
 25010208:盜寶團·斥候
-25010209:[N/A] 1167900689
-25010210:[N/A] 4032173065
-25010211:[N/A] 392055353
+25010209:Thoarder_Male_Standard_NoWeapon_02_09 - [N/A] 1167900689
+25010210:Thoarder_Male_Standard_NoWeapon_02_10 - [N/A] 4032173065
+25010211:Thoarder_Male_Standard_NoWeapon_02_11 - [N/A] 392055353
 25010301:盜寶團·火之藥劑師
 25010302:盜寶團·火之藥劑師
 25010401:盜寶團·水之藥劑師
@@ -253,6 +262,7 @@
 25050402:幕府足輕頭
 25050501:珊瑚宮眾
 25050502:珊瑚宮眾
+25050503:Ahigaru_Male_03 - [FR] - (test)心海个人线反抗军足轻
 25060101:盜寶團·拳術家
 25060102:盜寶團·拳術家
 25070101:盜寶團·粉碎者
@@ -264,59 +274,73 @@
 25080301:野伏·機巧番
 25080401:寄騎武士
 25080402:寄騎武士
-25080403:[N/A] 1581579825
-25080404:[N/A] 400320561
+25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
+25080404:Samurai_Hatamoto_03 - [N/A] 400320561
+25080405:Samurai_Hatamoto_04 - [N/A] 400320561
 25100101:海亂鬼·雷騰
 25100102:海亂鬼·雷騰
 25100201:海亂鬼·炎威
+25100202:Samurai_Kairagi_07 - 海亂鬼-火
 25100301:落武者·咒雷
 25100302:落武者·咒雷
 25100401:落武者·祟炎
-25110101:[N/A] 1820584137
-25110102:[N/A] 2361510321
-25110201:[N/A] 3397827697
-25110202:[N/A] 1458817257
+25110101:Gator_Eremite_Rock_01 - [N/A] 1820584137
+25110102:Gator_Eremite_Rock_02 - [N/A] 2361510321
+25110201:Vulture_Eremite_Wind_01 - [N/A] 3397827697
+25110202:Vulture_Eremite_Wind_02 - [N/A] 1458817257
+25110301:Scorpion_Eremite_Fire_01 - [N/A] 1458817257
+25110401:Chrysopelea_Eremite_Grass_01 - [N/A] 1458817257
 25210101:鍍金旅團·陣前斧手
-25210102:[N/A] 655804089
-25210103:[N/A] 3189818729
-25210104:[N/A] 2655106977
-25210105:[N/A] 2175825297
-25210106:[N/A] 660925665
-25210107:[N/A] 2260729353
+25210102:Eremite_Female_Hatchet_02 - [N/A] 655804089
+25210103:Eremite_Female_Hatchet_03 - [N/A] 3189818729
+25210104:EremiteElite_Female_Hatchet_01 - [N/A] 2655106977
+25210105:EremiteElite_Female_Hatchet_02 - [N/A] 2175825297
+25210106:EremiteElite_Female_Hatchet_03 - [N/A] 660925665
+25210107:Eremite_Female_Hatchet_04 - [N/A] 2260729353
+25210108:Eremite_Female_Hatchet_05 - [N/A] 1446861633
 25210201:鍍金旅團·機弩兵
-25210202:[N/A] 2119181617
-25210203:[N/A] 3425185161
-25210204:[N/A] 3201394457
-25210205:[N/A] 3735395833
-25210206:[N/A] 1444996537
-25210207:[N/A] 1636753185
+25210202:Eremite_Male_Standard_Crossbow_02 - [N/A] 2119181617
+25210203:Eremite_Male_Standard_Crossbow_03 - [N/A] 3425185161
+25210204:EremiteElite_Male_Standard_Crossbow_01 - [N/A] 3201394457
+25210205:EremiteElite_Male_Standard_Crossbow_02 - [N/A] 3735395833
+25210206:EremiteElite_Male_Standard_Crossbow_03 - [N/A] 1444996537
+25210207:Eremite_Male_Standard_Crossbow_04 - [N/A] 1636753185
+25210208:NPC_Quest_Male_Standard_Eremite_01 - [N/A] 2050456833
+25210209:NPC_Quest_Male_Standard_Eremite_02 - [N/A] 3171996801
 25210301:鍍金旅團·鴉喙戟手
-25210302:[N/A] 2939413633
-25210303:[N/A] 2517557169
-25210304:[N/A] 3890286705
-25210305:[N/A] 1664946217
-25210306:[N/A] 696066441
-25210307:[N/A] 2671081977
+25210302:Eremite_Male_Standard_Pole_02 - [N/A] 2939413633
+25210303:Eremite_Male_Standard_Pole_03 - [N/A] 2517557169
+25210304:EremiteElite_Male_Standard_Pole_01 - [N/A] 3890286705
+25210305:EremiteElite_Male_Standard_Pole_02 - [N/A] 1664946217
+25210306:EremiteElite_Male_Standard_Pole_03 - [N/A] 696066441
+25210307:Eremite_Male_Standard_Pole_01 - [N/A] 2671081977
 25210401:鍍金旅團·破陣者
-25210402:[N/A] 839477089
-25210403:[N/A] 2628038825
-25210404:[N/A] 509218169
-25210405:[N/A] 4366953
-25210406:[N/A] 1385944497
+25210402:Eremite_MuscleMan_Gloves_02 - [N/A] 839477089
+25210403:Eremite_MuscleMan_Gloves_03 - [N/A] 2628038825
+25210404:EremiteElite_MuscleMan_Gloves_01 - [N/A] 509218169
+25210405:EremiteElite_MuscleMan_Gloves_02 - [N/A] 4366953
+25210406:EremiteElite_MuscleMan_Gloves_03 - [N/A] 1385944497
+25210407:NPC_Quest_MuscleMan_Standard_Eremite_01 - [N/A] 3844535385
 25210501:鍍金旅團·刀舞者
-25210502:[N/A] 3484979137
-25210503:[N/A] 2747515289
-25210504:[N/A] 1621612097
-25210505:[N/A] 4251715865
-25210506:[N/A] 124112617
-25210601:[N/A] 3480498409
-25210602:[N/A] 1531750897
+25210502:Eremite_MuscleMan_Simitar_02 - [N/A] 3484979137
+25210503:Eremite_MuscleMan_Simitar_03 - [N/A] 2747515289
+25210504:EremiteElite_MuscleMan_Simitar_01 - [N/A] 1621612097
+25210505:EremiteElite_MuscleMan_Simitar_02 - [N/A] 4251715865
+25210506:EremiteElite_MuscleMan_Simitar_03 - [N/A] 124112617
+25210507:Eremite_MuscleMan_Simitar_04 - [N/A] 1714026825
+25210601:Eremite_Male_Standard_NoWeapon_01 - [N/A] 3480498409
+25210602:Eremite_Male_Standard_NoWeapon_02 - [N/A] 1531750897
 25310101:鍍金旅團·沙中淨水
 25310201:鍍金旅團·熾陽凝冰
-25310202:[N/A] 3503187145
+25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
 25310301:鍍金旅團·白日鳴雷
-25410101:[N/A] 1317576089
-25410201:[N/A] 1223193297
+25410101:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410102:Eremite_Male_Strong_Katar_02 - [N/A] 1317576089
+25410103:Eremite_Male_Strong_Katar_01 - [N/A] 1317576089
+25410201:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410202:Eremite_Female_Standard_Longbow_01 - [N/A] 1223193297
+25410301:Eremite_Female_Standard_Oracle_01 - [N/A] 1223193297
+25410401:Monster_Eremite_Female_Standard_Dancer_01 - [N/A] 1223193297
 26010101:冰霜騙騙花
 26010102:冰霜騙騙花（雪山活動）
 26010201:熾熱騙騙花
@@ -335,28 +359,51 @@
 26060201:水螢
 26060301:冰螢
 26090101:浮游水蕈獸
+26090190:Fungus_Un_Gamma_Water_Enemy - [N/A] 2798916145
+26090191:Fungus_Un_Gamma_Water_01_Capture - [N/A] 4229105793
 26090201:旋轉雷蕈獸
-26090202:[N/A] 3825581857
-26090301:[N/A] 243798441
+26090202:Fungus_Un_Delta_Grass_01_02 - [N/A] 3825581857
+26090290:Fungus_Un_Delta_Grass_Enemy - [N/A] 2834173953
+26090291:Fungus_Un_Delta_Grass_01_Capture - [N/A] 3005241825
+26090301:Fungus_Un_Delta_Wind_01 - [N/A] 243798441
+26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
+26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
 26090401:旋轉冰蕈獸
+26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
+26090491:Fungus_Trois_Epsilon_Electric_01_Capture - [N/A] 3709881913
 26090501:伸縮火蕈獸
-26090601:[N/A] 4148148753
+26090590:Fungus_Trois_Alpha_Ice_Enemy - [N/A] 4208292977
+26090591:Fungus_Trois_Alpha_Ice_01_Capture - [N/A] 1798960849
+26090601:Fungus_Trois_Gamma_Fire_01 - [N/A] 4148148753
+26090690:Fungus_Trois_Gamma_Fire_Enemy - [N/A] 4223971953
+26090691:Fungus_Trois_Gamma_Fire_01_Capture - [N/A] 3680085465
 26090701:伸縮風蕈獸
+26090790:Fungus_Deux_Alpha_Fire_Enemy - [N/A] 1078684105
+26090791:Fungus_Deux_Alpha_Fire_01_Capture - [N/A] 2097382481
 26090801:伸縮岩蕈獸
+26090890:Fungus_Deux_Epsilon_Wind_Enemy - [N/A] 466604457
+26090891:Fungus_Deux_Epsilon_Wind_01_Capture - [N/A] 3913813441
 26090901:陸行水本真蕈
-26091001:[N/A] 1409125529
+26090990:Fungus_Deux_Beta_Rock_Enemy - [N/A] 287229801
+26090991:Fungus_Deux_Beta_Rock_01_Capture - [N/A] 4221967233
+26091001:Fungus_Deux_Delta_Electric_01 - [N/A] 1409125529
+26091090:Fungus_Deux_Delta_Electric_Enemy - [N/A] 2977465545
+26091091:Fungus_Deux_Delta_Electric_01_Capture - [N/A] 2399196673
+26100301:Monster_Vulture_Sacred_Fire_01 - [N/A] 2399196673
+26100401:Monster_Scorpion_Sacred_Electric_01 - [N/A] 2399196673
+26100501:Monster_Chrysopelea_Sacred_Wind_01 - [N/A] 2399196673
 26120101:有翼草本真蕈
 26120201:有翼冰本真蕈
-26120301:[N/A] 3299184601
-26120401:[N/A] 4098645257
+26120301:Fungus_Amanita_Du_Anudatta_Water_01 - [N/A] 3299184601
+26120401:Fungus_Amanita_Du_Udatta_Rock_01 - [N/A] 4098645257
 28020101:雪狐
 28020102:紅狐
 28020103:送禮雪狐
 28020104:送大禮雪狐
 28020105:雪狐
 28020106:紅狐
-28020107:[N/A] 378885401
-28020108:[N/A] 2121972905
+28020107:Fox_02 - [N/A] 378885401
+28020108:Fox_01_03 - [N/A] 2121972905
 28020201:松鼠
 28020301:野林豬
 28020302:小野林豬
@@ -367,12 +414,12 @@
 28020307:野林豬
 28020308:冰凍雪豬
 28020309:「大雪豬王」
-28020310:[N/A] 1922000329
-28020311:[N/A] 3804855321
-28020312:[N/A] 1052664969
+28020310:Boar_02_Hunt - [N/A] 1922000329
+28020311:Boar_01_Hunt - [N/A] 3804855321
+28020312:Boar_03_Hunt - [N/A] 1052664969
 28020313:大蕈猪？
 28020314:蕈猪
-28020315:[N/A] 977650529
+28020315:Boar_09 - [N/A] 977650529
 28020401:北地犬
 28020402:巡林犬
 28020403:柴犬
@@ -409,10 +456,11 @@
 28020901:武士狗分身（test）
 28020902:武士狗boss（test）
 28020903:太郎丸
+28020904:Inu_Shihandai_04 - [N/A] 467002241
 28030101:藍翎鷺
 28030102:菫䴉
-28030103:[N/A] 434877481
-28030104:[N/A] 3431473329
+28030103:Crane_01 - [N/A] 434877481
+28030104:Crane_01_Lbis - [N/A] 3431473329
 28030201:茶羽鷹
 28030202:棕翎鷹
 28030203:石鳶
@@ -428,8 +476,9 @@
 28030309:灰羽鴿
 28030310:赤脅鴿
 28030311:黑王鴿
-28030312:[N/A] 1045054721
+28030312:Pigeon_01 - [N/A] 1045054721
 28030313:暝彩鸟
+28030314:Crow_01 - [N/A] 3254419441
 28030401:赤團雀
 28030402:金團雀
 28030403:雪團雀
@@ -441,9 +490,8 @@
 28030409:碧團雀
 28030501:赤喙鴨
 28030502:翠冠鴨
-28030503:沉金鴨
 28030504:赤喙鴨
-28030505:[N/A] 3375863305
+28030505:Wigeon_01 - [N/A] 3375863305
 28040703:幽浮鰩
 28050201:新手盜寶鼬
 28050202:藏金盜寶鼬
@@ -456,48 +504,48 @@
 28050222:藏金盜寶鼬
 28050223:大黃金盜寶鼬
 28060101:棘冠鳄
-28060102:[N/A] 2866718929
-28060103:[N/A] 1328271489
+28060102:Gator_Strong_01 - [N/A] 2866718929
+28060103:Gator_01 - [N/A] 1328271489
 28060201:长鬓虎
-28060202:[N/A] 3539690529
-28060203:[N/A] 3418949673
-28060301:[N/A] 1575409961
-28060302:[N/A] 35400545
-28060401:[N/A] 2550380273
-28060402:[N/A] 1827515817
-28060501:[N/A] 2910802777
-28060502:[N/A] 3424336233
-28060503:[N/A] 3938050385
-28060504:[N/A] 457094737
-28060505:[N/A] 3374220305
-28060506:[N/A] 1349374089
-28060509:[N/A] 1497649297
-28060510:[N/A] 3380533609
-28060511:[N/A] 423020265
-28060512:[N/A] 112703337
-28060513:[N/A] 2396817929
+28060202:Panther_Strong_01 - [N/A] 3539690529
+28060203:Panther_01 - [N/A] 3418949673
+28060301:Vulture_01 - [N/A] 1575409961
+28060302:Vulture_01 - [N/A] 35400545
+28060401:Scorpion_01 - [N/A] 2550380273
+28060402:Scorpion_01 - [N/A] 1827515817
+28060501:Megamoth_Desert_01 - [N/A] 2910802777
+28060502:Megamoth_Desert_02 - [N/A] 3424336233
+28060503:Megamoth_Desert_03 - [N/A] 3938050385
+28060504:Megamoth_Desert_01 - [N/A] 457094737
+28060505:Megamoth_Desert_02 - [N/A] 3374220305
+28060506:Megamoth_Desert_03 - [N/A] 1349374089
+28060509:Megamoth_Desert_04 - [N/A] 1497649297
+28060510:Megamoth_Desert_05 - [N/A] 3380533609
+28060511:Megamoth_Desert_06 - [N/A] 423020265
+28060512:Megamoth_Desert_07 - [N/A] 112703337
+28060513:Megamoth_Desert_08 - [N/A] 2396817929
 28060601:牦牦驮兽
-28060602:[N/A] 409501041
-28060603:[N/A] 2740821897
-28060604:[N/A] 2340527241
-28060605:[N/A] 37512633
-28060606:[N/A] 2214856321
-28060609:[N/A] 1426424937
-28060610:[N/A] 3717654113
-28060611:[N/A] 1648208073
-28060612:[N/A] 2053098161
-28060613:[N/A] 276253497
-28060614:[N/A] 465761521
-28060701:[N/A] 3963893857
-28060801:[N/A] 3494586161
-28060901:[N/A] 3910686713
-28061001:[N/A] 3720242777
-28061002:[N/A] 3801760225
-28061101:[N/A] 3407624849
-28061201:[N/A] 2733673945
-28061301:[N/A] 3469996769
-28061401:[N/A] 2330015681
-28061402:[N/A] 3443985385
+28060602:Megamoth_Jungle_02 - [N/A] 409501041
+28060603:Megamoth_Jungle_03 - [N/A] 2740821897
+28060604:Megamoth_Jungle_01 - [N/A] 2340527241
+28060605:Megamoth_Jungle_02 - [N/A] 37512633
+28060606:Megamoth_Jungle_03 - [N/A] 2214856321
+28060609:Megamoth_Jungle_Strong_01 - [N/A] 1426424937
+28060610:Megamoth_Jungle_04 - [N/A] 3717654113
+28060611:Megamoth_Jungle_05 - [N/A] 1648208073
+28060612:Megamoth_Jungle_06 - [N/A] 2053098161
+28060613:Megamoth_Jungle_07 - [N/A] 276253497
+28060614:Megamoth_Jungle_08 - [N/A] 465761521
+28060701:Megamoth_Desert_04 - [N/A] 3963893857
+28060801:Megamoth_Desert_05 - [N/A] 3494586161
+28060901:Megamoth_Desert_06 - [N/A] 3910686713
+28061001:Megamoth_Desert_07 - [N/A] 3720242777
+28061002:Megamoth_Desert_08 - [N/A] 3801760225
+28061101:Megamoth_Jungle_04 - [N/A] 3407624849
+28061201:Megamoth_Jungle_05 - [N/A] 2733673945
+28061301:Megamoth_Jungle_06 - [N/A] 3469996769
+28061401:Megamoth_Jungle_07 - [N/A] 2330015681
+28061402:Megamoth_Jungle_08 - [N/A] 3443985385
 28210101:塵歌壺：黃金蟹
 28210102:塵歌壺：太陽蟹
 28210103:塵歌壺：海藍蟹
@@ -510,23 +558,23 @@
 28210205:塵歌壺：金鰍鰍
 28210206:塵歌壺：晴天鰍鰍
 28210207:塵歌壺：嗜髓蜥
-28210208:[N/A] 4168682209
+28210208:Homeworld_Lizard_05 - [N/A] 4168682209
 28210301:塵歌壺：青蛙
 28210302:塵歌壺：泥蛙
 28210303:塵歌壺：藍蛙
-28210304:[N/A] 1743923249
+28210304:Homeworld_Frog_04 - [N/A] 1743923249
 28210401:塵歌壺：藤紋陸鰻鰻
 28210402:塵歌壺：深海鰻鰻
 28210403:塵歌壺：赤鰭陸鰻鰻
-28210404:[N/A] 1020919801
+28210404:Homeworld_Eel_04 - [N/A] 1020919801
 28220101:塵歌壺：雪狐
 28220102:塵歌壺：紅狐
-28220108:[N/A] 3596224209
+28220108:Homeworld_Fox_03 - [N/A] 3596224209
 28220201:塵歌壺：松鼠
 28220301:塵歌壺：野林豬
 28220303:塵歌壺：雪豬
-28220313:[N/A] 2460569713
-28220314:[N/A] 3974077529
+28220313:Homeworld_Boar_Grass - [N/A] 2460569713
+28220314:Homeworld_Boar_Grass_Small - [N/A] 3974077529
 28220401:塵歌壺：北地犬
 28220402:塵歌壺：巡林犬
 28220403:塵歌壺：柴犬
@@ -540,20 +588,20 @@
 28220601:塵歌壺：雪隱鼬
 28220602:塵歌壺：紅尾鼬
 28220603:塵歌壺：靴子鼬
-28220604:[N/A] 3102074185
+28220604:Homeworld_Marten_04 - [N/A] 3102074185
 28220605:塵歌壺：青雷鼬
 28220701:塵歌壺：狐
 28220901:塵歌壺：影狼丸
 28230101:塵歌壺：藍翎鷺
 28230102:塵歌壺：菫䴉
-28230104:[N/A] 811422561
+28230104:Homeworld_Crane_01_Lbis - [N/A] 811422561
 28230301:塵歌壺：白鴿
 28230302:塵歌壺：璃冠鴿
 28230303:塵歌壺：灰羽鴿
 28230304:塵歌壺：赤脅鴿
 28230305:塵歌壺：黑王鴿
 28230306:塵歌壺：鴉
-28230313:[N/A] 3724967537
+28230313:Homeworld_Pigeon_Beak_01 - [N/A] 3724967537
 28230401:塵歌壺：赤團雀
 28230402:塵歌壺：金團雀
 28230403:塵歌壺：雪團雀
@@ -581,20 +629,20 @@
 28240602:塵歌壺：苦炮魨
 28240701:塵歌壺：迪芙妲鰩
 28240702:塵歌壺：佛瑪洛鰩
-28240801:[N/A] 2213501889
-28240802:[N/A] 2420839809
-28240803:[N/A] 619347953
-28240804:[N/A] 2847515857
-28240901:[N/A] 4288334729
-28240902:[N/A] 2843011617
+28240801:Homeworld_Fishable_Maritime_Batdiodan_01 - [N/A] 2213501889
+28240802:Homeworld_Fishable_Maritime_Batdiodan_02 - [N/A] 2420839809
+28240803:Homeworld_Fishable_Maritime_Batdiodan_03 - [N/A] 619347953
+28240804:Homeworld_Fishable_Maritime_Batdiodan_04 - [N/A] 2847515857
+28240901:Homeworld_Fishable_Maritime_Apsva_01 - [N/A] 4288334729
+28240902:Homeworld_Fishable_Maritime_Apsva_02 - [N/A] 2843011617
 28250101:塵歌壺：風晶蝶
 28250102:塵歌壺：岩晶蝶
 28250103:塵歌壺：冰晶蝶
 28250104:塵歌壺：雷晶蝶
 28250105:塵歌壺：珊瑚蝶
-28250106:[N/A] 3343647737
+28250106:Homeworld_Wisp_Grass_01 - [N/A] 3343647737
 28250301:塵歌壺：吉光蟲
-28250401:[N/A] 741074761
+28250401:Homeworld_Boltbug_Scarab_01 - [N/A] 741074761


 // BOSS
@@ -605,8 +653,13 @@
 20040301:無相之岩 基末爾
 20040302:（活動）無相之岩 基末爾
 20040401:無相之水
+20040402:Effigy_Water_02 - [N/A] 2510499945
 20040501:無相之冰 塔勒特
+20040502:Effigy_Ice_01 - [N/A] 244519785
 20040601:無相之火 亞因
+20040602:Effigy_Fire_02 - [N/A] 802657121
+20040701:Effigy_Grass_01 - [N/A] 572615921
+20040702:Effigy_Grass_02 - [N/A] 2410347593
 20050101:純水精靈
 20050102:純水精靈（本體）
 20070101:雷音權現
@@ -614,12 +667,13 @@
 24010401:遺蹟巨蛇
 24021101:恒常機關陣列
 24021102:恒常機關陣列（稻妻活動專用）
-24030301:[N/A] 3108339881
-24050101:[N/A] 2629579681
+24030301:Gargoyle_Fafnir_01 - [N/A] 3108339881
+24050101:Monolith_Starchild - [N/A] 2629579681
 25090101:魔偶劍鬼
 25090102:魔偶劍鬼（風分身）
 25090103:魔偶劍鬼（冰分身）
 25090104:魔偶劍鬼（面具分身）
+25090105:Samurai_Ningyo_05 - 傀儡將軍-面具分身
 25090201:魔偶劍鬼·孤風
 25090301:魔偶劍鬼·霜馳
 25090401:魔偶劍鬼·兇面
@@ -640,6 +694,7 @@
 26050802:深海龍蜥·吞雷
 26080101:跋掣
 26110101:翠翎恐蕈
+26130101:Sandworm_01 - [N/A] 4098645257
 29010101:裂空的魔龍
 29010102:裂空的魔龍
 29010103:裂空的魔龍
@@ -666,6 +721,12 @@
 29060201:禍津御建鳴神命
 29060202:禍津御建鳴神命
 29060203:禍津御建鳴神命
+29070101:Monster_Nada - [N/A] 3425649649
+29070102:Monster_Nada - [N/A] 996756049
+29070103:Monster_Nada - [N/A] 887141825
+29070104:Monster_Nada - [N/A] 3834332121
+29070105:Monster_Nada - [N/A] 1547264913
+29070106:Monster_Nada - [N/A] 641768601


 // 動物
@@ -690,7 +751,7 @@
 28010401:藤紋陸鰻鰻
 28010402:深海鰻鰻
 28010403:赤鰭陸鰻鰻
-28010404:[N/A] 2823603497
+28010404:Eel_04 - [N/A] 2823603497
 28040101:黑背鱸魚
 28040102:藍鰭鱸魚
 28040103:黃金鱸魚
@@ -706,7 +767,13 @@
 28050105:珊瑚蝶
 28050106:草晶蝶
 28050301:吉光蟲
-28050401:[N/A] 2466918521
+28050401:Boltbug_Scarab_01 - [N/A] 2466918521
+28050501:Electrohercules_01 - [N/A] 2466918521
+28050502:Electrohercules_02 - [N/A] 2466918521
+28050503:Electrohercules_03 - [N/A] 2466918521
+28050504:Electrohercules_04 - [N/A] 2466918521
+28050505:Electrohercules_05 - [N/A] 2466918521
+28050506:Electrohercules_06 - [N/A] 2466918521


 // 魚
--- a/Source/GrasscutterTools/Resources/zh-tw/Quest.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Quest.txt
@@ -24,6 +24,7 @@
 30325:女神像解鎖 - [N/A] 1854299071
 30326:女神像解鎖 - [N/A] 853608247
 30327:女神像解鎖 - [N/A] 416738111
+30328:女神像解鎖 - [N/A] 416738111
 30600:昔日的風 - 在廟宇門口跟安柏見面
 30601:昔日的風 - 與安柏對話
 30602:昔日的風 - 進入廟宇
@@ -1575,22 +1576,22 @@
 201211:異鄉人的懺悔錄 - 繼續與韋爾納交涉
 201212:異鄉人的懺悔錄 - 尋找足輕慶次郎的蹤跡
 201213:異鄉人的懺悔錄 - 向韋爾納分析情況
-201214:異鄉人的懺悔錄 - 與韋爾納討論後續計劃
+201214:異鄉人的懺悔錄 - 與韋爾納討論後續計畫
 201215:異鄉人的懺悔錄 - 與托馬對話
 201216:異鄉人的懺悔錄 - 向韋爾納展示來自璃月的物品
 201217:異鄉人的懺悔錄 - 繼續與韋爾納交涉
-201301:離島逃離計劃 - 嘗試離開離島
-201302:離島逃離計劃 - 與勘定奉行慎介對話
-201303:離島逃離計劃 - 離開勘定奉行所
-201304:離島逃離計劃 - 與新之丞對話
-201305:離島逃離計劃 - 在第二天的約定時間（18-24時）與柊家小姐見面
-201306:離島逃離計劃 - 在約定時間（18-24時）與柊家小姐見面
-201307:離島逃離計劃 - 與柊千里會面
-201308:離島逃離計劃 - 前往離島邊境，實施千里的計劃
-201309:離島逃離計劃 - 護送貨物離開離島
-201310:離島逃離計劃 - 向柊千里道別
-201311:離島逃離計劃 - 前往勘定奉行所，詢問離開離島的方法
-201312:離島逃離計劃 - [CHS] - (test)护送失败处理回滚$HIDDEN
+201301:離島逃離計畫 - 嘗試離開離島
+201302:離島逃離計畫 - 與勘定奉行慎介對話
+201303:離島逃離計畫 - 離開勘定奉行所
+201304:離島逃離計畫 - 與新之丞對話
+201305:離島逃離計畫 - 在第二天的約定時間（18-24時）與柊家小姐見面
+201306:離島逃離計畫 - 在約定時間（18-24時）與柊家小姐見面
+201307:離島逃離計畫 - 與柊千里會面
+201308:離島逃離計畫 - 前往離島邊境，實施千里的計畫
+201309:離島逃離計畫 - 護送貨物離開離島
+201310:離島逃離計畫 - 向柊千里道別
+201311:離島逃離計畫 - 前往勘定奉行所，詢問離開離島的方法
+201312:離島逃離計畫 - [CHS] - (test)护送失败处理回滚$HIDDEN
 201401:渴求神明注視之人 - 前往古代遺蹟調查
 201402:渴求神明注視之人 - [CHS] - 与派蒙对话$HIDDEN
 201403:渴求神明注視之人 - 調查古代遺蹟
@@ -1975,87 +1976,87 @@
 302114:熱沙中的秘密 - 等待至第二天早上（6-8點）
 302115:熱沙中的秘密 - [CHS] - 播放CS$HIDDEN
 302116:熱沙中的秘密 - 深入探索遺蹟
-302201:[N/A] 0 - 等到第二天8點-12點
-302202:[N/A] 0 - 前往教令院外與艾爾海森會合
-302203:[N/A] 0 - 與艾爾海森一起進入教令院
-302204:[N/A] 0 - 進入智慧宮
-302205:[N/A] 0 - 與艾爾海森對話
-302206:[N/A] 0 - 暫時躲藏起來，等待機會
-302207:[N/A] 0 - [N/A] 3442967412
-302208:[N/A] 0 - 與派蒙對話
-302209:[N/A] 0 - 設法與納西妲的意識進行連結
-302210:[N/A] 0 - 與納西妲的意識對話
-302211:[N/A] 0 - 與謝赫祖拜爾對話
-302212:[N/A] 0 - 前往教令院附近
-302213:[N/A] 0 - 前往教令院附近
-302214:[N/A] 0 - [N/A] 1732046580
-302215:[N/A] 0 - 與派蒙對話
-302216:[N/A] 0 - 幕間·迪希雅與拉赫曼的對話
-302217:[N/A] 0 - 吸引教令院衛兵進入埋伏圈
-302218:[N/A] 0 - 幕間·大賢者阿扎爾前往淨善宮
-302219:[N/A] 0 - 幕間·大賢者阿扎爾的疑慮
-302220:[N/A] 0 - 幕間·大賢者阿扎爾前往淨善宮
-302221:[N/A] 0 - 與派蒙對話
-302222:[N/A] 0 - 前往淨善宮
-302223:[N/A] 0 - 與納西妲對話
-302224:[N/A] 0 - 吸引教令院衛兵進入埋伏圈
-302225:[N/A] 0 - [N/A] 1295878188
-302226:[N/A] 0 - 與謝赫祖拜爾對話
-302227:[N/A] 0 - 與派蒙對話
-302228:[N/A] 0 - 幕間·迪希雅與拉赫曼的對話
-302229:[N/A] 0 - 幕間·大賢者阿扎爾的疑慮
-302230:[N/A] 0 - 與派蒙對話
-302231:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302232:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
-302233:[N/A] 0 - 與派蒙對話
-302234:[N/A] 0 - [N/A] 403262332
-302235:[N/A] 0 - [N/A] 3258363788
-302236:[N/A] 0 - [N/A] 2830775676
-302237:[N/A] 0 - [N/A] 33960564
-302238:[N/A] 0 - [N/A] 3034910092
-302239:[N/A] 0 - [N/A] 1042508412
-302240:[N/A] 0 - [N/A] 2334919076
-302241:[N/A] 0 - 離開淨善宮
-302242:[N/A] 0 - [N/A] 2103971276
-302243:[N/A] 0 - [N/A] 2524469860
-302244:[N/A] 0 - [N/A] 3247687540
-302245:[N/A] 0 - [N/A] 4115109332
-302246:[N/A] 0 - [N/A] 2898922556
-302247:[N/A] 0 - [N/A] 1634110884
-302248:[N/A] 0 - [N/A] 1799067076
-302249:[N/A] 0 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302201:熱沙中的秘密 - 等到第二天8點-12點
+302202:熱沙中的秘密 - 前往教令院外與艾爾海森會合
+302203:熱沙中的秘密 - 與艾爾海森一起進入教令院
+302204:熱沙中的秘密 - 進入智慧宮
+302205:熱沙中的秘密 - 與艾爾海森對話
+302206:熱沙中的秘密 - 暫時躲藏起來，等待機會
+302207:熱沙中的秘密 - [N/A] 3442967412
+302208:熱沙中的秘密 - 與派蒙對話
+302209:熱沙中的秘密 - 設法與納西妲的意識進行連結
+302210:熱沙中的秘密 - 與納西妲的意識對話
+302211:熱沙中的秘密 - 與謝赫祖拜爾對話
+302212:熱沙中的秘密 - 前往教令院附近
+302213:熱沙中的秘密 - 前往教令院附近
+302214:熱沙中的秘密 - [N/A] 1732046580
+302215:熱沙中的秘密 - 與派蒙對話
+302216:熱沙中的秘密 - 幕間·迪希雅與拉赫曼的對話
+302217:熱沙中的秘密 - 吸引教令院衛兵進入埋伏圈
+302218:熱沙中的秘密 - 幕間·大賢者阿扎爾前往淨善宮
+302219:熱沙中的秘密 - 幕間·大賢者阿扎爾的疑慮
+302220:熱沙中的秘密 - 幕間·大賢者阿扎爾前往淨善宮
+302221:熱沙中的秘密 - 與派蒙對話
+302222:熱沙中的秘密 - 前往淨善宮
+302223:熱沙中的秘密 - 與納西妲對話
+302224:熱沙中的秘密 - 吸引教令院衛兵進入埋伏圈
+302225:熱沙中的秘密 - [N/A] 1295878188
+302226:熱沙中的秘密 - 與謝赫祖拜爾對話
+302227:熱沙中的秘密 - 與派蒙對話
+302228:熱沙中的秘密 - 幕間·迪希雅與拉赫曼的對話
+302229:熱沙中的秘密 - 幕間·大賢者阿扎爾的疑慮
+302230:熱沙中的秘密 - 與派蒙對話
+302231:熱沙中的秘密 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302232:熱沙中的秘密 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
+302233:熱沙中的秘密 - 與派蒙對話
+302234:熱沙中的秘密 - [N/A] 403262332
+302235:熱沙中的秘密 - [N/A] 3258363788
+302236:熱沙中的秘密 - [N/A] 2830775676
+302237:熱沙中的秘密 - [N/A] 33960564
+302238:熱沙中的秘密 - [N/A] 3034910092
+302239:熱沙中的秘密 - [N/A] 1042508412
+302240:熱沙中的秘密 - [N/A] 2334919076
+302241:熱沙中的秘密 - 離開淨善宮
+302242:熱沙中的秘密 - [N/A] 2103971276
+302243:熱沙中的秘密 - [N/A] 2524469860
+302244:熱沙中的秘密 - [N/A] 3247687540
+302245:熱沙中的秘密 - [N/A] 4115109332
+302246:熱沙中的秘密 - [N/A] 2898922556
+302247:熱沙中的秘密 - [N/A] 1634110884
+302248:熱沙中的秘密 - [N/A] 1799067076
+302249:熱沙中的秘密 - [CHS] - 设法与纳西妲的意识进行连接$HIDDEN
 302301:[N/A] 0 - [CHS] - （test）隐藏子任务带闲置对话$HIDDEN
-302401:[N/A] 0 - 與坎蒂絲對話
-302402:[N/A] 0 - 與艾爾海森會合
-302403:[N/A] 0 - 前往鍍金旅團的據點
-302404:[N/A] 0 - 前往喀萬驛與賽諾會合
-302405:[N/A] 0 - 與喀萬驛駐守士兵交涉
-302406:[N/A] 0 - 等待至約定時間（兩天後）
-302407:[N/A] 0 - 前往沙海東部
-302408:[N/A] 0 - 協助賽諾抓捕鍍金旅團
-302409:[N/A] 0 - 與賽諾對話
-302410:[N/A] 0 - 等待至次日
-302411:[N/A] 0 - 進入阿如村村長家
-302412:[N/A] 0 - 與坎蒂絲對話
-302413:[N/A] 0 - 進入阿如村村長家
-302414:[N/A] 0 - 離開阿如村村長家
-302501:[N/A] 0 - 前往喀萬驛與迪希雅會合
-302502:[N/A] 0 - 到禪那園找提納里
-302503:[N/A] 0 - 前往奧摩斯港
-302504:[N/A] 0 - 跟蹤愚人眾士兵
-302505:[N/A] 0 - 與迪希雅對話
-302506:[N/A] 0 - 盡快返回禪那園
-302507:[N/A] 0 - 擊退來襲的愚人眾
-302508:[N/A] 0 - 與提納里對話
-302509:[N/A] 0 - 確認提納里和迪希雅的狀況
-302510:[N/A] 0 - 前往海芭夏所在地
-302511:[N/A] 0 - 等待至會合時間（19-21點）
-302512:[N/A] 0 - 前往大巴扎
-302513:[N/A] 0 - 在維卡拉商棧內隱蔽身形
-302514:[N/A] 0 - 跟隨迪希雅一同「追蹤」博士
-302515:[N/A] 0 - 與迪希雅對話
-302516:[N/A] 0 - 離開禪那園後與迪希雅對話
-302517:[N/A] 0 - [CHS] - (test)(hide)删除船只$HIDDEN
+302401:熱沙中的秘密 - 與坎蒂絲對話
+302402:熱沙中的秘密 - 與艾爾海森會合
+302403:熱沙中的秘密 - 前往鍍金旅團的據點
+302404:熱沙中的秘密 - 前往喀萬驛與賽諾會合
+302405:熱沙中的秘密 - 與喀萬驛駐守士兵交涉
+302406:熱沙中的秘密 - 等待至約定時間（兩天後）
+302407:熱沙中的秘密 - 前往沙海東部
+302408:熱沙中的秘密 - 協助賽諾抓捕鍍金旅團
+302409:熱沙中的秘密 - 與賽諾對話
+302410:熱沙中的秘密 - 等待至次日
+302411:熱沙中的秘密 - 進入阿如村村長家
+302412:熱沙中的秘密 - 與坎蒂絲對話
+302413:熱沙中的秘密 - 進入阿如村村長家
+302414:熱沙中的秘密 - 離開阿如村村長家
+302501:熱沙中的秘密 - 前往喀萬驛與迪希雅會合
+302502:熱沙中的秘密 - 到禪那園找提納里
+302503:熱沙中的秘密 - 前往奧摩斯港
+302504:熱沙中的秘密 - 跟蹤愚人眾士兵
+302505:熱沙中的秘密 - 與迪希雅對話
+302506:熱沙中的秘密 - 盡快返回禪那園
+302507:熱沙中的秘密 - 擊退來襲的愚人眾
+302508:熱沙中的秘密 - 與提納里對話
+302509:熱沙中的秘密 - 確認提納里和迪希雅的狀況
+302510:熱沙中的秘密 - 前往海芭夏所在地
+302511:熱沙中的秘密 - 等待至會合時間（19-21點）
+302512:熱沙中的秘密 - 前往大巴扎
+302513:熱沙中的秘密 - 在維卡拉商棧內隱蔽身形
+302514:熱沙中的秘密 - 跟隨迪希雅一同「追蹤」博士
+302515:熱沙中的秘密 - 與迪希雅對話
+302516:熱沙中的秘密 - 離開禪那園後與迪希雅對話
+302517:熱沙中的秘密 - [CHS] - (test)(hide)删除船只$HIDDEN
 302601:[N/A] 0 - [CHS] - (test)(hide)刷柯莱的早餐$HIDDEN
 302602:[N/A] 0 - 與柯萊對話
 302603:[N/A] 0 - 前往大巴扎
@@ -3652,7 +3653,7 @@
 1301302:[N/A] 0 - 與皮特交談
 1301303:[N/A] 0 - 跟隨皮特前往「品夢一刻」
 1301304:[N/A] 0 - 前往埃勒曼提到的地方
-1301305:[N/A] 0 - 擊敗襲來的魔物
+1301305:[N/A] 0 - 擊敗眼前的魔物
 1301306:[N/A] 0 - 與埃勒曼交談
 1301307:[N/A] 0 - 返回「品夢一刻」確認現狀
 1301308:[N/A] 0 - 關照失落的埃勒曼
@@ -3799,17 +3800,17 @@
 1901408:唯有睡覺不可耽誤 - 消滅史萊姆
 1901409:唯有睡覺不可耽誤 - 與早柚商量對策
 1901410:唯有睡覺不可耽誤 - [CHS] - 悄悄接近神社后的樱树$HIDDEN
-1901501:替身計劃 - 前往忍術訓練地點
-1901502:替身計劃 - 穿越障礙，盡快抵達終點
-1901503:替身計劃 - [CHS] - （test）高评价$HIDDEN
-1901504:替身計劃 - 前往實戰訓練地點
-1901505:替身計劃 - 消滅史萊姆
-1901506:替身計劃 - 與早柚交談
-1901507:替身計劃 - 跟隨早柚前往休息地點
-1901508:替身計劃 - [CHS] - （test）中评价$HIDDEN
-1901509:替身計劃 - [CHS] - （test）低评价$HIDDEN
-1901510:替身計劃 - 與早柚交談
-1901511:替身計劃 - [N/A] 3924351780
+1901501:替身計畫 - 前往忍術訓練地點
+1901502:替身計畫 - 穿越障礙，盡快抵達終點
+1901503:替身計畫 - [CHS] - （test）高评价$HIDDEN
+1901504:替身計畫 - 前往實戰訓練地點
+1901505:替身計畫 - 消滅史萊姆
+1901506:替身計畫 - 與早柚交談
+1901507:替身計畫 - 跟隨早柚前往休息地點
+1901508:替身計畫 - [CHS] - （test）中评价$HIDDEN
+1901509:替身計畫 - [CHS] - （test）低评价$HIDDEN
+1901510:替身計畫 - 與早柚交談
+1901511:替身計畫 - [N/A] 3924351780
 1901601:「終末番」疑雲 - 前往約定地點等待對方
 1901602:「終末番」疑雲 - 和小川去見海亂鬼
 1901603:「終末番」疑雲 - 擊敗海亂鬼
@@ -4367,15 +4368,15 @@
 1909218:諾艾爾的情報工作 - [N/A] 2332648276
 1909219:諾艾爾的情報工作 - [N/A] 2591636452
 1910101:「貓尾酒館」的調酒師 - 與寧錄對話
-1910102:「貓尾酒館」的調酒師 - 與迪奥娜對話
+1910102:「貓尾酒館」的調酒師 - 與迪奧娜對話
 1910103:「貓尾酒館」的調酒師 - 跟隨迪奧娜
 1910104:「貓尾酒館」的調酒師 - 前往達達烏帕谷
 1910105:「貓尾酒館」的調酒師 - 跟隨迪奧娜
-1910201:尋貓要訣 - 與迪奥娜對話
+1910201:尋貓要訣 - 與迪奧娜對話
 1910202:尋貓要訣 - 跟隨迪奧娜
-1910203:尋貓要訣 - 與迪奥娜對話
+1910203:尋貓要訣 - 與迪奧娜對話
 1910204:尋貓要訣 - 跟隨迪奧娜
-1910205:尋貓要訣 - 與迪奥娜對話
+1910205:尋貓要訣 - 與迪奧娜對話
 1910206:尋貓要訣 - 在蒙德城的屋頂尋找小貓
 1910207:尋貓要訣 - 試著與羅傑交流
 1910208:尋貓要訣 - 在鐵匠鋪附近尋找小貓
@@ -4383,49 +4384,49 @@
 1910210:尋貓要訣 - 在教堂附近尋找小貓
 1910211:尋貓要訣 - 試著與派斯利交流
 1910212:尋貓要訣 - 回到貓尾酒館
-1910213:尋貓要訣 - 與迪奥娜對話
+1910213:尋貓要訣 - 與迪奧娜對話
 1910214:尋貓要訣 - [CHS] - (test)隐藏任务用于完成主任务$HIDDEN
-1910301:特殊的基底飲品 - 與迪奥娜對話
+1910301:特殊的基底飲品 - 與迪奧娜對話
 1910302:特殊的基底飲品 - 前往達達烏帕谷
 1910303:特殊的基底飲品 - 與谷口的人對話
 1910304:特殊的基底飲品 - 與艾倫對話
 1910305:特殊的基底飲品 - 前往達達烏帕谷
 1910306:特殊的基底飲品 - [CHS] - (test)莽进达达乌帕谷时用于完成父任务$HIDDEN
-1910401:達達烏帕谷之影 - 與迪奥娜對話
+1910401:達達烏帕谷之影 - 與迪奧娜對話
 1910402:達達烏帕谷之影 - 避開魔物，深入達達烏帕谷
 1910403:達達烏帕谷之影 - 避開魔物，繼續深入達達烏帕谷
 1910404:達達烏帕谷之影 - 避開魔物，繼續深入達達烏帕谷
 1910405:達達烏帕谷之影 - 避開魔物，繼續深入達達烏帕谷
-1910406:達達烏帕谷之影 - 與迪奥娜對話
+1910406:達達烏帕谷之影 - 與迪奧娜對話
 1910407:達達烏帕谷之影 - 前往丘丘人營地
 1910408:達達烏帕谷之影 - 與杜拉夫對話
 1910409:達達烏帕谷之影 - 與艾倫對話
-1910410:達達烏帕谷之影 - 與迪奥娜對話
+1910410:達達烏帕谷之影 - 與迪奧娜對話
 1910411:達達烏帕谷之影 - 尋找「丘丘人薩滿草藥湯」
 1910412:達達烏帕谷之影 - 尋找「丘丘人薩滿草藥湯」
 1910413:達達烏帕谷之影 - 尋找「丘丘人薩滿草藥湯」
 1910414:達達烏帕谷之影 - [CHS] - (test)隐藏任务用于潜行失败播放开车1$HIDDEN
 1910415:達達烏帕谷之影 - [CHS] - (test)隐藏任务用于潜行失败播放开车2$HIDDEN
 1910416:達達烏帕谷之影 - [CHS] - (test)隐藏任务用于莽进去刷怪$HIDDEN
-1910417:達達烏帕谷之影 - 與迪奥娜對話
-1910418:達達烏帕谷之影 - 與迪奥娜對話
-1910501:丘丘人薩滿的草藥湯 - 與迪奥娜對話
+1910417:達達烏帕谷之影 - 與迪奧娜對話
+1910418:達達烏帕谷之影 - 與迪奧娜對話
+1910501:丘丘人薩滿的草藥湯 - 與迪奧娜對話
 1910502:丘丘人薩滿的草藥湯 - 與艾倫對話
-1910601:特殊的調酒副材料 - 與迪奥娜對話
+1910601:特殊的調酒副材料 - 與迪奧娜對話
 1910602:特殊的調酒副材料 - 向前探索，蒐集調酒材料
-1910603:特殊的調酒副材料 - 與迪奥娜對話
+1910603:特殊的調酒副材料 - 與迪奧娜對話
 1910604:特殊的調酒副材料 - 將新鮮的魚肉交給迪奧娜
 1910605:特殊的調酒副材料 - 向前探索，蒐集調酒材料
-1910606:特殊的調酒副材料 - 與迪奥娜對話
-1910607:特殊的調酒副材料 - 將「新鮮的史萊姆凝液」交給迪奥娜
-1910608:特殊的調酒副材料 - 與迪奥娜對話
+1910606:特殊的調酒副材料 - 與迪奧娜對話
+1910607:特殊的調酒副材料 - 將「新鮮的史萊姆凝液」交給迪奧娜
+1910608:特殊的調酒副材料 - 與迪奧娜對話
 1910609:特殊的調酒副材料 - [CHS] - (test)隐藏任务用于发放任务道具$HIDDEN
-1910701:調酒師之間的切磋 - 前往「晨曦酒莊」與迪奥娜會合
+1910701:調酒師之間的切磋 - 前往「晨曦酒莊」與迪奧娜會合
 1910702:調酒師之間的切磋 - 開始調製酒品
 1910703:調酒師之間的切磋 - 將調製出來的酒品交給迪奧娜
-1910704:調酒師之間的切磋 - 與迪奥娜對話
+1910704:調酒師之間的切磋 - 與迪奧娜對話
 1910705:調酒師之間的切磋 - 開始調製酒品
-1910706:調酒師之間的切磋 - 與迪奥娜對話
+1910706:調酒師之間的切磋 - 與迪奧娜對話
 1911101:背後的非議 - 前往與托馬約定的地點
 1911201:東道主的邀請 - 與托馬商議「招待」的內容
 1911301:多謝款待！ - 前往木漏茶室尋找托馬
@@ -6080,9 +6081,9 @@
 2204801:神社大掃除 - 與寢子對話
 2204802:神社大掃除 - 打掃淺瀨神社周圍的落葉
 2204803:神社大掃除 - 向寢子回報
-2204901:煙花試玩計劃 - 與長野原龍之介對話
-2204902:煙花試玩計劃 - 去城外試玩煙花
-2204903:煙花試玩計劃 - 向長野原龍之介回報
+2204901:煙花試玩計畫 - 與長野原龍之介對話
+2204902:煙花試玩計畫 - 去城外試玩煙花
+2204903:煙花試玩計畫 - 向長野原龍之介回報
 2205001:鳴神尋蹤 - [CHS] - 与寝子对话$HIDDEN
 2205002:鳴神尋蹤 - 前往鳴神大社附近
 2205003:鳴神尋蹤 - 前往鳴神大社
@@ -6710,7 +6711,7 @@
 2303905:跑，希爾米，跑 - 與希爾米對話
 2304001:倉儲事務 - [CHS] - (test)随机分支用$HIDDEN
 2304002:倉儲事務 - 與納傑特對話
-2304003:倉儲事務 - 打倒所有禿鷲
+2304003:倉儲事務 - 打倒所有赤鷲
 2304004:倉儲事務 - 向納傑特回報
 2304005:倉儲事務 - 與納傑特對話
 2304006:倉儲事務 - 回收貨物
@@ -9158,7 +9159,7 @@
 7066109:魚群大爆發 - 和楠塔克對話
 7066110:魚群大爆發 - [CHS] - (test)检测是否获取观赏鱼$HIDDEN
 7066201:[CHS] - (test)钓鱼引导任务$HIDDEN - [CHS] - (test)发鱼竿的隐藏任务$HIDDEN
-7066301:[N/A] 0 - [CHS] - （test）测试任务$UNRELEASED
+7066301:[N/A] 0 - [N/A] 556097052
 7066401:秘境來風 - 與宏朗對話
 7070001:海倫的特效潤喉茶 - 將十朵甜甜花交給海倫
 7070002:海倫的特效潤喉茶 - 與海倫對話
@@ -12718,9 +12719,9 @@
 7266401:逐月節的諸多事宜 - 與琳陽對話
 7266501:[CHS] - （test）开璃月后第一次对话$UNRELEASED$HIDDEN - [N/A] 159156708
 7266601:[CHS] - （test）开雪山后第一次对话$UNRELEASED$HIDDEN - [N/A] 2749811932
-7266701:魚餌補充計劃 - [CHS] - 等待玩家饵料数低于1$HIDDEN
-7266702:魚餌補充計劃 - 與鯨井椛對話
-7266703:魚餌補充計劃 - [CHS] - 回滚任务$HIDDEN
+7266701:魚餌補充計畫 - [CHS] - 等待玩家饵料数低于1$HIDDEN
+7266702:魚餌補充計畫 - 與鯨井椛對話
+7266703:魚餌補充計畫 - [CHS] - 回滚任务$HIDDEN
 7266801:[CHS] - 和派蒙隐藏对话$HIDDEN - [N/A] 2751061716
 7266802:[CHS] - 和派蒙隐藏对话$HIDDEN - [N/A] 3871313788
 7266901:魚餌補充計劃 - [CHS] - 废弃$HIDDEN
@@ -12872,8 +12873,8 @@
 7271402:陸的鳥蛋需求 - 與陸對話
 7271501:甘樂的相思之意 - 將5束緋櫻繡球交給甘樂
 7271502:甘樂的相思之意 - 與甘樂對話
-7271601:鹿野奈奈的健康飲食計劃 - 將15根胡蘿蔔交給鹿野奈奈
-7271602:鹿野奈奈的健康飲食計劃 - 與鹿野奈奈對話
+7271601:鹿野奈奈的健康飲食計畫 - 將15根胡蘿蔔交給鹿野奈奈
+7271602:鹿野奈奈的健康飲食計畫 - 與鹿野奈奈對話
 7271701:梢的鐵塊需求 - 將10份鐵塊交給梢
 7271702:梢的鐵塊需求 - 與梢對話
 7271801:松本的煎蛋需求 - 將5份提瓦特煎蛋交給松本
--- a/Source/GrasscutterTools/Resources/zh-tw/Scene.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Scene.txt
--- a/Source/GrasscutterTools/Resources/zh-tw/Weapon.txt
+++ b/Source/GrasscutterTools/Resources/zh-tw/Weapon.txt
@@ -26,13 +26,12 @@
 11419:「一心傳」名刀
 11420:「一心傳」名刀
 11421:「一心傳」名刀
+11422:東花坊時雨
 11501:風鷹劍
 11502:天空之刃
 11503:蒼古自由之誓
 11504:斫峰之刃
 11505:磐岩結綠
-11506:磐岩結綠
-11507:憑虛
 11509:霧切之回光
 11510:波亂月白經津
 11511:聖顯之鑰
@@ -64,8 +63,6 @@
 12502:狼的末路
 12503:松籟響起之時
 12504:無工之劍
-12505:砥厄魚
-12506:異史
 12510:赤角石潰杵
 13101:新手長槍
 13201:鐵尖槍
@@ -91,7 +88,6 @@
 13502:天空之脊
 13504:貫虹之槊
 13505:和璞鳶
-13506:弑主
 13507:息災
 13509:薙草之稻光
 13511:赤沙之杖
@@ -121,12 +117,11 @@
 14417:盈滿之實
 14501:天空之卷
 14502:四風原典
-14503:散佚的敘事詩
 14504:塵世之鎖
-14505:定土玉圭
 14506:不滅月華
 14509:神樂之真意
 14511:千夜浮夢
+14512:圖萊杜拉的回憶
 15101:獵弓
 15201:歷練的獵弓
 15301:鴉羽弓
@@ -156,9 +151,6 @@
 15501:天空之翼
 15502:阿莫斯之弓
 15503:終末嗟嘆之詩
-15504:昆吾墜龍
-15505:懸黎千鈞
-15506:破鏡
 15507:冬極白星
 15508:若水
 15509:飛雷之弦振
Author	SHA1	Message	Date
筱傑	dea067b21f	Add task page screenshot	2022-12-15 20:43:51 +08:00
筱傑	d56c73e2a3	Add Test page	2022-12-15 20:32:01 +08:00
筱傑	5d208d1220	Update SceneIds and MonsterIds	2022-12-15 20:31:29 +08:00
筱傑	47a3a1c7ab	Add 3.3.50 avatar ids (from Sakura616 res) Update quest text	2022-12-15 20:03:47 +08:00
筱傑	56059b4f4f	Update 3.3 Artifacts and avatar/weapon colors	2022-12-14 20:24:48 +08:00
筱傑	09577d5403	Update Banners.json Ignore `PreviewPrefabPath`	2022-12-12 20:26:48 +08:00
筱傑	fb77f9432a	Add CI Badge	2022-12-10 23:56:12 +08:00
jie65535	0f70405041	Update build.yml	2022-12-10 23:37:22 +08:00
筱傑	399888f976	Update Task page translates	2022-12-10 18:14:54 +08:00
筱傑	a8a0a14713	fix connect command issue	2022-12-10 17:57:51 +08:00
筱傑	59af1e468d	Add Task Page (#166 )	2022-12-10 17:57:51 +08:00
筱傑	0d1bad5551	Update version to v1.8.0	2022-12-10 17:57:50 +08:00
筱傑	7eb2ff1624	Add categories to item page	2022-12-10 17:57:50 +08:00
筱傑	72351ba60f	Update 3.3 Resources (Items/Avatars/Weapons)	2022-12-10 17:57:50 +08:00
jie65535	7dc2dcc9db	Update build.yml	2022-12-08 17:17:15 +08:00
jie65535	5b4a7d784d	Create build.yml	2022-12-08 16:43:30 +08:00