Update 3.1.5 ids(EN)

Add 3.1.5 ids

README.md

@@ -4,59 +4,62 @@
 [![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)
 
-中文 | [English](README_en-US.md) | [Русский](README_ru-RU.md)
+English | [简体中文](README_zh-cn.md) | [Русский](README_ru-RU.md)
 
 ## Commands Generator
 
-请从 [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases) 中获取最新版本
+Please download the latest version from [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
 
-本工具支持 简中, 繁中, English 与 Русский 等语言。
+Support 简体中文, 繁体中文, English and Русский languages.
 
-## 远程执行
+Welcome everyone to improve the [ID Resource](/Source/GrasscutterTools/Resources/en-us).
 
-服务端需要 [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin) 插件支持
+## Remote command
+
+The server require [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin) support
 
 ![OpenCommand](Doc/Screenshots/OpenCommand.gif)
 
-> 如果你无法连接到服务器，请确认填写的服务器地址是否正确。
-> 
-> 建议配置服务器为HTTP模式，如图所示(config.json)：
+> If you cannot connect to the server, please make sure the server address is correct.
+>
+> It is recommended to configure the server to HTTP mode, as shown in the figure(config.json):
 > ![ConfigHttp](Doc/Screenshots/ConfigHttp.png)
 > 
-> 你可以用浏览器访问 http://127.0.0.1/status/server 来测试服务是否正常工作。
-> 
-> 如果使用的不是`80`端口，则要在url中指定访问的端口号：http://127.0.0.1:443
+> You can visit http://127.0.0.1/status/server with a browser to test whether the service is working properly.
+>
+> If you are not using port `80`, specify the port number to access in the url: http://127.0.0.1:443
 
 ---
 
-## 软件截图
+
+## Screenshots
 
 ![Logo](Doc/Screenshots/GrasscutterLogo.png)
 
-![Home](Doc/Screenshots/0-Home.png)
+![Home](Doc/Screenshots-en/0-Home.png)
 
-![Custom Commands Screenshot](Doc/Screenshots/1-CustomCommands.png)
+![Custom Commands Screenshot](Doc/Screenshots-en/1-CustomCommands.png)
 
-![Custom Artifact Screenshot](Doc/Screenshots/2-CustomArtifact.png)
+![Custom Artifact Screenshot](Doc/Screenshots-en/2-CustomArtifact.png)
 
-![Custom Weapon Screenshort](Doc/Screenshots/3-CustomWeapon.png)
+![Custom Weapon Screenshort](Doc/Screenshots-en/3-CustomWeapon.png)
 
-![Give Item Screenshort](Doc/Screenshots/4-GiveItem.png)
+![Give Item Screenshort](Doc/Screenshots-en/4-GiveItem.png)
 
-![Give Avatar Screenshort](Doc/Screenshots/5-GiveAvatar.png)
+![Give Avatar Screenshort](Doc/Screenshots-en/5-GiveAvatar.png)
 
-![Spawn Entity Screenshort](Doc/Screenshots/6-SpawnEntity.png)
+![Spawn Entity Screenshort](Doc/Screenshots-en/6-SpawnEntity.png)
 
-![Change Scene Screenshort](Doc/Screenshots/7-ChangeScene.png)
+![Change Scene Screenshort](Doc/Screenshots-en/7-ChangeScene.png)
 
-![Custom Stats Screenshort](Doc/Screenshots/8-CustomStats.png)
+![Custom Stats Screenshort](Doc/Screenshots-en/8-CustomStats.png)
 
-![Management](Doc/Screenshots/9-Manage.png)
+![Management](Doc/Screenshots-en/9-Manage.png)
 
-![GachaBannerEditor](Doc/Screenshots/10-GachaBannerEditor.png)
+![GachaBannerEditor](Doc/Screenshots-en/10-GachaBannerEditor.png)
 
-![Text Map Browser](Doc/Screenshots/11-TextMapBrowser.png)
+![Text Map Browser](Doc/Screenshots-en/11-TextMapBrowser.png)
 
-![Remote Screenshort](Doc/Screenshots/12-Remote.png)
+![Remote Screenshort](Doc/Screenshots-en/12-Remote.png)
 
-![Quest Screenshort](Doc/Screenshots/13-Quest.png)
+![Quest Screenshort](Doc/Screenshots-en/13-Quest.png)

README_en-US.md

@@ -1,62 +0,0 @@
-# Grasscutter Tools
-
-[![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)
-
-[中文](README.md) | English | [Русский](README_ru-RU.md)
-
-## Commands Generator
-
-Please download the latest version from [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
-
-Support 简中, 繁中, English and Русский languages.
-
-## Remote command
-
-The server require [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin) support
-
-![OpenCommand](Doc/Screenshots/OpenCommand.gif)
-
-> If you cannot connect to the server, please make sure the server address is correct.
->
-> It is recommended to configure the server to HTTP mode, as shown in the figure(config.json):
-> ![ConfigHttp](Doc/Screenshots/ConfigHttp.png)
-> 
-> You can visit http://127.0.0.1/status/server with a browser to test whether the service is working properly.
->
-> If you are not using port `80`, specify the port number to access in the url: http://127.0.0.1:443
-
----
-
-## Screenshots
-
-![Logo](Doc/Screenshots/GrasscutterLogo.png)
-
-![Home](Doc/Screenshots-en/0-Home.png)
-
-![Custom Commands Screenshot](Doc/Screenshots-en/1-CustomCommands.png)
-
-![Custom Artifact Screenshot](Doc/Screenshots-en/2-CustomArtifact.png)
-
-![Custom Weapon Screenshort](Doc/Screenshots-en/3-CustomWeapon.png)
-
-![Give Item Screenshort](Doc/Screenshots-en/4-GiveItem.png)
-
-![Give Avatar Screenshort](Doc/Screenshots-en/5-GiveAvatar.png)
-
-![Spawn Entity Screenshort](Doc/Screenshots-en/6-SpawnEntity.png)
-
-![Change Scene Screenshort](Doc/Screenshots-en/7-ChangeScene.png)
-
-![Custom Stats Screenshort](Doc/Screenshots-en/8-CustomStats.png)
-
-![Management](Doc/Screenshots-en/9-Manage.png)
-
-![GachaBannerEditor](Doc/Screenshots-en/10-GachaBannerEditor.png)
-
-![Text Map Browser](Doc/Screenshots-en/11-TextMapBrowser.png)
-
-![Remote Screenshort](Doc/Screenshots-en/12-Remote.png)
-
-![Quest Screenshort](Doc/Screenshots-en/13-Quest.png)

README_ru-RU.md

@@ -4,28 +4,31 @@
 [![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)
 
-[中文](README.md) | [English](README_en-US.md) | Русский - Перевод Юрий Дворецкий
+[English](README.md) | [简体中文](README_zh-cn.md) | Русский - Перевод [Юрий Дворецкий](https://github.com/yurikenjx) (с исправлениями от [EgorBron](https://github.com/EgorBron)) 
 
-## Генератор команд
+## Генератор команд (GCG)
 
-Пожалуйса загрузите последнюю версию с [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases)
+Загрузите последнюю версию из вкладки [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases).
 
-Support 简中, 繁中, English and Русский languages.
+GCG поддерживает 简体中文 (китайский упр.), 繁体中文 (китайский трад.), English (английский) и Русский языки.
 
-## Удаленная команда
+Приглашаем всех улучшить [ID ресурсов и перевод](/Source/GrasscutterTools/Resources/ru-ru)
 
-Сервер требует [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin) помощь
+## Удаленная команда (OpenCommand)
+
+Чтобы использовать команды прямо из GCG, серверу требуется плагин [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin).
 
 ![Open Command](Doc/Screenshots/OpenCommand.gif)
 
-> If you cannot connect to the server, please make sure the server address is correct.
+> Если вы не можете подключиться к серверу, проверьте правильность написания его URL-адреса.
+>
+> Рекомендуется изменить секцию HTTP в конфиге как на скриншоте ниже (конфиг - файл config.json):
 >
-> It is recommended to configure the server to HTTP mode, as shown in the figure(config.json):
 > ![ConfigHttp](Doc/Screenshots/ConfigHttp.png)
-> 
-> You can visit http://127.0.0.1/status/server with a browser to test whether the service is working properly.
 >
-> If you are not using port `80`, specify the port number to access in the url: http://127.0.0.1:443
+> Для проверки можете посетить http://127.0.0.1/status/server в браузере, чтобы проверить работоспособность OpenCommand.
+>
+> Если вы не указали порт `80` в конфиге, вам нужно указать свой порт в URL-адресе (например, http://127.0.0.1:443)
 
 ---
 
@@ -37,26 +40,30 @@ Support 简中, 繁中, English and Русский languages.
 
 ![Скриншот пользовательских команд](Doc/Screenshots-ru/1-CustomCommands.png)
 
-![Скриншот Пользовательского артефакта](Doc/Screenshots-ru/2-CustomArtifact.png)
+![Скриншот артефактов](Doc/Screenshots-ru/2-CustomArtifact.png)
 
-![Скриншот Пользовательского оружия](Doc/Screenshots-ru/3-CustomWeapon.png)
+![Скриншот квестов](Doc/Screenshots-ru/3-Quest.png)
 
-![Скриншот Дать предмет](Doc/Screenshots-ru/4-GiveItem.png)
+![Скриншот спавна сущностей](Doc/Screenshots-ru/4-SpawnEntity.png)
 
-![Скриншот Дать Персонажа Screenshort](Doc/Screenshots-ru/5-GiveAvatar.png)
+![Скриншот выдачи персонажа](Doc/Screenshots-ru/5-GiveAvatar.png)
 
-![Скриншот Спавн Сущности](Doc/Screenshots-ru/6-SpawnEntity.png)
+![Скриншот кастомной статистики](Doc/Screenshots-ru/6-CustomStats.png)
 
-![Скриншот Изменить сцену](Doc/Screenshots-ru/7-ChangeScene.png)
+![Скриншот выдачи оружия](Doc/Screenshots-ru/7-CustomWeapon.png)
 
-![Скриншот Пользовательская статистика](Doc/Screenshots-ru/8-CustomStats.png)
+![Скриншот выдачи предметов](Doc/Screenshots-ru/8-GiveItem.png)
 
-![Управление](Doc/Screenshots-ru/9-Manage.png)
+![Скриншот смены сцены](Doc/Screenshots-ru/9-ChangeScene.png)
 
-![Редактор баннеров Gacha](Doc/Screenshots-ru/10-GachaBannerEditor.png)
+<!-- ![Скриншот меток](Doc/Screenshots-ru/10-Waypoints.png) -->
 
-![Текстоый Браузер карт](Doc/Screenshots-ru/11-TextMapBrowser.png)
+![Скриншот управления аккаунтом](Doc/Screenshots-ru/11-Manage.png)
 
-![Скриншот Удаленного доступа](Doc/Screenshots-ru/12-Remote.png)
+![Скриншот Credits](Doc/Screenshots-ru/12-Credits.png)
 
-![Скриншот Квесты](Doc/Screenshots-ru/13-Quest.png)
+![Скриншот OpenCommand](Doc/Screenshots-ru/13-Remote.png)
+
+![Редактор баннеров](Doc/Screenshots-ru/14-GachaBannerEditor.png)
+
+![Текстоый браузер карт](Doc/Screenshots-ru/15-TextMapBrowser.png)

README_zh-cn.md

@@ -0,0 +1,64 @@
+# Grasscutter Tools
+
+[![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)
+
+[English](README.md) | 简体中文 | [Русский](README_ru-RU.md)
+
+## Commands Generator
+
+请从 [Releases](https://github.com/jie65535/GrasscutterCommandGenerator/releases) 中获取最新版本
+
+本工具支持 简体中文, 繁体中文, English 与 Русский 语言。
+
+欢迎大家一起来完善工具的[内置资源](/Source/GrasscutterTools/Resources/zh-cn)。
+
+## 远程执行
+
+服务端需要 [gc-opencommand-plugin](https://github.com/jie65535/gc-opencommand-plugin) 插件支持
+
+![OpenCommand](Doc/Screenshots/OpenCommand.gif)
+
+> 如果你无法连接到服务器，请确认填写的服务器地址是否正确。
+> 
+> 建议配置服务器为HTTP模式，如图所示(config.json)：
+> ![ConfigHttp](Doc/Screenshots/ConfigHttp.png)
+> 
+> 你可以用浏览器访问 http://127.0.0.1/status/server 来测试服务是否正常工作。
+> 
+> 如果使用的不是`80`端口，则要在url中指定访问的端口号：http://127.0.0.1:443
+
+---
+
+## 软件截图
+
+![Logo](Doc/Screenshots/GrasscutterLogo.png)
+
+![Home](Doc/Screenshots/0-Home.png)
+
+![Custom Commands Screenshot](Doc/Screenshots/1-CustomCommands.png)
+
+![Custom Artifact Screenshot](Doc/Screenshots/2-CustomArtifact.png)
+
+![Custom Weapon Screenshort](Doc/Screenshots/3-CustomWeapon.png)
+
+![Give Item Screenshort](Doc/Screenshots/4-GiveItem.png)
+
+![Give Avatar Screenshort](Doc/Screenshots/5-GiveAvatar.png)
+
+![Spawn Entity Screenshort](Doc/Screenshots/6-SpawnEntity.png)
+
+![Change Scene Screenshort](Doc/Screenshots/7-ChangeScene.png)
+
+![Custom Stats Screenshort](Doc/Screenshots/8-CustomStats.png)
+
+![Management](Doc/Screenshots/9-Manage.png)
+
+![GachaBannerEditor](Doc/Screenshots/10-GachaBannerEditor.png)
+
+![Text Map Browser](Doc/Screenshots/11-TextMapBrowser.png)
+
+![Remote Screenshort](Doc/Screenshots/12-Remote.png)
+
+![Quest Screenshort](Doc/Screenshots/13-Quest.png)

Source/GrasscutterTools/App.config

@@ -17,7 +17,7 @@
     <value>10001</value>
    </setting>
    <setting name="DefaultLanguage" serializeAs="String">
-    <value>zh-CN</value>
+    <value />
    </setting>
    <setting name="ResourcesDirPath" serializeAs="String">
     <value />
@@ -38,7 +38,7 @@
     <value />
    </setting>
    <setting name="CommandVersion" serializeAs="String">
-    <value>1.2.2</value>
+    <value />
    </setting>
    <setting name="IsTopMost" serializeAs="String">
     <value>False</value>

Source/GrasscutterTools/Controls/TextBoxXP.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 

Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs

@@ -18,7 +18,6 @@
  **/
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;

Source/GrasscutterTools/Forms/FormGachaBannerEditor.ru-ru.resx

@@ -129,7 +129,7 @@
     <value>390, 35</value>
   </data>
   <data name="LblBannerEditorOldTip.Text" xml:space="preserve">
-    <value>Совет: Последняя версия баннера разрабатывается в настоящее время не поддерживается, ждем PR : )</value>
+    <value>Подсказка: последняя версия баннера разрабатывается и в настоящее время не поддерживается, ждем PR : )</value>
   </data>
   <data name="LblEventChanceTip.Location" type="System.Drawing.Point, System.Drawing">
     <value>401, 262</value>
@@ -180,7 +180,7 @@
     <value>81, 17</value>
   </data>
   <data name="LblRateUpItems2.Text" xml:space="preserve">
-    <value>4 звезды UP</value>
+    <value>4 зв. UP</value>
   </data>
   <data name="LblSoftPity.Location" type="System.Drawing.Point, System.Drawing">
     <value>27, 291</value>
@@ -189,7 +189,7 @@
     <value>79, 17</value>
   </data>
   <data name="LblSoftPity.Text" xml:space="preserve">
-    <value>Мяг. гарант</value>
+    <value>Софт-гарант</value>
   </data>
   <data name="LblGachaTypeTip.Size" type="System.Drawing.Size, System.Drawing">
     <value>116, 17</value>
@@ -240,7 +240,7 @@
     <value>85, 17</value>
   </data>
   <data name="LblHardPity.Text" xml:space="preserve">
-    <value>Жест. Гарант</value>
+    <value>Полный гарант</value>
   </data>
   <data name="NUDEndTime.Location" type="System.Drawing.Point, System.Drawing">
     <value>287, 174</value>
@@ -270,7 +270,7 @@
     <value>77, 17</value>
   </data>
   <data name="LblBasePurpleWeight.Text" xml:space="preserve">
-    <value>4 звездный</value>
+    <value>4-звездочный</value>
   </data>
   <data name="CmbBannerType.Items" xml:space="preserve">
     <value>Стандартная Молитва</value>
@@ -285,7 +285,7 @@
     <value>101, 17</value>
   </data>
   <data name="LblSortIdTip.Text" xml:space="preserve">
-    <value>Показать заказ</value>
+    <value>Показать порядок</value>
   </data>
   <data name="LblBannerType.Location" type="System.Drawing.Point, System.Drawing">
     <value>18, 87</value>
@@ -330,7 +330,7 @@
     <value>Переплетающиеся</value>
   </data>
   <data name="GrpBannerValues.Text" xml:space="preserve">
-    <value>Баннеп</value>
+    <value>Баннер</value>
   </data>
   <data name="GrpPurplePool.Text" xml:space="preserve">
     <value>4 звёздочный пул</value>
@@ -351,9 +351,9 @@
     <value>85, 23</value>
   </data>
   <data name="BtnParse.Text" xml:space="preserve">
-    <value>Загр.Json</value>
+    <value>Загр. Json</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Редактор баннеров Gacha</value>
+    <value>Редактор баннеров</value>
   </data>
 </root>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs

@@ -30,6 +30,10 @@ namespace GrasscutterTools.Forms
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGachaBannerEditor2));
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
             this.GrpBannerValues = new System.Windows.Forms.GroupBox();
             this.ChkAutoStripRateUpFromFallback = new System.Windows.Forms.CheckBox();
             this.LblOptions = new System.Windows.Forms.Label();
@@ -84,6 +88,8 @@ namespace GrasscutterTools.Forms
             this.TxtPoolWeight5 = new System.Windows.Forms.TextBox();
             this.LblPoolWeight4 = new System.Windows.Forms.Label();
             this.LblPoolWeight5 = new System.Windows.Forms.Label();
+            this.GrpWeightChart = new System.Windows.Forms.GroupBox();
+            this.ChartWeights = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.GrpBannerValues.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance5)).BeginInit();
@@ -95,6 +101,8 @@ namespace GrasscutterTools.Forms
             this.GrpJson.SuspendLayout();
             this.GrpWeights.SuspendLayout();
             this.GrpBalance.SuspendLayout();
+            this.GrpWeightChart.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.ChartWeights)).BeginInit();
             this.SuspendLayout();
             // 
             // GrpBannerValues
@@ -513,10 +521,51 @@ namespace GrasscutterTools.Forms
             resources.ApplyResources(this.LblPoolWeight5, "LblPoolWeight5");
             this.LblPoolWeight5.Name = "LblPoolWeight5";
             // 
+            // GrpWeightChart
+            // 
+            resources.ApplyResources(this.GrpWeightChart, "GrpWeightChart");
+            this.GrpWeightChart.Controls.Add(this.ChartWeights);
+            this.GrpWeightChart.Name = "GrpWeightChart";
+            this.GrpWeightChart.TabStop = false;
+            // 
+            // ChartWeights
+            // 
+            resources.ApplyResources(this.ChartWeights, "ChartWeights");
+            chartArea1.AxisX.Minimum = 0D;
+            chartArea1.AxisY.Maximum = 100D;
+            chartArea1.AxisY.Minimum = 0D;
+            chartArea1.AxisY.Title = "%";
+            chartArea1.Name = "ChartArea1";
+            this.ChartWeights.ChartAreas.Add(chartArea1);
+            legend1.Name = "Legend1";
+            this.ChartWeights.Legends.Add(legend1);
+            this.ChartWeights.Name = "ChartWeights";
+            series1.ChartArea = "ChartArea1";
+            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
+            series1.Color = System.Drawing.Color.OrangeRed;
+            series1.Label = "(#VALX, #VAL)";
+            series1.Legend = "Legend1";
+            series1.LegendText = "5*";
+            series1.Name = "SeriesWeight5";
+            series1.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Int32;
+            series1.YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Double;
+            series2.ChartArea = "ChartArea1";
+            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
+            series2.Color = System.Drawing.Color.Purple;
+            series2.Label = "(#VALX, #VAL)";
+            series2.Legend = "Legend1";
+            series2.LegendText = "4*";
+            series2.Name = "SeriesWeight4";
+            series2.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Int32;
+            series2.YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Double;
+            this.ChartWeights.Series.Add(series1);
+            this.ChartWeights.Series.Add(series2);
+            // 
             // FormGachaBannerEditor2
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.GrpWeightChart);
             this.Controls.Add(this.GrpBalance);
             this.Controls.Add(this.GrpWeights);
             this.Controls.Add(this.GrpJson);
@@ -540,6 +589,8 @@ namespace GrasscutterTools.Forms
             this.GrpWeights.PerformLayout();
             this.GrpBalance.ResumeLayout(false);
             this.GrpBalance.PerformLayout();
+            this.GrpWeightChart.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.ChartWeights)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -599,5 +650,7 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.CheckBox ChkRemoveC6FormPool;
         private System.Windows.Forms.CheckBox ChkAutoStripRateUpFromFallback;
         private System.Windows.Forms.Label LblOptions;
+        private System.Windows.Forms.GroupBox GrpWeightChart;
+        private System.Windows.Forms.DataVisualization.Charting.Chart ChartWeights;
     }
 }

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs

@@ -19,10 +19,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
 
 using GrasscutterTools.Game;
 using GrasscutterTools.Game.Gacha;
@@ -184,6 +184,15 @@ namespace GrasscutterTools.Forms
             TxtWeight4.Text = '[' + string.Join(", ", SelectWeights(banner.Weights4).Select(w => $"[{w.Count}, {w.Weight}]")) + ']';
             TxtPoolWeight5.Text = '[' + string.Join(", ", SelectWeights(banner.PoolBalanceWeights5).Select(w => $"[{w.Count}, {w.Weight}]")) + ']';
             TxtPoolWeight4.Text = '[' + string.Join(", ", SelectWeights(banner.PoolBalanceWeights4).Select(w => $"[{w.Count}, {w.Weight}]")) + ']';
+
+            ChartWeights.SuspendLayout();
+            ChartWeights.Series[0].Points.Clear();
+            foreach (var w in SelectWeights(banner.Weights5))
+                ChartWeights.Series[0].Points.AddXY(w.Count, w.Weight / 100.0);
+            ChartWeights.Series[1].Points.Clear();
+            foreach (var w in SelectWeights(banner.Weights4))
+                ChartWeights.Series[1].Points.AddXY(w.Count, w.Weight / 100.0);
+            ChartWeights.ResumeLayout();
         }
 
         private IEnumerable<GachaWeight> SelectWeights(int[,] weights)
@@ -296,6 +305,7 @@ namespace GrasscutterTools.Forms
                     var json = JsonConvert.SerializeObject(banner);
                     json = json.Replace(",\"", ",\r\n  \"").Insert(1, "\r\n  ");
                     TxtJson.Text = json.Insert(json.Length-1, "\r\n");
+                    ShowBanner(banner);
                 }
             }
             catch (Exception ex)

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx

@@ -372,7 +372,7 @@
     <value>Gen Json</value>
   </data>
   <data name="BtnParse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>209, 512</value>
+    <value>409, 201</value>
   </data>
   <data name="BtnParse.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 23</value>
@@ -431,6 +431,9 @@
   <data name="LblPoolWeight5.Text" xml:space="preserve">
     <value>Pool Weight 5</value>
   </data>
+  <data name="GrpWeightChart.Text" xml:space="preserve">
+    <value>Weight Chart</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Gacha Banner Editor</value>
   </data>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx

@@ -131,12 +131,24 @@
   <data name="BtnGen.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
   </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 4, 3, 4</value>
+  </data>
   <data name="LblBannerType.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="&gt;&gt;RbCostItem223.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="GrpJson.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;GrpWeights.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;ChkRemoveC6FormPool.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;BtnGen.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -156,9 +168,6 @@
   <data name="LblSortId.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="LnkWeightHelp.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
   <data name="&gt;&gt;LblEventChance5.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -201,6 +210,9 @@
   <data name="LnkWeightHelp.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
+  <data name="ChartWeights.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
   <data name="&gt;&gt;LblEventChance5Tip.Name" xml:space="preserve">
     <value>LblEventChance5Tip</value>
   </data>
@@ -214,13 +226,13 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="GrpJson.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Right</value>
+    <value>Top, Left, Right</value>
   </data>
   <data name="&gt;&gt;ColUpName.Name" xml:space="preserve">
     <value>ColUpName</value>
   </data>
-  <data name="&gt;&gt;LblEventChance4.Name" xml:space="preserve">
-    <value>LblEventChance4</value>
+  <data name="DTPEndTime.Location" type="System.Drawing.Point, System.Drawing">
+    <value>302, 173</value>
   </data>
   <data name="&gt;&gt;ChkAutoStripRateUpFromFallback.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -232,23 +244,20 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;GrpBannerValues.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="LblEventChance5Tip.Text" xml:space="preserve">
-    <value>%</value>
+    <value>6</value>
   </data>
   <data name="LblCostItem.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="GrpWeightChart.Text" xml:space="preserve">
+    <value>权重图表</value>
+  </data>
   <data name="&gt;&gt;GrpJson.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="ListFallbackItems.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <data name="LblWeight5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 17</value>
-  </data>
   <data name="&gt;&gt;GrpBannerValues.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -271,12 +280,6 @@
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNQs=
 </value>
   </data>
-  <data name="ListUpItems.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="LnkWeightHelp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>32, 17</value>
-  </data>
   <data name="&gt;&gt;LblGachaType.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -338,8 +341,8 @@
   <data name="GrpBalance.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 453</value>
   </data>
-  <data name="&gt;&gt;LblEndTime.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;GrpWeightChart.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="RbCostItem223.Text" xml:space="preserve">
     <value>纠缠之缘</value>
@@ -356,9 +359,15 @@
   <data name="&gt;&gt;LblEventChance4Tip.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="LblPoolWeight5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="LblCostItem.Text" xml:space="preserve">
     <value>祈愿道具</value>
   </data>
+  <data name="&gt;&gt;TxtPoolWeight5.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="TxtPoolWeight4.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 23</value>
   </data>
@@ -368,8 +377,8 @@
   <data name="&gt;&gt;NUDEventChance4.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="GrpBalance.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
+  <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
+    <value>402, 0</value>
   </data>
   <data name="LblEventChance4Tip.TabIndex" type="System.Int32, mscorlib">
     <value>89</value>
@@ -441,17 +450,17 @@
     <value>0</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>984, 561</value>
+    <value>1184, 561</value>
   </data>
   <data name="&gt;&gt;BtnParse.Parent" xml:space="preserve">
     <value>GrpJson</value>
   </data>
+  <data name="&gt;&gt;GrpFallbackPool.Name" xml:space="preserve">
+    <value>GrpFallbackPool</value>
+  </data>
   <data name="&gt;&gt;GrpBalance.Name" xml:space="preserve">
     <value>GrpBalance</value>
   </data>
-  <data name="&gt;&gt;TxtWeight4.Parent" xml:space="preserve">
-    <value>GrpWeights</value>
-  </data>
   <data name="&gt;&gt;LblEventChance5Tip.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -509,9 +518,6 @@
   <data name="GrpBalance.Text" xml:space="preserve">
     <value>角色和武器平衡机制（仅混合池有效）</value>
   </data>
-  <data name="LblPoolWeight5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>43, 32</value>
-  </data>
   <data name="&gt;&gt;LblBeginTime.ZOrder" xml:space="preserve">
     <value>20</value>
   </data>
@@ -557,12 +563,18 @@
   <data name="LnkWeightHelp.Text" xml:space="preserve">
     <value>帮助</value>
   </data>
+  <data name="LblPrefabPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>74, 118</value>
+  </data>
   <data name="&gt;&gt;ColFallbackId.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="LblScheduleIdTip.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="&gt;&gt;ChartWeights.Name" xml:space="preserve">
+    <value>ChartWeights</value>
+  </data>
   <data name="&gt;&gt;RbCostItem224.ZOrder" xml:space="preserve">
     <value>26</value>
   </data>
@@ -578,17 +590,11 @@
   <data name="LnkOpenOldEditor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="LblScheduleId.TabIndex" type="System.Int32, mscorlib">
-    <value>53</value>
-  </data>
   <data name="BtnGen.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;LblPoolWeight5.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="ColFallbackName.Width" type="System.Int32, mscorlib">
-    <value>110</value>
+  <data name="ChartWeights.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 19</value>
   </data>
   <data name="&gt;&gt;CmbPrefab.ZOrder" xml:space="preserve">
     <value>6</value>
@@ -611,6 +617,9 @@
   <data name="LblScheduleId.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="&gt;&gt;LblPrefabPath.Name" xml:space="preserve">
+    <value>LblPrefabPath</value>
+  </data>
   <data name="GrpFallbackPool.Location" type="System.Drawing.Point, System.Drawing">
     <value>458, 248</value>
   </data>
@@ -623,8 +632,8 @@
   <data name="&gt;&gt;LblPrefabPath.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="ChkRemoveC6FormPool.Location" type="System.Drawing.Point, System.Drawing">
-    <value>112, 260</value>
+  <data name="&gt;&gt;LblBeginTime.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="LblSortIdTip.Text" xml:space="preserve">
     <value>客户端中显示的顺序</value>
@@ -638,32 +647,23 @@
   <data name="LblGachaTypeTip.Size" type="System.Drawing.Size, System.Drawing">
     <value>125, 17</value>
   </data>
-  <data name="GrpWeights.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <data name="&gt;&gt;NUDScheduleId.Parent" xml:space="preserve">
-    <value>GrpBannerValues</value>
-  </data>
   <data name="CmbPrefab.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="&gt;&gt;GrpWeights.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;LblWeight5.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
   <data name="&gt;&gt;ListFallbackItems.Name" xml:space="preserve">
     <value>ListFallbackItems</value>
   </data>
   <data name="GrpJson.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 541</value>
+    <value>500, 230</value>
   </data>
   <data name="LnkOpenOldEditor.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 309</value>
   </data>
-  <data name="&gt;&gt;LblEndTime.Name" xml:space="preserve">
-    <value>LblEndTime</value>
-  </data>
-  <data name="&gt;&gt;ChkRemoveC6FormPool.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="LblBannerType.TabIndex" type="System.Int32, mscorlib">
+    <value>59</value>
   </data>
   <data name="&gt;&gt;BtnGen.Name" xml:space="preserve">
     <value>BtnGen</value>
@@ -672,17 +672,11 @@
     <value>5</value>
   </data>
   <data name="GrpJson.Text" xml:space="preserve">
-    <value>Json</value>
+    <value>Json - (./Gresscutter/data/banners.json)</value>
   </data>
   <data name="&gt;&gt;LnkWeightHelp.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;ListUpItems.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="&gt;&gt;CmbBannerType.ZOrder" xml:space="preserve">
-    <value>23</value>
-  </data>
   <data name="&gt;&gt;LblSortId.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -707,8 +701,8 @@
   <data name="&gt;&gt;LblCostItem.ZOrder" xml:space="preserve">
     <value>27</value>
   </data>
-  <data name="&gt;&gt;LblEventChance4Tip.Name" xml:space="preserve">
-    <value>LblEventChance4Tip</value>
+  <data name="&gt;&gt;LblEndTime.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;TxtJson.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -719,8 +713,8 @@
   <data name="&gt;&gt;LblSortId.Name" xml:space="preserve">
     <value>LblSortId</value>
   </data>
-  <data name="LblGachaTypeTip.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;TxtWeight4.Parent" xml:space="preserve">
+    <value>GrpWeights</value>
   </data>
   <data name="ColFallbackId.Width" type="System.Int32, mscorlib">
     <value>65</value>
@@ -731,11 +725,14 @@
   <data name="LblPoolWeight4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
+  <data name="&gt;&gt;GrpWeightChart.Name" xml:space="preserve">
+    <value>GrpWeightChart</value>
+  </data>
   <data name="ColUpName.Text" xml:space="preserve">
     <value>Name</value>
   </data>
-  <data name="GrpBannerValues.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
+  <data name="NUDSortId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 23</value>
   </data>
   <data name="&gt;&gt;LblScheduleIdTip.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -753,8 +750,11 @@
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws=
 </value>
   </data>
-  <data name="NUDScheduleId.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+  <data name="&gt;&gt;TxtPoolWeight5.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;GrpBalance.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;LblBannerType.ZOrder" xml:space="preserve">
     <value>25</value>
@@ -771,9 +771,6 @@
   <data name="&gt;&gt;RbCostItem223.Name" xml:space="preserve">
     <value>RbCostItem223</value>
   </data>
-  <data name="LblEventChance5Tip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>181, 233</value>
-  </data>
   <data name="&gt;&gt;LblEndTime.ZOrder" xml:space="preserve">
     <value>18</value>
   </data>
@@ -829,8 +826,11 @@
   <data name="GrpWeights.Size" type="System.Drawing.Size, System.Drawing">
     <value>440, 100</value>
   </data>
-  <data name="LblEventChance4.Text" xml:space="preserve">
-    <value>4星活动爆率</value>
+  <data name="&gt;&gt;LblEventChance4Tip.Name" xml:space="preserve">
+    <value>LblEventChance4Tip</value>
+  </data>
+  <data name="&gt;&gt;LblWeight4.Name" xml:space="preserve">
+    <value>LblWeight4</value>
   </data>
   <data name="ChkAutoStripRateUpFromFallback.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -850,8 +850,11 @@
   <data name="GrpBannerValues.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;ListFallbackItems.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="&gt;&gt;LnkOpenOldEditor.Parent" xml:space="preserve">
+    <value>GrpBannerValues</value>
+  </data>
+  <data name="LblPoolWeight5.Text" xml:space="preserve">
+    <value>5星池权重</value>
   </data>
   <data name="&gt;&gt;NUDGachaType.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -874,8 +877,11 @@
   <data name="&gt;&gt;GrpUpPool.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
+  <data name="GrpWeightChart.Size" type="System.Drawing.Size, System.Drawing">
+    <value>500, 302</value>
+  </data>
   <data name="BtnParse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>219, 512</value>
+    <value>419, 201</value>
   </data>
   <data name="LblWeight5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -886,36 +892,27 @@
   <data name="LblBeginTime.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
   </data>
-  <data name="ListFallbackItems.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="ChkRemoveC6FormPool.TabIndex" type="System.Int32, mscorlib">
     <value>90</value>
   </data>
   <data name="&gt;&gt;LblScheduleId.ZOrder" xml:space="preserve">
     <value>19</value>
   </data>
+  <data name="&gt;&gt;LblWeight5.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;LblScheduleId.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="LblGachaType.Text" xml:space="preserve">
     <value>GachaType</value>
   </data>
-  <data name="LblWeight4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 17</value>
-  </data>
   <data name="GrpFallbackPool.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
-  <data name="CmbBannerType.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>Top, Bottom, Left</value>
   </data>
   <data name="DTPBeginTime.Size" type="System.Drawing.Size, System.Drawing">
     <value>110, 23</value>
   </data>
-  <data name="LnkOpenOldEditor.Text" xml:space="preserve">
-    <value>打开旧版本编辑器</value>
-  </data>
   <data name="&gt;&gt;NUDSortId.Type" xml:space="preserve">
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -952,17 +949,17 @@
   <data name="&gt;&gt;LblEventChance5.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;LblWeight4.Name" xml:space="preserve">
-    <value>LblWeight4</value>
-  </data>
   <data name="TxtJson.Size" type="System.Drawing.Size, System.Drawing">
-    <value>288, 487</value>
+    <value>488, 176</value>
   </data>
   <data name="ColUpId.Text" xml:space="preserve">
     <value>ID</value>
   </data>
-  <data name="&gt;&gt;LnkOpenOldEditor.Parent" xml:space="preserve">
-    <value>GrpBannerValues</value>
+  <data name="LnkWeightHelp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 17</value>
+  </data>
+  <data name="&gt;&gt;BtnParse.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
   <data name="TxtJson.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -970,12 +967,18 @@
   <data name="BtnGen.Text" xml:space="preserve">
     <value>生成Json</value>
   </data>
+  <data name="LblEventChance4.Text" xml:space="preserve">
+    <value>4星活动爆率</value>
+  </data>
   <data name="&gt;&gt;TxtJson.Name" xml:space="preserve">
     <value>TxtJson</value>
   </data>
   <data name="LblEndTime.TabIndex" type="System.Int32, mscorlib">
     <value>74</value>
   </data>
+  <data name="GrpWeightChart.Location" type="System.Drawing.Point, System.Drawing">
+    <value>674, 248</value>
+  </data>
   <data name="&gt;&gt;LblEventChance5Tip.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
@@ -994,8 +997,8 @@
   <data name="NUDGachaType.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="NUDSortId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="&gt;&gt;BtnGen.Parent" xml:space="preserve">
+    <value>GrpJson</value>
   </data>
   <data name="NUDScheduleId.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 55</value>
@@ -1045,6 +1048,9 @@
   <data name="&gt;&gt;RbCostItem224.Name" xml:space="preserve">
     <value>RbCostItem224</value>
   </data>
+  <data name="LblPrefabPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 17</value>
+  </data>
   <data name="&gt;&gt;TxtJson.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
@@ -1054,6 +1060,12 @@
   <data name="&gt;&gt;LblSortId.ZOrder" xml:space="preserve">
     <value>14</value>
   </data>
+  <data name="ChartWeights.Text" xml:space="preserve">
+    <value>chart1</value>
+  </data>
+  <data name="LblBeginTime.Location" type="System.Drawing.Point, System.Drawing">
+    <value>50, 176</value>
+  </data>
   <data name="GrpJson.Location" type="System.Drawing.Point, System.Drawing">
     <value>674, 12</value>
   </data>
@@ -1075,9 +1087,6 @@
   <data name="&gt;&gt;LblSortIdTip.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
-  <data name="CmbBannerType.Items2" xml:space="preserve">
-    <value>限时武器祈愿池</value>
-  </data>
   <data name="&gt;&gt;NUDEventChance5.Type" xml:space="preserve">
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -1088,7 +1097,7 @@
     <value>基础池</value>
   </data>
   <data name="&gt;&gt;GrpFallbackPool.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="LblScheduleIdTip.Text" xml:space="preserve">
     <value>ID要求唯一</value>
@@ -1099,8 +1108,8 @@
   <data name="&gt;&gt;LblGachaType.Name" xml:space="preserve">
     <value>LblGachaType</value>
   </data>
-  <data name="&gt;&gt;BtnGen.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="&gt;&gt;LblPoolWeight5.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="LblSortIdTip.Location" type="System.Drawing.Point, System.Drawing">
     <value>218, 204</value>
@@ -1118,7 +1127,7 @@
     <value>217, 260</value>
   </data>
   <data name="&gt;&gt;GrpBalance.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;DTPEndTime.Type" xml:space="preserve">
     <value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1129,8 +1138,8 @@
   <data name="LblEndTime.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="ChkRemoveC6FormPool.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 21</value>
+  <data name="LnkWeightHelp.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="&gt;&gt;TxtWeight5.Name" xml:space="preserve">
     <value>TxtWeight5</value>
@@ -1144,24 +1153,21 @@
   <data name="LblOptions.Size" type="System.Drawing.Size, System.Drawing">
     <value>32, 17</value>
   </data>
-  <data name="&gt;&gt;LblScheduleIdTip.Name" xml:space="preserve">
-    <value>LblScheduleIdTip</value>
+  <data name="LblWeight5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 17</value>
   </data>
   <data name="LblSortId.Size" type="System.Drawing.Size, System.Drawing">
     <value>32, 17</value>
   </data>
-  <data name="LblBeginTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>50, 176</value>
+  <data name="&gt;&gt;GrpWeightChart.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="LblEventChance5Tip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>181, 233</value>
   </data>
   <data name="&gt;&gt;LblEventChance4.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
-  <data name="&gt;&gt;GrpWeights.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="LblEndTime.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 17</value>
-  </data>
   <data name="ColFallbackId.Text" xml:space="preserve">
     <value>ID</value>
   </data>
@@ -1180,11 +1186,11 @@
   <data name="&gt;&gt;NUDGachaType.Name" xml:space="preserve">
     <value>NUDGachaType</value>
   </data>
-  <data name="LblPrefabPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>32, 17</value>
+  <data name="&gt;&gt;LblScheduleIdTip.Name" xml:space="preserve">
+    <value>LblScheduleIdTip</value>
   </data>
-  <data name="&gt;&gt;CmbPrefab.Name" xml:space="preserve">
-    <value>CmbPrefab</value>
+  <data name="&gt;&gt;ChartWeights.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;LblEndTime.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -1195,29 +1201,26 @@
   <data name="&gt;&gt;TxtJson.Parent" xml:space="preserve">
     <value>GrpJson</value>
   </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 4, 3, 4</value>
+  <data name="&gt;&gt;LblEndTime.Name" xml:space="preserve">
+    <value>LblEndTime</value>
   </data>
   <data name="LblPoolWeight4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="GrpUpPool.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
+  <data name="ChkRemoveC6FormPool.Size" type="System.Drawing.Size, System.Drawing">
+    <value>99, 21</value>
   </data>
   <data name="LblCostItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
   </data>
-  <data name="BtnGen.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 512</value>
-  </data>
   <data name="&gt;&gt;TxtWeight4.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;ListUpItems.Parent" xml:space="preserve">
     <value>GrpUpPool</value>
   </data>
-  <data name="LblPoolWeight5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;ListUpItems.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="CmbBannerType.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 84</value>
@@ -1234,8 +1237,8 @@
   <data name="LblEventChance4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="DTPEndTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>302, 173</value>
+  <data name="ColFallbackName.Width" type="System.Int32, mscorlib">
+    <value>110</value>
   </data>
   <data name="ChkAutoStripRateUpFromFallback.Size" type="System.Drawing.Size, System.Drawing">
     <value>151, 21</value>
@@ -1252,9 +1255,15 @@
   <data name="NUDGachaType.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 26</value>
   </data>
+  <data name="&gt;&gt;RbCostItem224.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="TxtPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 23</value>
   </data>
+  <data name="ColUpName.Width" type="System.Int32, mscorlib">
+    <value>110</value>
+  </data>
   <data name="&gt;&gt;DTPBeginTime.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -1264,18 +1273,24 @@
   <data name="LblScheduleId.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 17</value>
   </data>
-  <data name="&gt;&gt;RbCostItem224.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>FormGachaBannerEditor2</value>
+  </data>
+  <data name="LblEndTime.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
   </data>
   <data name="GrpBalance.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="&gt;&gt;ColFallbackName.Name" xml:space="preserve">
-    <value>ColFallbackName</value>
+  <data name="&gt;&gt;BtnGen.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;GrpUpPool.Name" xml:space="preserve">
     <value>GrpUpPool</value>
   </data>
+  <data name="&gt;&gt;LnkWeightHelp.Type" xml:space="preserve">
+    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
@@ -1288,12 +1303,15 @@
   <data name="&gt;&gt;GrpWeights.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="LblCostItem.Location" type="System.Drawing.Point, System.Drawing">
-    <value>50, 148</value>
+  <data name="&gt;&gt;ColFallbackName.Name" xml:space="preserve">
+    <value>ColFallbackName</value>
   </data>
   <data name="&gt;&gt;LblGachaTypeTip.Name" xml:space="preserve">
     <value>LblGachaTypeTip</value>
   </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>1200, 600</value>
+  </data>
   <data name="LblGachaTypeTip.Location" type="System.Drawing.Point, System.Drawing">
     <value>218, 28</value>
   </data>
@@ -1303,8 +1321,11 @@
   <data name="LblPoolWeight4.Text" xml:space="preserve">
     <value>4星池权重</value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="BtnGen.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 201</value>
+  </data>
+  <data name="&gt;&gt;TxtPoolWeight5.Name" xml:space="preserve">
+    <value>TxtPoolWeight5</value>
   </data>
   <data name="LblScheduleIdTip.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 17</value>
@@ -1321,8 +1342,8 @@
   <data name="TxtWeight5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;BtnGen.Parent" xml:space="preserve">
-    <value>GrpJson</value>
+  <data name="ListUpItems.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;LblGachaType.ZOrder" xml:space="preserve">
     <value>11</value>
@@ -1330,14 +1351,17 @@
   <data name="&gt;&gt;LblEventChance5Tip.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="ChartWeights.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;ListFallbackItems.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="TxtJson.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
-  <data name="RbCostItem224.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="LblPoolWeight5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>43, 32</value>
   </data>
   <data name="LblGachaTypeTip.Text" xml:space="preserve">
     <value>从400开始，顺序递增</value>
@@ -1345,11 +1369,14 @@
   <data name="LnkOpenOldEditor.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
   </data>
+  <data name="LblGachaTypeTip.TabIndex" type="System.Int32, mscorlib">
+    <value>51</value>
+  </data>
   <data name="&gt;&gt;TxtWeight4.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="LblPoolWeight5.Text" xml:space="preserve">
-    <value>5星池权重</value>
+  <data name="LnkOpenOldEditor.Text" xml:space="preserve">
+    <value>打开旧版本编辑器</value>
   </data>
   <data name="&gt;&gt;LblPoolWeight4.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -1363,47 +1390,53 @@
   <data name="LblEventChance5.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 17</value>
   </data>
+  <data name="LblPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>63, 17</value>
+  </data>
   <data name="BtnParse.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
-  <data name="&gt;&gt;LblOptions.Name" xml:space="preserve">
-    <value>LblOptions</value>
-  </data>
   <data name="&gt;&gt;LblWeight5.Name" xml:space="preserve">
     <value>LblWeight5</value>
   </data>
   <data name="BtnGen.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="CmbBannerType.Items2" xml:space="preserve">
+    <value>限时武器祈愿池</value>
   </data>
-  <data name="&gt;&gt;GrpFallbackPool.Name" xml:space="preserve">
-    <value>GrpFallbackPool</value>
+  <data name="CmbBannerType.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
   <data name="LblBannerType.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
   </data>
+  <data name="&gt;&gt;GrpWeightChart.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
   <data name="&gt;&gt;LblEventChance5.ZOrder" xml:space="preserve">
     <value>13</value>
   </data>
-  <data name="LblPrefabPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>74, 118</value>
+  <data name="&gt;&gt;LblOptions.Name" xml:space="preserve">
+    <value>LblOptions</value>
   </data>
   <data name="&gt;&gt;CmbBannerType.Type" xml:space="preserve">
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="RbCostItem224.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
   <data name="LblBannerType.Text" xml:space="preserve">
     <value>奖池类型</value>
   </data>
   <data name="LblSortId.Location" type="System.Drawing.Point, System.Drawing">
     <value>74, 204</value>
   </data>
-  <data name="&gt;&gt;LblPrefabPath.Name" xml:space="preserve">
-    <value>LblPrefabPath</value>
+  <data name="GrpWeightChart.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
   </data>
   <data name="&gt;&gt;GrpUpPool.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;CmbBannerType.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -1414,11 +1447,14 @@
   <data name="LblBeginTime.TabIndex" type="System.Int32, mscorlib">
     <value>72</value>
   </data>
-  <data name="&gt;&gt;GrpBalance.Type" xml:space="preserve">
+  <data name="&gt;&gt;GrpWeights.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="LblGachaTypeTip.TabIndex" type="System.Int32, mscorlib">
-    <value>51</value>
+  <data name="LblGachaTypeTip.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ListFallbackItems.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
   <data name="LblPoolWeight4.Location" type="System.Drawing.Point, System.Drawing">
     <value>43, 61</value>
@@ -1429,6 +1465,9 @@
   <data name="TxtWeight5.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 23</value>
   </data>
+  <data name="ChartWeights.Size" type="System.Drawing.Size, System.Drawing">
+    <value>494, 280</value>
+  </data>
   <data name="CmbBannerType.Items" xml:space="preserve">
     <value>常驻池</value>
   </data>
@@ -1438,8 +1477,8 @@
   <data name="LblWeight5.Text" xml:space="preserve">
     <value>5星权重</value>
   </data>
-  <data name="&gt;&gt;LblBeginTime.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="LblPrefabPath.TabIndex" type="System.Int32, mscorlib">
+    <value>61</value>
   </data>
   <data name="ChkAutoStripRateUpFromFallback.TabIndex" type="System.Int32, mscorlib">
     <value>92</value>
@@ -1447,8 +1486,8 @@
   <data name="&gt;&gt;LblGachaTypeTip.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="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>1000, 600</value>
+  <data name="LblEventChance5Tip.Text" xml:space="preserve">
+    <value>%</value>
   </data>
   <data name="LblEventChance5.Location" type="System.Drawing.Point, System.Drawing">
     <value>31, 233</value>
@@ -1456,12 +1495,12 @@
   <data name="&gt;&gt;ColFallbackId.Name" xml:space="preserve">
     <value>ColFallbackId</value>
   </data>
+  <data name="&gt;&gt;ChartWeights.Type" xml:space="preserve">
+    <value>System.Windows.Forms.DataVisualization.Charting.Chart, System.Windows.Forms.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</value>
+  </data>
   <data name="LblSortId.TabIndex" type="System.Int32, mscorlib">
     <value>75</value>
   </data>
-  <data name="&gt;&gt;LblBannerType.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;ChkAutoStripRateUpFromFallback.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -1477,11 +1516,8 @@
   <data name="LblGachaType.TabIndex" type="System.Int32, mscorlib">
     <value>48</value>
   </data>
-  <data name="&gt;&gt;LblWeight5.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="LblPrefabPath.TabIndex" type="System.Int32, mscorlib">
-    <value>61</value>
+  <data name="LblCostItem.Location" type="System.Drawing.Point, System.Drawing">
+    <value>50, 148</value>
   </data>
   <data name="&gt;&gt;RbCostItem223.ZOrder" xml:space="preserve">
     <value>29</value>
@@ -1498,21 +1534,24 @@
   <data name="&gt;&gt;NUDScheduleId.Name" xml:space="preserve">
     <value>NUDScheduleId</value>
   </data>
-  <data name="ColUpName.Width" type="System.Int32, mscorlib">
-    <value>110</value>
+  <data name="NUDScheduleId.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>FormGachaBannerEditor2</value>
+  <data name="&gt;&gt;LblBannerType.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;ChkAutoStripRateUpFromFallback.Name" xml:space="preserve">
     <value>ChkAutoStripRateUpFromFallback</value>
   </data>
-  <data name="GrpJson.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+  <data name="&gt;&gt;ListFallbackItems.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="RbCostItem223.Location" type="System.Drawing.Point, System.Drawing">
     <value>192, 146</value>
   </data>
+  <data name="&gt;&gt;ChartWeights.Parent" xml:space="preserve">
+    <value>GrpWeightChart</value>
+  </data>
   <data name="RbCostItem223.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1534,8 +1573,11 @@
   <data name="LblPoolWeight4.Size" type="System.Drawing.Size, System.Drawing">
     <value>63, 17</value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.Name" xml:space="preserve">
-    <value>TxtPoolWeight5</value>
+  <data name="ChkRemoveC6FormPool.Location" type="System.Drawing.Point, System.Drawing">
+    <value>112, 260</value>
+  </data>
+  <data name="GrpWeightChart.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>卡池编辑器</value>
@@ -1543,8 +1585,8 @@
   <data name="NUDEventChance4.Size" type="System.Drawing.Size, System.Drawing">
     <value>63, 23</value>
   </data>
-  <data name="&gt;&gt;LblWeight5.ZOrder" xml:space="preserve">
-    <value>4</value>
+  <data name="&gt;&gt;CmbPrefab.Name" xml:space="preserve">
+    <value>CmbPrefab</value>
   </data>
   <data name="&gt;&gt;LblOptions.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -1552,23 +1594,23 @@
   <data name="GrpBannerValues.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 12</value>
   </data>
-  <data name="LblPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 17</value>
+  <data name="&gt;&gt;NUDScheduleId.Parent" xml:space="preserve">
+    <value>GrpBannerValues</value>
   </data>
   <data name="LblScheduleId.Text" xml:space="preserve">
     <value>ScheduleId</value>
   </data>
-  <data name="&gt;&gt;LnkWeightHelp.Type" xml:space="preserve">
-    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;LblEventChance4.Name" xml:space="preserve">
+    <value>LblEventChance4</value>
   </data>
-  <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>402, 0</value>
+  <data name="LblScheduleId.TabIndex" type="System.Int32, mscorlib">
+    <value>53</value>
   </data>
   <data name="LblCostItem.TabIndex" type="System.Int32, mscorlib">
     <value>80</value>
   </data>
-  <data name="LblBannerType.TabIndex" type="System.Int32, mscorlib">
-    <value>59</value>
+  <data name="LblWeight4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 17</value>
   </data>
   <data name="LblPoolWeight5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1579,8 +1621,8 @@
   <data name="&gt;&gt;LblPoolWeight4.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;BtnParse.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="&gt;&gt;CmbBannerType.ZOrder" xml:space="preserve">
+    <value>23</value>
   </data>
   <data name="ListUpItems.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 19</value>
@@ -1591,7 +1633,4 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-TW</value>
-  </metadata>
 </root>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx

@@ -233,10 +233,10 @@
     <value>Молитва события с оружием</value>
   </data>
   <data name="LblSortIdTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>101, 17</value>
+    <value>121, 17</value>
   </data>
   <data name="LblSortIdTip.Text" xml:space="preserve">
-    <value>Показать заказ</value>
+    <value>Показать порядок</value>
   </data>
   <data name="LblBannerType.Location" type="System.Drawing.Point, System.Drawing">
     <value>18, 87</value>
@@ -283,6 +283,9 @@
   <data name="GrpBannerValues.Text" xml:space="preserve">
     <value>Баннер</value>
   </data>
+  <data name="GrpFallbackPool.Text" xml:space="preserve">
+    <value>Запасной Пул</value>
+  </data>
   <data name="ListFallbackItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -343,8 +346,8 @@
         bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws=
 </value>
   </data>
-  <data name="GrpFallbackPool.Text" xml:space="preserve">
-    <value>Запасной Пул</value>
+  <data name="GrpUpPool.Text" xml:space="preserve">
+    <value>Верхний Пул</value>
   </data>
   <data name="ListUpItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -386,9 +389,6 @@
         bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw==
 </value>
   </data>
-  <data name="GrpUpPool.Text" xml:space="preserve">
-    <value>Верхний Пул</value>
-  </data>
   <data name="BtnGen.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 23</value>
   </data>
@@ -396,13 +396,16 @@
     <value>Сген. Json</value>
   </data>
   <data name="BtnParse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>209, 512</value>
+    <value>409, 201</value>
   </data>
   <data name="BtnParse.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 23</value>
   </data>
   <data name="BtnParse.Text" xml:space="preserve">
-    <value>Загр.Json</value>
+    <value>Загр. Json</value>
+  </data>
+  <data name="GrpWeights.Text" xml:space="preserve">
+    <value>Gacha Веса</value>
   </data>
   <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
     <value>375, 0</value>
@@ -431,8 +434,8 @@
   <data name="LblWeight5.Text" xml:space="preserve">
     <value>Веса 5*</value>
   </data>
-  <data name="GrpWeights.Text" xml:space="preserve">
-    <value>Gacha Веса</value>
+  <data name="GrpBalance.Text" xml:space="preserve">
+    <value>Баланс персонажа и оружия (работают только смешанные пулы)</value>
   </data>
   <data name="LblPoolWeight4.Location" type="System.Drawing.Point, System.Drawing">
     <value>28, 61</value>
@@ -452,8 +455,8 @@
   <data name="LblPoolWeight5.Text" xml:space="preserve">
     <value>Пул Веса 5*</value>
   </data>
-  <data name="GrpBalance.Text" xml:space="preserve">
-    <value>Баланс персонажа и оружия (работают только смешанные пулы)</value>
+  <data name="GrpWeightChart.Text" xml:space="preserve">
+    <value>Таблица веса</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Редактор баннеров Gacha</value>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx

@@ -289,6 +289,9 @@
   <data name="GrpBalance.Text" xml:space="preserve">
     <value>角色和武器平衡機制（僅混合池有效）</value>
   </data>
+  <data name="GrpWeightChart.Text" xml:space="preserve">
+    <value>權重圖表</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>卡池編輯器</value>
   </data>

Source/GrasscutterTools/Forms/FormMain.Designer.cs

@@ -88,14 +88,15 @@ namespace GrasscutterTools.Forms
             this.GrpPermission = new System.Windows.Forms.GroupBox();
             this.CmbPerm = new System.Windows.Forms.ComboBox();
             this.NUDPermUID = new System.Windows.Forms.NumericUpDown();
+            this.BtnPermClear = new System.Windows.Forms.Button();
             this.BtmPermRemove = new System.Windows.Forms.Button();
+            this.BtnPermList = new System.Windows.Forms.Button();
             this.BtnPermAdd = new System.Windows.Forms.Button();
             this.LblPerm = new System.Windows.Forms.Label();
             this.LblPermUID = new System.Windows.Forms.Label();
             this.TPScene = new System.Windows.Forms.TabPage();
             this.TxtSceneFilter = new System.Windows.Forms.TextBox();
             this.ChkIncludeSceneId = new System.Windows.Forms.CheckBox();
-            this.LblTp = new System.Windows.Forms.Label();
             this.LblTpZ = new System.Windows.Forms.Label();
             this.LblTpY = new System.Windows.Forms.Label();
             this.BtnTeleport = new System.Windows.Forms.Button();
@@ -107,6 +108,7 @@ namespace GrasscutterTools.Forms
             this.LblClimateType = new System.Windows.Forms.Label();
             this.LblSceneDescription = new System.Windows.Forms.Label();
             this.ListScenes = new System.Windows.Forms.ListBox();
+            this.LblTp = new System.Windows.Forms.Label();
             this.TPItem = new System.Windows.Forms.TabPage();
             this.LblClearGiveItemLogs = new System.Windows.Forms.Label();
             this.BtnSaveGiveItemLog = new System.Windows.Forms.Button();
@@ -122,6 +124,7 @@ namespace GrasscutterTools.Forms
             this.NUDGameItemLevel = new System.Windows.Forms.NumericUpDown();
             this.LblGiveCommandDescription = new System.Windows.Forms.Label();
             this.TPWeapon = new System.Windows.Forms.TabPage();
+            this.BtnGiveAllWeapons = new System.Windows.Forms.Button();
             this.TxtWeaponFilter = new System.Windows.Forms.TextBox();
             this.LblWeaponDescription = new System.Windows.Forms.Label();
             this.LblWeaponRefinement = new System.Windows.Forms.Label();
@@ -132,9 +135,9 @@ namespace GrasscutterTools.Forms
             this.NUDWeaponLevel = new System.Windows.Forms.NumericUpDown();
             this.ListWeapons = new System.Windows.Forms.ListBox();
             this.TPStats = new System.Windows.Forms.TabPage();
-            this.LblResetStatsCommand = new System.Windows.Forms.LinkLabel();
-            this.LblResetStatsTip = new System.Windows.Forms.Label();
             this.GrpSetStats = new System.Windows.Forms.GroupBox();
+            this.BtnUnlockStat = new System.Windows.Forms.Button();
+            this.BtnLockStat = new System.Windows.Forms.Button();
             this.LblStatTip = new System.Windows.Forms.Label();
             this.LblStatPercent = new System.Windows.Forms.Label();
             this.NUDStat = new System.Windows.Forms.NumericUpDown();
@@ -147,7 +150,6 @@ namespace GrasscutterTools.Forms
             this.LblStatsDescription = new System.Windows.Forms.Label();
             this.TPAvatar = new System.Windows.Forms.TabPage();
             this.BtnGiveAllChar = new System.Windows.Forms.Button();
-            this.LblConstellationTip = new System.Windows.Forms.Label();
             this.LblAvatarConstellation = new System.Windows.Forms.Label();
             this.NUDAvatarConstellation = new System.Windows.Forms.NumericUpDown();
             this.ImgAvatar = new System.Windows.Forms.PictureBox();
@@ -156,6 +158,7 @@ namespace GrasscutterTools.Forms
             this.NUDAvatarLevel = new System.Windows.Forms.NumericUpDown();
             this.CmbAvatar = new System.Windows.Forms.ComboBox();
             this.TPSpawn = new System.Windows.Forms.TabPage();
+            this.ChkInfiniteHP = new System.Windows.Forms.CheckBox();
             this.LblClearSpawnLogs = new System.Windows.Forms.Label();
             this.BtnSaveSpawnLog = new System.Windows.Forms.Button();
             this.BtnRemoveSpawnLog = new System.Windows.Forms.Button();
@@ -163,7 +166,6 @@ namespace GrasscutterTools.Forms
             this.ListSpawnLogs = new System.Windows.Forms.ListBox();
             this.GrpEntityType = new System.Windows.Forms.GroupBox();
             this.RbEntityAnimal = new System.Windows.Forms.RadioButton();
-            this.RbEntityNPC = new System.Windows.Forms.RadioButton();
             this.RbEntityMonster = new System.Windows.Forms.RadioButton();
             this.LblSpawnDescription = new System.Windows.Forms.Label();
             this.LblEntityAmount = new System.Windows.Forms.Label();
@@ -213,13 +215,15 @@ namespace GrasscutterTools.Forms
             this.BtnSaveCustomCommand = new System.Windows.Forms.Button();
             this.TxtCustomName = new System.Windows.Forms.TextBox();
             this.TPHome = new System.Windows.Forms.TabPage();
+            this.LnkNewVersion = new System.Windows.Forms.LinkLabel();
             this.LblAbout = new System.Windows.Forms.Label();
             this.BtnOpenTextMap = new System.Windows.Forms.Button();
             this.BtnOpenGachaBannerEditor = new System.Windows.Forms.Button();
             this.GrasscutterToolsIcon = new System.Windows.Forms.PictureBox();
             this.GrpSettings = new System.Windows.Forms.GroupBox();
+            this.LblGCVersion = new System.Windows.Forms.Label();
+            this.CmbGcVersions = new System.Windows.Forms.ComboBox();
             this.ChkTopMost = new System.Windows.Forms.CheckBox();
-            this.ChkNewCommand = new System.Windows.Forms.CheckBox();
             this.CmbLanguage = new System.Windows.Forms.ComboBox();
             this.LblLanguage = new System.Windows.Forms.Label();
             this.NUDUid = new System.Windows.Forms.NumericUpDown();
@@ -322,6 +326,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPRemoteCall
             // 
+            resources.ApplyResources(this.TPRemoteCall, "TPRemoteCall");
             this.TPRemoteCall.Controls.Add(this.LnkLinks);
             this.TPRemoteCall.Controls.Add(this.LnkGOODHelp);
             this.TPRemoteCall.Controls.Add(this.LnkInventoryKamera);
@@ -333,9 +338,9 @@ namespace GrasscutterTools.Forms
             this.TPRemoteCall.Controls.Add(this.TxtHost);
             this.TPRemoteCall.Controls.Add(this.BtnQueryServerStatus);
             this.TPRemoteCall.Controls.Add(this.LblHost);
-            resources.ApplyResources(this.TPRemoteCall, "TPRemoteCall");
             this.TPRemoteCall.Name = "TPRemoteCall";
             this.TPRemoteCall.UseVisualStyleBackColor = true;
+            this.TPRemoteCall.Enter += new System.EventHandler(this.TPRemoteCall_Enter);
             // 
             // LnkLinks
             // 
@@ -430,14 +435,15 @@ namespace GrasscutterTools.Forms
             // 
             // TPOpenCommandCheck
             // 
+            resources.ApplyResources(this.TPOpenCommandCheck, "TPOpenCommandCheck");
             this.TPOpenCommandCheck.Controls.Add(this.TPPlayerCheck);
             this.TPOpenCommandCheck.Controls.Add(this.TPConsoleCheck);
-            resources.ApplyResources(this.TPOpenCommandCheck, "TPOpenCommandCheck");
             this.TPOpenCommandCheck.Name = "TPOpenCommandCheck";
             this.TPOpenCommandCheck.SelectedIndex = 0;
             // 
             // TPPlayerCheck
             // 
+            resources.ApplyResources(this.TPPlayerCheck, "TPPlayerCheck");
             this.TPPlayerCheck.Controls.Add(this.LnkRCHelp);
             this.TPPlayerCheck.Controls.Add(this.NUDRemotePlayerId);
             this.TPPlayerCheck.Controls.Add(this.BtnConnectOpenCommand);
@@ -445,7 +451,6 @@ namespace GrasscutterTools.Forms
             this.TPPlayerCheck.Controls.Add(this.BtnSendVerificationCode);
             this.TPPlayerCheck.Controls.Add(this.NUDVerificationCode);
             this.TPPlayerCheck.Controls.Add(this.LblRemotePlayerId);
-            resources.ApplyResources(this.TPPlayerCheck, "TPPlayerCheck");
             this.TPPlayerCheck.Name = "TPPlayerCheck";
             this.TPPlayerCheck.UseVisualStyleBackColor = true;
             // 
@@ -517,11 +522,11 @@ namespace GrasscutterTools.Forms
             // 
             // TPConsoleCheck
             // 
+            resources.ApplyResources(this.TPConsoleCheck, "TPConsoleCheck");
             this.TPConsoleCheck.Controls.Add(this.BtnConsoleConnect);
             this.TPConsoleCheck.Controls.Add(this.TxtToken);
             this.TPConsoleCheck.Controls.Add(this.LblToken);
             this.TPConsoleCheck.Controls.Add(this.LblConsoleTip);
-            resources.ApplyResources(this.TPConsoleCheck, "TPConsoleCheck");
             this.TPConsoleCheck.Name = "TPConsoleCheck";
             this.TPConsoleCheck.UseVisualStyleBackColor = true;
             // 
@@ -566,10 +571,10 @@ namespace GrasscutterTools.Forms
             // 
             // TPAbout
             // 
+            resources.ApplyResources(this.TPAbout, "TPAbout");
             this.TPAbout.Controls.Add(this.GrasscutterToolsSupport);
             this.TPAbout.Controls.Add(this.LnkGithub);
             this.TPAbout.Controls.Add(this.LblSupportDescription);
-            resources.ApplyResources(this.TPAbout, "TPAbout");
             this.TPAbout.Name = "TPAbout";
             this.TPAbout.UseVisualStyleBackColor = true;
             // 
@@ -594,10 +599,10 @@ namespace GrasscutterTools.Forms
             // 
             // TPManage
             // 
+            resources.ApplyResources(this.TPManage, "TPManage");
             this.TPManage.Controls.Add(this.GrpBanPlayer);
             this.TPManage.Controls.Add(this.GrpAccount);
             this.TPManage.Controls.Add(this.GrpPermission);
-            resources.ApplyResources(this.TPManage, "TPManage");
             this.TPManage.Name = "TPManage";
             this.TPManage.UseVisualStyleBackColor = true;
             // 
@@ -615,8 +620,8 @@ namespace GrasscutterTools.Forms
             // 
             // DTPBanEndTime
             // 
-            this.DTPBanEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             resources.ApplyResources(this.DTPBanEndTime, "DTPBanEndTime");
+            this.DTPBanEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.DTPBanEndTime.MaxDate = new System.DateTime(2034, 12, 31, 0, 0, 0, 0);
             this.DTPBanEndTime.MinDate = new System.DateTime(2022, 6, 28, 0, 0, 0, 0);
             this.DTPBanEndTime.Name = "DTPBanEndTime";
@@ -638,8 +643,8 @@ namespace GrasscutterTools.Forms
             // 
             // TxtBanReason
             // 
-            this.TxtBanReason.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             resources.ApplyResources(this.TxtBanReason, "TxtBanReason");
+            this.TxtBanReason.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.TxtBanReason.Maximum = 0F;
             this.TxtBanReason.Minimum = 0F;
             this.TxtBanReason.Name = "TxtBanReason";
@@ -728,7 +733,9 @@ namespace GrasscutterTools.Forms
             resources.ApplyResources(this.GrpPermission, "GrpPermission");
             this.GrpPermission.Controls.Add(this.CmbPerm);
             this.GrpPermission.Controls.Add(this.NUDPermUID);
+            this.GrpPermission.Controls.Add(this.BtnPermClear);
             this.GrpPermission.Controls.Add(this.BtmPermRemove);
+            this.GrpPermission.Controls.Add(this.BtnPermList);
             this.GrpPermission.Controls.Add(this.BtnPermAdd);
             this.GrpPermission.Controls.Add(this.LblPerm);
             this.GrpPermission.Controls.Add(this.LblPermUID);
@@ -737,10 +744,10 @@ namespace GrasscutterTools.Forms
             // 
             // CmbPerm
             // 
+            resources.ApplyResources(this.CmbPerm, "CmbPerm");
             this.CmbPerm.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.CmbPerm.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.CmbPerm.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbPerm, "CmbPerm");
             this.CmbPerm.Name = "CmbPerm";
             // 
             // NUDPermUID
@@ -758,6 +765,14 @@ namespace GrasscutterTools.Forms
             0,
             0});
             // 
+            // BtnPermClear
+            // 
+            resources.ApplyResources(this.BtnPermClear, "BtnPermClear");
+            this.BtnPermClear.Name = "BtnPermClear";
+            this.BtnPermClear.Tag = "clear";
+            this.BtnPermClear.UseVisualStyleBackColor = true;
+            this.BtnPermClear.Click += new System.EventHandler(this.BtnPermClick);
+            // 
             // BtmPermRemove
             // 
             resources.ApplyResources(this.BtmPermRemove, "BtmPermRemove");
@@ -766,6 +781,14 @@ namespace GrasscutterTools.Forms
             this.BtmPermRemove.UseVisualStyleBackColor = true;
             this.BtmPermRemove.Click += new System.EventHandler(this.BtnPermClick);
             // 
+            // BtnPermList
+            // 
+            resources.ApplyResources(this.BtnPermList, "BtnPermList");
+            this.BtnPermList.Name = "BtnPermList";
+            this.BtnPermList.Tag = "list";
+            this.BtnPermList.UseVisualStyleBackColor = true;
+            this.BtnPermList.Click += new System.EventHandler(this.BtnPermClick);
+            // 
             // BtnPermAdd
             // 
             resources.ApplyResources(this.BtnPermAdd, "BtnPermAdd");
@@ -786,9 +809,9 @@ namespace GrasscutterTools.Forms
             // 
             // TPScene
             // 
+            resources.ApplyResources(this.TPScene, "TPScene");
             this.TPScene.Controls.Add(this.TxtSceneFilter);
             this.TPScene.Controls.Add(this.ChkIncludeSceneId);
-            this.TPScene.Controls.Add(this.LblTp);
             this.TPScene.Controls.Add(this.LblTpZ);
             this.TPScene.Controls.Add(this.LblTpY);
             this.TPScene.Controls.Add(this.BtnTeleport);
@@ -800,7 +823,7 @@ namespace GrasscutterTools.Forms
             this.TPScene.Controls.Add(this.LblClimateType);
             this.TPScene.Controls.Add(this.LblSceneDescription);
             this.TPScene.Controls.Add(this.ListScenes);
-            resources.ApplyResources(this.TPScene, "TPScene");
+            this.TPScene.Controls.Add(this.LblTp);
             this.TPScene.Name = "TPScene";
             this.TPScene.UseVisualStyleBackColor = true;
             // 
@@ -816,11 +839,6 @@ namespace GrasscutterTools.Forms
             this.ChkIncludeSceneId.Name = "ChkIncludeSceneId";
             this.ChkIncludeSceneId.UseVisualStyleBackColor = true;
             // 
-            // LblTp
-            // 
-            resources.ApplyResources(this.LblTp, "LblTp");
-            this.LblTp.Name = "LblTp";
-            // 
             // LblTpZ
             // 
             resources.ApplyResources(this.LblTpZ, "LblTpZ");
@@ -933,8 +951,14 @@ namespace GrasscutterTools.Forms
             this.ListScenes.Name = "ListScenes";
             this.ListScenes.SelectedIndexChanged += new System.EventHandler(this.ListScenes_SelectedIndexChanged);
             // 
+            // LblTp
+            // 
+            resources.ApplyResources(this.LblTp, "LblTp");
+            this.LblTp.Name = "LblTp";
+            // 
             // TPItem
             // 
+            resources.ApplyResources(this.TPItem, "TPItem");
             this.TPItem.Controls.Add(this.LblClearGiveItemLogs);
             this.TPItem.Controls.Add(this.BtnSaveGiveItemLog);
             this.TPItem.Controls.Add(this.BtnRemoveGiveItemLog);
@@ -947,7 +971,6 @@ namespace GrasscutterTools.Forms
             this.TPItem.Controls.Add(this.NUDGameItemAmout);
             this.TPItem.Controls.Add(this.NUDGameItemLevel);
             this.TPItem.Controls.Add(this.LblGiveCommandDescription);
-            resources.ApplyResources(this.TPItem, "TPItem");
             this.TPItem.Name = "TPItem";
             this.TPItem.UseVisualStyleBackColor = true;
             // 
@@ -1065,6 +1088,8 @@ namespace GrasscutterTools.Forms
             // 
             // TPWeapon
             // 
+            resources.ApplyResources(this.TPWeapon, "TPWeapon");
+            this.TPWeapon.Controls.Add(this.BtnGiveAllWeapons);
             this.TPWeapon.Controls.Add(this.TxtWeaponFilter);
             this.TPWeapon.Controls.Add(this.LblWeaponDescription);
             this.TPWeapon.Controls.Add(this.LblWeaponRefinement);
@@ -1074,10 +1099,16 @@ namespace GrasscutterTools.Forms
             this.TPWeapon.Controls.Add(this.NUDWeaponAmout);
             this.TPWeapon.Controls.Add(this.NUDWeaponLevel);
             this.TPWeapon.Controls.Add(this.ListWeapons);
-            resources.ApplyResources(this.TPWeapon, "TPWeapon");
             this.TPWeapon.Name = "TPWeapon";
             this.TPWeapon.UseVisualStyleBackColor = true;
             // 
+            // BtnGiveAllWeapons
+            // 
+            resources.ApplyResources(this.BtnGiveAllWeapons, "BtnGiveAllWeapons");
+            this.BtnGiveAllWeapons.Name = "BtnGiveAllWeapons";
+            this.BtnGiveAllWeapons.UseVisualStyleBackColor = true;
+            this.BtnGiveAllWeapons.Click += new System.EventHandler(this.BtnGiveAllWeapons_Click);
+            // 
             // TxtWeaponFilter
             // 
             resources.ApplyResources(this.TxtWeaponFilter, "TxtWeaponFilter");
@@ -1171,31 +1202,18 @@ namespace GrasscutterTools.Forms
             // 
             // TPStats
             // 
-            this.TPStats.Controls.Add(this.LblResetStatsCommand);
-            this.TPStats.Controls.Add(this.LblResetStatsTip);
+            resources.ApplyResources(this.TPStats, "TPStats");
             this.TPStats.Controls.Add(this.GrpSetStats);
             this.TPStats.Controls.Add(this.GrpTalentLevel);
             this.TPStats.Controls.Add(this.LblStatsDescription);
-            resources.ApplyResources(this.TPStats, "TPStats");
             this.TPStats.Name = "TPStats";
             this.TPStats.UseVisualStyleBackColor = true;
             // 
-            // LblResetStatsCommand
-            // 
-            resources.ApplyResources(this.LblResetStatsCommand, "LblResetStatsCommand");
-            this.LblResetStatsCommand.Name = "LblResetStatsCommand";
-            this.LblResetStatsCommand.TabStop = true;
-            this.LblResetStatsCommand.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LblResetStatsCommand_LinkClicked);
-            // 
-            // LblResetStatsTip
-            // 
-            resources.ApplyResources(this.LblResetStatsTip, "LblResetStatsTip");
-            this.LblResetStatsTip.ForeColor = System.Drawing.SystemColors.ActiveCaption;
-            this.LblResetStatsTip.Name = "LblResetStatsTip";
-            // 
             // GrpSetStats
             // 
             resources.ApplyResources(this.GrpSetStats, "GrpSetStats");
+            this.GrpSetStats.Controls.Add(this.BtnUnlockStat);
+            this.GrpSetStats.Controls.Add(this.BtnLockStat);
             this.GrpSetStats.Controls.Add(this.LblStatTip);
             this.GrpSetStats.Controls.Add(this.LblStatPercent);
             this.GrpSetStats.Controls.Add(this.NUDStat);
@@ -1203,11 +1221,25 @@ namespace GrasscutterTools.Forms
             this.GrpSetStats.Name = "GrpSetStats";
             this.GrpSetStats.TabStop = false;
             // 
+            // BtnUnlockStat
+            // 
+            resources.ApplyResources(this.BtnUnlockStat, "BtnUnlockStat");
+            this.BtnUnlockStat.Name = "BtnUnlockStat";
+            this.BtnUnlockStat.UseVisualStyleBackColor = true;
+            this.BtnUnlockStat.Click += new System.EventHandler(this.BtnUnlockStat_Click);
+            // 
+            // BtnLockStat
+            // 
+            resources.ApplyResources(this.BtnLockStat, "BtnLockStat");
+            this.BtnLockStat.Name = "BtnLockStat";
+            this.BtnLockStat.UseVisualStyleBackColor = true;
+            this.BtnLockStat.Click += new System.EventHandler(this.BtnLockStat_Click);
+            // 
             // LblStatTip
             // 
+            resources.ApplyResources(this.LblStatTip, "LblStatTip");
             this.LblStatTip.AutoEllipsis = true;
             this.LblStatTip.ForeColor = System.Drawing.SystemColors.GrayText;
-            resources.ApplyResources(this.LblStatTip, "LblStatTip");
             this.LblStatTip.Name = "LblStatTip";
             // 
             // LblStatPercent
@@ -1233,9 +1265,9 @@ namespace GrasscutterTools.Forms
             // 
             // CmbStat
             // 
+            resources.ApplyResources(this.CmbStat, "CmbStat");
             this.CmbStat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.CmbStat.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbStat, "CmbStat");
             this.CmbStat.Name = "CmbStat";
             this.CmbStat.SelectedIndexChanged += new System.EventHandler(this.SetStatsInputChanged);
             // 
@@ -1295,8 +1327,8 @@ namespace GrasscutterTools.Forms
             // 
             // TPAvatar
             // 
+            resources.ApplyResources(this.TPAvatar, "TPAvatar");
             this.TPAvatar.Controls.Add(this.BtnGiveAllChar);
-            this.TPAvatar.Controls.Add(this.LblConstellationTip);
             this.TPAvatar.Controls.Add(this.LblAvatarConstellation);
             this.TPAvatar.Controls.Add(this.NUDAvatarConstellation);
             this.TPAvatar.Controls.Add(this.ImgAvatar);
@@ -1304,7 +1336,6 @@ namespace GrasscutterTools.Forms
             this.TPAvatar.Controls.Add(this.LblAvatarLevel);
             this.TPAvatar.Controls.Add(this.NUDAvatarLevel);
             this.TPAvatar.Controls.Add(this.CmbAvatar);
-            resources.ApplyResources(this.TPAvatar, "TPAvatar");
             this.TPAvatar.Name = "TPAvatar";
             this.TPAvatar.UseVisualStyleBackColor = true;
             // 
@@ -1315,13 +1346,6 @@ namespace GrasscutterTools.Forms
             this.BtnGiveAllChar.UseVisualStyleBackColor = true;
             this.BtnGiveAllChar.Click += new System.EventHandler(this.BtnGiveAllChar_Click);
             // 
-            // LblConstellationTip
-            // 
-            resources.ApplyResources(this.LblConstellationTip, "LblConstellationTip");
-            this.LblConstellationTip.AutoEllipsis = true;
-            this.LblConstellationTip.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.LblConstellationTip.Name = "LblConstellationTip";
-            // 
             // LblAvatarConstellation
             // 
             resources.ApplyResources(this.LblAvatarConstellation, "LblAvatarConstellation");
@@ -1341,6 +1365,7 @@ namespace GrasscutterTools.Forms
             0,
             0,
             0});
+            this.NUDAvatarConstellation.ValueChanged += new System.EventHandler(this.NUDAvatarConstellation_ValueChanged);
             // 
             // ImgAvatar
             // 
@@ -1390,6 +1415,8 @@ namespace GrasscutterTools.Forms
             // 
             // TPSpawn
             // 
+            resources.ApplyResources(this.TPSpawn, "TPSpawn");
+            this.TPSpawn.Controls.Add(this.ChkInfiniteHP);
             this.TPSpawn.Controls.Add(this.LblClearSpawnLogs);
             this.TPSpawn.Controls.Add(this.BtnSaveSpawnLog);
             this.TPSpawn.Controls.Add(this.BtnRemoveSpawnLog);
@@ -1402,10 +1429,16 @@ namespace GrasscutterTools.Forms
             this.TPSpawn.Controls.Add(this.NUDEntityLevel);
             this.TPSpawn.Controls.Add(this.TxtEntityFilter);
             this.TPSpawn.Controls.Add(this.ListEntity);
-            resources.ApplyResources(this.TPSpawn, "TPSpawn");
             this.TPSpawn.Name = "TPSpawn";
             this.TPSpawn.UseVisualStyleBackColor = true;
             // 
+            // ChkInfiniteHP
+            // 
+            resources.ApplyResources(this.ChkInfiniteHP, "ChkInfiniteHP");
+            this.ChkInfiniteHP.Name = "ChkInfiniteHP";
+            this.ChkInfiniteHP.UseVisualStyleBackColor = true;
+            this.ChkInfiniteHP.CheckedChanged += new System.EventHandler(this.SpawnEntityInputChanged);
+            // 
             // LblClearSpawnLogs
             // 
             resources.ApplyResources(this.LblClearSpawnLogs, "LblClearSpawnLogs");
@@ -1445,7 +1478,6 @@ namespace GrasscutterTools.Forms
             // 
             resources.ApplyResources(this.GrpEntityType, "GrpEntityType");
             this.GrpEntityType.Controls.Add(this.RbEntityAnimal);
-            this.GrpEntityType.Controls.Add(this.RbEntityNPC);
             this.GrpEntityType.Controls.Add(this.RbEntityMonster);
             this.GrpEntityType.Name = "GrpEntityType";
             this.GrpEntityType.TabStop = false;
@@ -1457,13 +1489,6 @@ namespace GrasscutterTools.Forms
             this.RbEntityAnimal.UseVisualStyleBackColor = true;
             this.RbEntityAnimal.CheckedChanged += new System.EventHandler(this.RbEntity_CheckedChanged);
             // 
-            // RbEntityNPC
-            // 
-            resources.ApplyResources(this.RbEntityNPC, "RbEntityNPC");
-            this.RbEntityNPC.Name = "RbEntityNPC";
-            this.RbEntityNPC.UseVisualStyleBackColor = true;
-            this.RbEntityNPC.CheckedChanged += new System.EventHandler(this.RbEntity_CheckedChanged);
-            // 
             // RbEntityMonster
             // 
             resources.ApplyResources(this.RbEntityMonster, "RbEntityMonster");
@@ -1543,13 +1568,13 @@ namespace GrasscutterTools.Forms
             // 
             // TPQuest
             // 
+            resources.ApplyResources(this.TPQuest, "TPQuest");
             this.TPQuest.Controls.Add(this.GrpQuestFilters);
             this.TPQuest.Controls.Add(this.BtnFinishQuest);
             this.TPQuest.Controls.Add(this.BtnAddQuest);
             this.TPQuest.Controls.Add(this.LblQuestDescription);
             this.TPQuest.Controls.Add(this.TxtQuestFilter);
             this.TPQuest.Controls.Add(this.ListQuest);
-            resources.ApplyResources(this.TPQuest, "TPQuest");
             this.TPQuest.Name = "TPQuest";
             this.TPQuest.UseVisualStyleBackColor = true;
             // 
@@ -1621,6 +1646,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPArtifact
             // 
+            resources.ApplyResources(this.TPArtifact, "TPArtifact");
             this.TPArtifact.Controls.Add(this.LblArtifactLevelTip);
             this.TPArtifact.Controls.Add(this.BtnAddSubAttr);
             this.TPArtifact.Controls.Add(this.LblArtifactName);
@@ -1640,7 +1666,6 @@ namespace GrasscutterTools.Forms
             this.TPArtifact.Controls.Add(this.NUDArtifactLevel);
             this.TPArtifact.Controls.Add(this.LblArtifactStars);
             this.TPArtifact.Controls.Add(this.NUDArtifactStars);
-            resources.ApplyResources(this.TPArtifact, "TPArtifact");
             this.TPArtifact.Name = "TPArtifact";
             this.TPArtifact.UseVisualStyleBackColor = true;
             // 
@@ -1806,6 +1831,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPCustom
             // 
+            resources.ApplyResources(this.TPCustom, "TPCustom");
             this.TPCustom.Controls.Add(this.BtnExportCustomCommands);
             this.TPCustom.Controls.Add(this.BtnLoadCustomCommands);
             this.TPCustom.Controls.Add(this.LblCustomName);
@@ -1813,7 +1839,6 @@ namespace GrasscutterTools.Forms
             this.TPCustom.Controls.Add(this.BtnRemoveCustomCommand);
             this.TPCustom.Controls.Add(this.BtnSaveCustomCommand);
             this.TPCustom.Controls.Add(this.TxtCustomName);
-            resources.ApplyResources(this.TPCustom, "TPCustom");
             this.TPCustom.Name = "TPCustom";
             this.TPCustom.UseVisualStyleBackColor = true;
             // 
@@ -1877,15 +1902,23 @@ namespace GrasscutterTools.Forms
             // 
             // TPHome
             // 
+            resources.ApplyResources(this.TPHome, "TPHome");
+            this.TPHome.Controls.Add(this.LnkNewVersion);
             this.TPHome.Controls.Add(this.LblAbout);
             this.TPHome.Controls.Add(this.BtnOpenTextMap);
             this.TPHome.Controls.Add(this.BtnOpenGachaBannerEditor);
             this.TPHome.Controls.Add(this.GrasscutterToolsIcon);
             this.TPHome.Controls.Add(this.GrpSettings);
-            resources.ApplyResources(this.TPHome, "TPHome");
             this.TPHome.Name = "TPHome";
             this.TPHome.UseVisualStyleBackColor = true;
             // 
+            // LnkNewVersion
+            // 
+            resources.ApplyResources(this.LnkNewVersion, "LnkNewVersion");
+            this.LnkNewVersion.Name = "LnkNewVersion";
+            this.LnkNewVersion.TabStop = true;
+            this.LnkNewVersion.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkNewVersion_LinkClicked);
+            // 
             // LblAbout
             // 
             resources.ApplyResources(this.LblAbout, "LblAbout");
@@ -1915,8 +1948,9 @@ namespace GrasscutterTools.Forms
             // GrpSettings
             // 
             resources.ApplyResources(this.GrpSettings, "GrpSettings");
+            this.GrpSettings.Controls.Add(this.LblGCVersion);
+            this.GrpSettings.Controls.Add(this.CmbGcVersions);
             this.GrpSettings.Controls.Add(this.ChkTopMost);
-            this.GrpSettings.Controls.Add(this.ChkNewCommand);
             this.GrpSettings.Controls.Add(this.CmbLanguage);
             this.GrpSettings.Controls.Add(this.LblLanguage);
             this.GrpSettings.Controls.Add(this.NUDUid);
@@ -1925,27 +1959,30 @@ namespace GrasscutterTools.Forms
             this.GrpSettings.Name = "GrpSettings";
             this.GrpSettings.TabStop = false;
             // 
+            // LblGCVersion
+            // 
+            resources.ApplyResources(this.LblGCVersion, "LblGCVersion");
+            this.LblGCVersion.Name = "LblGCVersion";
+            // 
+            // CmbGcVersions
+            // 
+            resources.ApplyResources(this.CmbGcVersions, "CmbGcVersions");
+            this.CmbGcVersions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CmbGcVersions.FormattingEnabled = true;
+            this.CmbGcVersions.Name = "CmbGcVersions";
+            // 
             // ChkTopMost
             // 
             resources.ApplyResources(this.ChkTopMost, "ChkTopMost");
             this.ChkTopMost.Name = "ChkTopMost";
             this.ChkTopMost.UseVisualStyleBackColor = true;
-            this.ChkTopMost.CheckedChanged += new System.EventHandler(this.ChkTopMost_CheckedChanged);
-            // 
-            // ChkNewCommand
-            // 
-            resources.ApplyResources(this.ChkNewCommand, "ChkNewCommand");
-            this.ChkNewCommand.Name = "ChkNewCommand";
-            this.ChkNewCommand.UseVisualStyleBackColor = true;
-            this.ChkNewCommand.CheckedChanged += new System.EventHandler(this.ChkNewCommand_CheckedChanged);
             // 
             // CmbLanguage
             // 
+            resources.ApplyResources(this.CmbLanguage, "CmbLanguage");
             this.CmbLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.CmbLanguage.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbLanguage, "CmbLanguage");
             this.CmbLanguage.Name = "CmbLanguage";
-            this.CmbLanguage.SelectedIndexChanged += new System.EventHandler(this.CmbLanguage_SelectedIndexChanged);
             // 
             // LblLanguage
             // 
@@ -2216,7 +2253,6 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.ListBox ListSpawnLogs;
         private System.Windows.Forms.GroupBox GrpEntityType;
         private System.Windows.Forms.RadioButton RbEntityAnimal;
-        private System.Windows.Forms.RadioButton RbEntityNPC;
         private System.Windows.Forms.RadioButton RbEntityMonster;
         private System.Windows.Forms.Label LblSpawnDescription;
         private System.Windows.Forms.Label LblEntityAmount;
@@ -2271,7 +2307,6 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.PictureBox GrasscutterToolsIcon;
         private System.Windows.Forms.GroupBox GrpSettings;
         private System.Windows.Forms.CheckBox ChkTopMost;
-        private System.Windows.Forms.CheckBox ChkNewCommand;
         private System.Windows.Forms.ComboBox CmbLanguage;
         private System.Windows.Forms.Label LblLanguage;
         private System.Windows.Forms.NumericUpDown NUDUid;
@@ -2281,11 +2316,8 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.Label LblArtifactLevelTip;
         private System.Windows.Forms.Label LblClearSpawnLogs;
         private System.Windows.Forms.Label LblClearGiveItemLogs;
-        private System.Windows.Forms.LinkLabel LblResetStatsCommand;
-        private System.Windows.Forms.Label LblResetStatsTip;
         private System.Windows.Forms.Label LblAvatarConstellation;
         private System.Windows.Forms.NumericUpDown NUDAvatarConstellation;
-        private System.Windows.Forms.Label LblConstellationTip;
         private System.Windows.Forms.Button BtnGiveAllChar;
         private System.Windows.Forms.Label LblHostTip;
         private System.Windows.Forms.Button ButtonOpenGOODImport;
@@ -2293,5 +2325,14 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.Label LblGOODHelp;
         private System.Windows.Forms.LinkLabel LnkGOODHelp;
         private System.Windows.Forms.LinkLabel LnkLinks;
+        private System.Windows.Forms.Button BtnUnlockStat;
+        private System.Windows.Forms.Button BtnLockStat;
+        private System.Windows.Forms.Label LblGCVersion;
+        private System.Windows.Forms.ComboBox CmbGcVersions;
+        private System.Windows.Forms.Button BtnPermClear;
+        private System.Windows.Forms.Button BtnPermList;
+        private System.Windows.Forms.LinkLabel LnkNewVersion;
+        private System.Windows.Forms.Button BtnGiveAllWeapons;
+        private System.Windows.Forms.CheckBox ChkInfiniteHP;
     }
 }

Source/GrasscutterTools/Forms/FormMain.en-us.resx

@@ -227,13 +227,13 @@
     <value>Note that normal commands in the console state must specify the target (set include UID)</value>
   </data>
   <data name="TxtHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>111, 36</value>
+    <value>136, 36</value>
   </data>
   <data name="TxtHost.Size" type="System.Drawing.Size, System.Drawing">
     <value>175, 23</value>
   </data>
   <data name="BtnQueryServerStatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>292, 36</value>
+    <value>317, 36</value>
   </data>
   <data name="BtnQueryServerStatus.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 23</value>
@@ -251,10 +251,15 @@
     <value>About</value>
   </data>
   <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 17</value>
+    <value>387, 102</value>
   </data>
   <data name="LblSupportDescription.Text" xml:space="preserve">
-    <value>Grasscutter Tools</value>
+    <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="TPManage.Text" xml:space="preserve">
     <value>Manage</value>
@@ -325,9 +330,15 @@
   <data name="CmbPerm.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 25</value>
   </data>
+  <data name="BtnPermClear.Text" xml:space="preserve">
+    <value>Clear</value>
+  </data>
   <data name="BtmPermRemove.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
+  <data name="BtnPermList.Text" xml:space="preserve">
+    <value>List</value>
+  </data>
   <data name="BtnPermAdd.Text" xml:space="preserve">
     <value>Add</value>
   </data>
@@ -358,21 +369,6 @@
   <data name="ChkIncludeSceneId.Text" xml:space="preserve">
     <value>Include scene Id</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <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 ~100 to indicate the relative current 100</value>
-  </data>
   <data name="LblTpZ.Location" type="System.Drawing.Point, System.Drawing">
     <value>219, 184</value>
   </data>
@@ -409,6 +405,7 @@ In the command, you can use ~ to indicate the current position, and ~100 to indi
   <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>
@@ -418,6 +415,20 @@ In the command, you can use ~ to indicate the current position, and ~100 to indi
   <data name="LblSceneDescription.Text" xml:space="preserve">
     <value>Scene control
 Tip: Most of the scenes have no effect and cannot be entered.</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="TPItem.Text" xml:space="preserve">
     <value>Items</value>
@@ -476,6 +487,9 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="TPWeapon.Text" xml:space="preserve">
     <value>Weapons</value>
   </data>
+  <data name="BtnGiveAllWeapons.Text" xml:space="preserve">
+    <value>Give all Weapons</value>
+  </data>
   <data name="LblWeaponDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>86, 17</value>
   </data>
@@ -518,27 +532,15 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="TPStats.Text" xml:space="preserve">
     <value>Stats</value>
   </data>
-  <data name="LblResetStatsCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>126, 135</value>
-  </data>
-  <data name="LblResetStatsCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 17</value>
-  </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>When getting CEP</value>
-  </data>
-  <data name="LblResetStatsTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>235, 135</value>
-  </data>
-  <data name="LblResetStatsTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>243, 17</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>the current character's stats will be reset</value>
-  </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>Stats</value>
   </data>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>Unlock</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>Lock</value>
+  </data>
   <data name="LblStatTip.Text" xml:space="preserve">
     <value>Tip</value>
   </data>
@@ -587,15 +589,6 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="BtnGiveAllChar.Text" xml:space="preserve">
     <value>Give All Char</value>
   </data>
-  <data name="LblConstellationTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>379, 165</value>
-  </data>
-  <data name="LblConstellationTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 17</value>
-  </data>
-  <data name="LblConstellationTip.Text" xml:space="preserve">
-    <value>※Available in Give All Char only</value>
-  </data>
   <data name="LblAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
     <value>44, 17</value>
   </data>
@@ -617,6 +610,18 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="TPSpawn.Text" xml:space="preserve">
     <value>Spawn</value>
   </data>
+  <data name="ChkInfiniteHP.Location" type="System.Drawing.Point, System.Drawing">
+    <value>202, 217</value>
+  </data>
+  <data name="ChkInfiniteHP.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 21</value>
+  </data>
+  <data name="ChkInfiniteHP.Text" xml:space="preserve">
+    <value>Infinite HP</value>
+  </data>
+  <data name="LblClearSpawnLogs.Location" type="System.Drawing.Point, System.Drawing">
+    <value>204, 25</value>
+  </data>
   <data name="LblClearSpawnLogs.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 17</value>
   </data>
@@ -722,7 +727,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Part</value>
   </data>
   <data name="LblArtifactSet.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 11</value>
+    <value>112, 11</value>
   </data>
   <data name="LblArtifactSet.Size" type="System.Drawing.Size, System.Drawing">
     <value>49, 17</value>
@@ -737,7 +742,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>X Clear</value>
   </data>
   <data name="LblArtifactLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>99, 41</value>
+    <value>124, 41</value>
   </data>
   <data name="LblArtifactLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>37, 17</value>
@@ -746,7 +751,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Level</value>
   </data>
   <data name="LblSubAttribution.Location" type="System.Drawing.Point, System.Drawing">
-    <value>80, 102</value>
+    <value>105, 102</value>
   </data>
   <data name="LblSubAttribution.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
@@ -755,7 +760,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Sub Stat</value>
   </data>
   <data name="LblMainAttribution.Location" type="System.Drawing.Point, System.Drawing">
-    <value>73, 71</value>
+    <value>98, 71</value>
   </data>
   <data name="LblMainAttribution.Size" type="System.Drawing.Size, System.Drawing">
     <value>63, 17</value>
@@ -773,7 +778,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Custom</value>
   </data>
   <data name="BtnExportCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
-    <value>533, 216</value>
+    <value>583, 216</value>
   </data>
   <data name="BtnExportCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
     <value>60, 23</value>
@@ -782,7 +787,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Export</value>
   </data>
   <data name="BtnLoadCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
-    <value>467, 216</value>
+    <value>517, 216</value>
   </data>
   <data name="BtnLoadCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
     <value>60, 23</value>
@@ -800,7 +805,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>List</value>
   </data>
   <data name="LnkResetCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
-    <value>531, -1</value>
+    <value>581, -1</value>
   </data>
   <data name="LnkResetCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 17</value>
@@ -809,7 +814,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>Restore</value>
   </data>
   <data name="BtnRemoveCustomCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>393, 216</value>
+    <value>443, 216</value>
   </data>
   <data name="BtnRemoveCustomCommand.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 23</value>
@@ -818,7 +823,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>x Delete</value>
   </data>
   <data name="BtnSaveCustomCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 216</value>
+    <value>367, 216</value>
   </data>
   <data name="BtnSaveCustomCommand.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 23</value>
@@ -827,7 +832,7 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
     <value>√ Save</value>
   </data>
   <data name="TxtCustomName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>267, 23</value>
+    <value>317, 23</value>
   </data>
   <data name="TPHome.Text" xml:space="preserve">
     <value>Home</value>

Source/GrasscutterTools/Forms/FormMain.ru-ru.resx

@@ -117,12 +117,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="TxtCommand.Location" type="System.Drawing.Point, System.Drawing">
+    <value>132, 22</value>
+  </data>
+  <data name="TxtCommand.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 23</value>
+  </data>
+  <data name="BtnCopy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>497, 22</value>
+  </data>
+  <data name="BtnCopy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 23</value>
+  </data>
   <data name="BtnCopy.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="ChkAutoCopy.Location" type="System.Drawing.Point, System.Drawing">
-    <value>548, 24</value>
+    <value>595, 24</value>
   </data>
   <data name="ChkAutoCopy.Size" type="System.Drawing.Size, System.Drawing">
     <value>55, 21</value>
@@ -133,11 +145,14 @@
   <data name="GrpCommand.Text" xml:space="preserve">
     <value>Команда (нажмите и удерживайте Ctrl для автоматического запуска)</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>
+    <value>Выполнить (F5)</value>
   </data>
   <data name="TPRemoteCall.Text" xml:space="preserve">
-    <value>Подключение к БД</value>
+    <value>Подключение к OpenCommand</value>
   </data>
   <data name="LnkInventoryKamera.Text" xml:space="preserve">
     <value>InventoryKamera</value>
@@ -146,7 +161,7 @@
     <value>Приходите и импортируйте свой официальный архив сервера в GC!</value>
   </data>
   <data name="ButtonOpenGOODImport.Text" xml:space="preserve">
-    <value>импорт GOOD</value>
+    <value>Импортировать GOOD</value>
   </data>
   <data name="LblHostTip.Location" type="System.Drawing.Point, System.Drawing">
     <value>83, 16</value>
@@ -164,13 +179,13 @@
     <value>13, 63</value>
   </data>
   <data name="LnkOpenCommandLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 17</value>
+    <value>100, 17</value>
   </data>
   <data name="LnkOpenCommandLabel.Text" xml:space="preserve">
-    <value>Открытая команда</value>
+    <value>OpenCommand</value>
   </data>
   <data name="LblOpenCommandSupport.Location" type="System.Drawing.Point, System.Drawing">
-    <value>142, 63</value>
+    <value>119, 63</value>
   </data>
   <data name="LblServerVersion.Location" type="System.Drawing.Point, System.Drawing">
     <value>119, 29</value>
@@ -188,19 +203,22 @@
     <value>Версия игры</value>
   </data>
   <data name="LblPlayerCountLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 46</value>
+    <value>7, 46</value>
   </data>
   <data name="LblPlayerCountLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 17</value>
+    <value>106, 17</value>
   </data>
   <data name="LblPlayerCountLabel.Text" xml:space="preserve">
-    <value>Кол. игроков</value>
+    <value>Кол-во игроков</value>
   </data>
   <data name="GrpRemoteCommand.Text" xml:space="preserve">
     <value>Удалить ячейку</value>
   </data>
   <data name="TPPlayerCheck.Text" xml:space="preserve">
-    <value>игрок</value>
+    <value>Игрок</value>
+  </data>
+  <data name="LnkRCHelp.Location" type="System.Drawing.Point, System.Drawing">
+    <value>176, 15</value>
   </data>
   <data name="LnkRCHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>60, 17</value>
@@ -208,8 +226,17 @@
   <data name="LnkRCHelp.Text" xml:space="preserve">
     <value>Помощь</value>
   </data>
+  <data name="NUDRemotePlayerId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>52, 13</value>
+  </data>
+  <data name="BtnConnectOpenCommand.Location" type="System.Drawing.Point, System.Drawing">
+    <value>93, 81</value>
+  </data>
+  <data name="BtnConnectOpenCommand.Size" type="System.Drawing.Size, System.Drawing">
+    <value>110, 23</value>
+  </data>
   <data name="BtnConnectOpenCommand.Text" xml:space="preserve">
-    <value>Подключить</value>
+    <value>Подключиться</value>
   </data>
   <data name="LblVerificationCode.Size" type="System.Drawing.Size, System.Drawing">
     <value>31, 17</value>
@@ -217,14 +244,26 @@
   <data name="LblVerificationCode.Text" xml:space="preserve">
     <value>Код</value>
   </data>
+  <data name="BtnSendVerificationCode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>176, 42</value>
+  </data>
+  <data name="BtnSendVerificationCode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>110, 23</value>
+  </data>
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>Отправить код</value>
   </data>
+  <data name="NUDVerificationCode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>52, 42</value>
+  </data>
+  <data name="LblRemotePlayerId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 15</value>
+  </data>
   <data name="TPConsoleCheck.Text" xml:space="preserve">
-    <value>консоль</value>
+    <value>Консоль</value>
   </data>
   <data name="BtnConsoleConnect.Text" xml:space="preserve">
-    <value>Подключить</value>
+    <value>Подключиться (консоль)</value>
   </data>
   <data name="LblConsoleTip.Font" type="System.Drawing.Font, System.Drawing">
     <value>Microsoft YaHei UI, 8pt, style=Italic</value>
@@ -237,16 +276,16 @@
   </data>
   <data name="LblConsoleTip.Text" xml:space="preserve">
     <value>Обратите внимание, что обычные команды в состоянии консоли должны указывать цель
-(набор содержит UID)</value>
+(установите галочку галочку "Включить UID")</value>
   </data>
   <data name="TxtHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>86, 36</value>
+    <value>111, 36</value>
   </data>
   <data name="TxtHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 23</value>
+    <value>204, 23</value>
   </data>
   <data name="BtnQueryServerStatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>292, 36</value>
+    <value>317, 36</value>
   </data>
   <data name="BtnQueryServerStatus.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 23</value>
@@ -264,28 +303,50 @@
     <value>Справка</value>
   </data>
   <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>355, 68</value>
+    <value>552, 170</value>
   </data>
   <data name="LblSupportDescription.Text" xml:space="preserve">
-    <value>Grasscutter Tools - основной перевод Юрий Дворецкий
-	
-	Спасибо:Dhar_Jinxed
-	</value>
+    <value>Grasscutter Tools - основной перевод Юрий Дворецкий (с исправлениями от EgorBron)
+
+Это бесплатный проект с открытым исходным кодом.
+Если вы считаете, что это полезно для вас,
+ вы можете дать мне звезду на Github.
+Если возникла проблема с генерацией команды или
+ есть запрос на новую функцию,
+ вы можете написать в Issues на Github.
+
+	Спасибо:  Dhar_Jinxed
+</value>
   </data>
   <data name="TPManage.Text" xml:space="preserve">
-    <value>Управлять</value>
+    <value>Аккаунты</value>
   </data>
   <data name="GrpBanPlayer.Text" xml:space="preserve">
-    <value>управление запретом</value>
+    <value>Управление банами</value>
+  </data>
+  <data name="BtnUnban.Location" type="System.Drawing.Point, System.Drawing">
+    <value>453, 22</value>
+  </data>
+  <data name="BtnUnban.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
   </data>
   <data name="BtnUnban.Text" xml:space="preserve">
-    <value>unban</value>
+    <value>Разбанить</value>
+  </data>
+  <data name="BtnBan.Location" type="System.Drawing.Point, System.Drawing">
+    <value>367, 22</value>
+  </data>
+  <data name="BtnBan.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
   </data>
   <data name="BtnBan.Text" xml:space="preserve">
-    <value>ban</value>
+    <value>Забанить</value>
+  </data>
+  <data name="TxtBanReason.Size" type="System.Drawing.Size, System.Drawing">
+    <value>111, 23</value>
   </data>
   <data name="TxtBanReason.Watermark" xml:space="preserve">
-    <value>причина</value>
+    <value>Причина</value>
   </data>
   <data name="NUDBanUID.Location" type="System.Drawing.Point, System.Drawing">
     <value>42, 22</value>
@@ -348,34 +409,55 @@
     <value>Управление правами</value>
   </data>
   <data name="CmbPerm.Location" type="System.Drawing.Point, System.Drawing">
-    <value>240, 21</value>
+    <value>212, 21</value>
   </data>
   <data name="CmbPerm.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 25</value>
+    <value>149, 25</value>
   </data>
   <data name="NUDPermUID.Location" type="System.Drawing.Point, System.Drawing">
     <value>42, 23</value>
   </data>
+  <data name="NUDPermUID.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 23</value>
+  </data>
+  <data name="BtnPermClear.Location" type="System.Drawing.Point, System.Drawing">
+    <value>454, 48</value>
+  </data>
+  <data name="BtnPermClear.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
+  </data>
+  <data name="BtnPermClear.Text" xml:space="preserve">
+    <value>Очистить</value>
+  </data>
   <data name="BtmPermRemove.Location" type="System.Drawing.Point, System.Drawing">
-    <value>463, 22</value>
+    <value>453, 21</value>
   </data>
   <data name="BtmPermRemove.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 23</value>
+    <value>80, 23</value>
   </data>
   <data name="BtmPermRemove.Text" xml:space="preserve">
     <value>Удалить</value>
   </data>
+  <data name="BtnPermList.Location" type="System.Drawing.Point, System.Drawing">
+    <value>353, 48</value>
+  </data>
+  <data name="BtnPermList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 23</value>
+  </data>
+  <data name="BtnPermList.Text" xml:space="preserve">
+    <value>Список прав</value>
+  </data>
   <data name="BtnPermAdd.Location" type="System.Drawing.Point, System.Drawing">
-    <value>387, 22</value>
+    <value>367, 21</value>
   </data>
   <data name="BtnPermAdd.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 23</value>
+    <value>80, 23</value>
   </data>
   <data name="BtnPermAdd.Text" xml:space="preserve">
     <value>Добавить</value>
   </data>
   <data name="LblPerm.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 25</value>
+    <value>160, 25</value>
   </data>
   <data name="LblPerm.Size" type="System.Drawing.Size, System.Drawing">
     <value>46, 17</value>
@@ -401,24 +483,6 @@
   <data name="ChkIncludeSceneId.Text" xml:space="preserve">
     <value>Включить идентификатор сцены</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <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, 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>Телепортация
-Совет: Вы можете быстро телепортироваться через отметку «рыболовный крючок» на миникарте в игре.
-В команде вы можете использовать ~, чтобы указать текущую позицию, и ~100, чтобы указать относительную текущую 100</value>
-  </data>
   <data name="LblTpZ.Location" type="System.Drawing.Point, System.Drawing">
     <value>219, 184</value>
   </data>
@@ -455,6 +519,7 @@
   <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>
@@ -462,8 +527,25 @@
     <value>287, 55</value>
   </data>
   <data name="LblSceneDescription.Text" xml:space="preserve">
-    <value>Управление сценой
-Совет: Большинство сцен не имеют эффекта и не могут быть введены.</value>
+    <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="TPItem.Text" xml:space="preserve">
     <value>Предметы</value>
@@ -474,14 +556,32 @@
   <data name="LblClearGiveItemLogs.Text" xml:space="preserve">
     <value>X Очистить</value>
   </data>
+  <data name="BtnSaveGiveItemLog.Location" type="System.Drawing.Point, System.Drawing">
+    <value>260, 48</value>
+  </data>
+  <data name="BtnSaveGiveItemLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
+  </data>
   <data name="BtnSaveGiveItemLog.Text" xml:space="preserve">
-    <value>√ Запись</value>
+    <value>√ Сохр.</value>
+  </data>
+  <data name="BtnRemoveGiveItemLog.Location" type="System.Drawing.Point, System.Drawing">
+    <value>260, 77</value>
+  </data>
+  <data name="BtnRemoveGiveItemLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
   </data>
   <data name="BtnRemoveGiveItemLog.Text" xml:space="preserve">
     <value>× Удалить</value>
   </data>
+  <data name="GrpGiveItemRecord.Size" type="System.Drawing.Size, System.Drawing">
+    <value>244, 162</value>
+  </data>
   <data name="GrpGiveItemRecord.Text" xml:space="preserve">
-    <value>Запись</value>
+    <value>Список предметов</value>
+  </data>
+  <data name="ListGiveItemLogs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>238, 140</value>
   </data>
   <data name="ChkDrop.Location" type="System.Drawing.Point, System.Drawing">
     <value>278, 217</value>
@@ -493,10 +593,10 @@
     <value>Дроп</value>
   </data>
   <data name="LblGameItemAmount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>34, 17</value>
+    <value>51, 17</value>
   </data>
   <data name="LblGameItemAmount.Text" xml:space="preserve">
-    <value>Кол.</value>
+    <value>Кол-во</value>
   </data>
   <data name="LblGameItemLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>143, 218</value>
@@ -508,10 +608,10 @@
     <value>Уровень</value>
   </data>
   <data name="NUDGameItemAmout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>46, 216</value>
+    <value>63, 216</value>
   </data>
   <data name="NUDGameItemAmout.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 23</value>
+    <value>73, 23</value>
   </data>
   <data name="NUDGameItemLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>209, 215</value>
@@ -525,29 +625,32 @@
   <data name="TPWeapon.Text" xml:space="preserve">
     <value>Оружие</value>
   </data>
+  <data name="BtnGiveAllWeapons.Text" xml:space="preserve">
+    <value>Дать всё оружие</value>
+  </data>
   <data name="LblWeaponDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>97, 17</value>
+    <value>89, 17</value>
   </data>
   <data name="LblWeaponDescription.Text" xml:space="preserve">
-    <value>Дайть Оружие</value>
+    <value>Дать Оружие</value>
   </data>
   <data name="LblWeaponRefinement.Location" type="System.Drawing.Point, System.Drawing">
-    <value>190, 218</value>
+    <value>207, 218</value>
   </data>
   <data name="LblWeaponRefinement.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 17</value>
   </data>
   <data name="LblWeaponRefinement.Text" xml:space="preserve">
-    <value>Улучшение</value>
+    <value>Ур. пробуждения</value>
   </data>
   <data name="LblWeaponAmount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>34, 17</value>
+    <value>51, 17</value>
   </data>
   <data name="LblWeaponAmount.Text" xml:space="preserve">
-    <value>Кол.</value>
+    <value>Кол-во</value>
   </data>
   <data name="LblWeaponLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>102, 218</value>
+    <value>119, 218</value>
   </data>
   <data name="LblWeaponLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>26, 17</value>
@@ -556,46 +659,37 @@
     <value>Ур.</value>
   </data>
   <data name="NUDWeaponRefinement.Location" type="System.Drawing.Point, System.Drawing">
-    <value>271, 216</value>
+    <value>323, 216</value>
   </data>
   <data name="NUDWeaponAmout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>46, 216</value>
+    <value>63, 216</value>
   </data>
   <data name="NUDWeaponLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>134, 216</value>
+    <value>151, 216</value>
   </data>
   <data name="TPStats.Text" xml:space="preserve">
     <value>Статы</value>
   </data>
-  <data name="LblResetStatsCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>88, 135</value>
-  </data>
-  <data name="LblResetStatsCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 17</value>
-  </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>При получении CEP</value>
-  </data>
-  <data name="LblResetStatsTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>214, 135</value>
-  </data>
-  <data name="LblResetStatsTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 17</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>атрибуты текущего персонажа будут сброшены</value>
-  </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>Статистика</value>
   </data>
+  <data name="BtnUnlockStat.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 23</value>
+  </data>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>Разморозить статы</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>Заморозить статы</value>
+  </data>
   <data name="LblStatTip.Text" xml:space="preserve">
-    <value>Совет</value>
+    <value>Подсказка</value>
   </data>
   <data name="GrpTalentLevel.Text" xml:space="preserve">
     <value>Уровень таланта</value>
   </data>
   <data name="LnkTalentE.Location" type="System.Drawing.Point, System.Drawing">
-    <value>299, 24</value>
+    <value>309, 24</value>
   </data>
   <data name="LnkTalentE.Size" type="System.Drawing.Size, System.Drawing">
     <value>15, 17</value>
@@ -604,7 +698,7 @@
     <value>E</value>
   </data>
   <data name="LnkTalentQ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>275, 24</value>
+    <value>285, 24</value>
   </data>
   <data name="LnkTalentQ.Size" type="System.Drawing.Size, System.Drawing">
     <value>18, 17</value>
@@ -616,10 +710,10 @@
     <value>178, 24</value>
   </data>
   <data name="LnkTalentNormalATK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 17</value>
+    <value>101, 17</value>
   </data>
   <data name="LnkTalentNormalATK.Text" xml:space="preserve">
-    <value>Обычная ATK</value>
+    <value>Обычная атака</value>
   </data>
   <data name="NUDTalentLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>128, 23</value>
@@ -634,25 +728,16 @@
     <value>Персонаж</value>
   </data>
   <data name="BtnGiveAllChar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>370, 196</value>
+    <value>425, 182</value>
   </data>
   <data name="BtnGiveAllChar.Size" type="System.Drawing.Size, System.Drawing">
     <value>200, 33</value>
   </data>
   <data name="BtnGiveAllChar.Text" xml:space="preserve">
-    <value> Дайте ВСЕХ персонажей</value>
-  </data>
-  <data name="LblConstellationTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 160</value>
-  </data>
-  <data name="LblConstellationTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 42</value>
-  </data>
-  <data name="LblConstellationTip.Text" xml:space="preserve">
-    <value>※Вступает в силу только при получении всех ролей.</value>
+    <value> Дать всех персонажей</value>
   </data>
   <data name="LblAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 139</value>
+    <value>428, 125</value>
   </data>
   <data name="LblAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 17</value>
@@ -661,13 +746,13 @@
     <value>Созвездия</value>
   </data>
   <data name="NUDAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 136</value>
+    <value>503, 122</value>
   </data>
   <data name="NUDAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 23</value>
   </data>
   <data name="LblAvatar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 45</value>
+    <value>428, 31</value>
   </data>
   <data name="LblAvatar.Size" type="System.Drawing.Size, System.Drawing">
     <value>71, 17</value>
@@ -676,7 +761,7 @@
     <value>Персонаж</value>
   </data>
   <data name="LblAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 92</value>
+    <value>428, 78</value>
   </data>
   <data name="LblAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>60, 17</value>
@@ -685,13 +770,13 @@
     <value>Уровень</value>
   </data>
   <data name="NUDAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 89</value>
+    <value>503, 75</value>
   </data>
   <data name="NUDAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 23</value>
   </data>
   <data name="CmbAvatar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 42</value>
+    <value>503, 28</value>
   </data>
   <data name="CmbAvatar.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 25</value>
@@ -699,8 +784,17 @@
   <data name="TPSpawn.Text" xml:space="preserve">
     <value>Спавн</value>
   </data>
+  <data name="ChkInfiniteHP.Location" type="System.Drawing.Point, System.Drawing">
+    <value>186, 217</value>
+  </data>
+  <data name="ChkInfiniteHP.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 21</value>
+  </data>
+  <data name="ChkInfiniteHP.Text" xml:space="preserve">
+    <value>Бесконечное HP</value>
+  </data>
   <data name="LblClearSpawnLogs.Location" type="System.Drawing.Point, System.Drawing">
-    <value>192, 218</value>
+    <value>168, 25</value>
   </data>
   <data name="LblClearSpawnLogs.Size" type="System.Drawing.Size, System.Drawing">
     <value>76, 17</value>
@@ -711,12 +805,18 @@
   <data name="BtnSaveSpawnLog.Location" type="System.Drawing.Point, System.Drawing">
     <value>266, 31</value>
   </data>
+  <data name="BtnSaveSpawnLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
+  </data>
   <data name="BtnSaveSpawnLog.Text" xml:space="preserve">
-    <value>√ Запись</value>
+    <value>√ Сохр.</value>
   </data>
   <data name="BtnRemoveSpawnLog.Location" type="System.Drawing.Point, System.Drawing">
     <value>266, 62</value>
   </data>
+  <data name="BtnRemoveSpawnLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 23</value>
+  </data>
   <data name="BtnRemoveSpawnLog.Text" xml:space="preserve">
     <value>× Удалить</value>
   </data>
@@ -724,7 +824,7 @@
     <value>240, 184</value>
   </data>
   <data name="GrpSpawnRecord.Text" xml:space="preserve">
-    <value>Запись</value>
+    <value>Список мобов</value>
   </data>
   <data name="ListSpawnLogs.Size" type="System.Drawing.Size, System.Drawing">
     <value>234, 162</value>
@@ -796,15 +896,15 @@
     <value>Скрытый</value>
   </data>
   <data name="BtnFinishQuest.Text" xml:space="preserve">
-    <value>Финиш</value>
+    <value>Завершить</value>
   </data>
   <data name="BtnAddQuest.Text" xml:space="preserve">
     <value>Добавить</value>
   </data>
   <data name="LblQuestDescription.Text" xml:space="preserve">
-    <value>Добавить или завершить задание
-Совет: Для многих квестов требуется поддержка сценариев на стороне сервера
-Поэтому квест можно добавлять и заканчивать, но не обязательно можно работать</value>
+    <value>Добавить или завершить задание.
+Внимание: для многих квестов требуются скрипты таковых на стороне сервера.
+Поэтому квест может быть добавлен или отозван через консоль, но завершён игроком - вряд ли.</value>
   </data>
   <data name="TPArtifact.Text" xml:space="preserve">
     <value>Артефакт</value>
@@ -816,7 +916,7 @@
     <value>+ Добавить</value>
   </data>
   <data name="LblArtifactPart.Location" type="System.Drawing.Point, System.Drawing">
-    <value>281, 11</value>
+    <value>306, 11</value>
   </data>
   <data name="LblArtifactPart.Size" type="System.Drawing.Size, System.Drawing">
     <value>42, 17</value>
@@ -825,13 +925,13 @@
     <value>Часть</value>
   </data>
   <data name="CmbArtifactPart.Location" type="System.Drawing.Point, System.Drawing">
-    <value>324, 8</value>
+    <value>349, 8</value>
   </data>
   <data name="CmbArtifactPart.Size" type="System.Drawing.Size, System.Drawing">
     <value>107, 25</value>
   </data>
   <data name="LblArtifactSet.Location" type="System.Drawing.Point, System.Drawing">
-    <value>72, 11</value>
+    <value>97, 11</value>
   </data>
   <data name="LblArtifactSet.Size" type="System.Drawing.Size, System.Drawing">
     <value>64, 17</value>
@@ -846,7 +946,7 @@
     <value>X Очистить</value>
   </data>
   <data name="LblArtifactLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>76, 41</value>
+    <value>101, 41</value>
   </data>
   <data name="LblArtifactLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>60, 17</value>
@@ -855,7 +955,7 @@
     <value>Уровень</value>
   </data>
   <data name="LblSubAttribution.Location" type="System.Drawing.Point, System.Drawing">
-    <value>71, 101</value>
+    <value>96, 101</value>
   </data>
   <data name="LblSubAttribution.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 17</value>
@@ -864,7 +964,7 @@
     <value>Всп. Стат.</value>
   </data>
   <data name="LblMainAttribution.Location" type="System.Drawing.Point, System.Drawing">
-    <value>54, 71</value>
+    <value>79, 71</value>
   </data>
   <data name="LblMainAttribution.Size" type="System.Drawing.Size, System.Drawing">
     <value>82, 17</value>
@@ -873,7 +973,7 @@
     <value>Основ. Стат.</value>
   </data>
   <data name="LblArtifactStars.Location" type="System.Drawing.Point, System.Drawing">
-    <value>313, 41</value>
+    <value>333, 41</value>
   </data>
   <data name="LblArtifactStars.Size" type="System.Drawing.Size, System.Drawing">
     <value>51, 17</value>
@@ -885,7 +985,7 @@
     <value>Кастомное</value>
   </data>
   <data name="BtnExportCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 216</value>
+    <value>536, 216</value>
   </data>
   <data name="BtnExportCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 23</value>
@@ -897,7 +997,7 @@
     <value>450, 216</value>
   </data>
   <data name="BtnLoadCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 23</value>
+    <value>80, 23</value>
   </data>
   <data name="BtnLoadCustomCommands.Text" xml:space="preserve">
     <value>Загрузить</value>
@@ -906,19 +1006,19 @@
     <value>46, 17</value>
   </data>
   <data name="LblCustomName.Text" xml:space="preserve">
-    <value>Метка</value>
+    <value>Имя</value>
   </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>Список</value>
   </data>
   <data name="LnkResetCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
-    <value>488, -1</value>
+    <value>535, -1</value>
   </data>
   <data name="LnkResetCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 17</value>
+    <value>97, 17</value>
   </data>
   <data name="LnkResetCustomCommands.Text" xml:space="preserve">
-    <value>перезагрузить</value>
+    <value>Сбросить</value>
   </data>
   <data name="BtnRemoveCustomCommand.Location" type="System.Drawing.Point, System.Drawing">
     <value>369, 216</value>
@@ -975,10 +1075,10 @@
     <value>Настройки</value>
   </data>
   <data name="ChkTopMost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>122, 21</value>
+    <value>140, 21</value>
   </data>
   <data name="ChkTopMost.Text" xml:space="preserve">
-    <value>самый верхний</value>
+    <value>Последняя версия</value>
   </data>
   <data name="ChkIncludeUID.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 21</value>
@@ -986,7 +1086,4 @@
   <data name="ChkIncludeUID.Text" xml:space="preserve">
     <value>Включить UID</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>GrasscutterTools - перевод Юрий Дворецкий</value>
-  </data>
 </root>

Source/GrasscutterTools/Forms/FormMain.zh-TW.resx

@@ -123,11 +123,14 @@
   <data name="ChkAutoCopy.Text" xml:space="preserve">
     <value>自動</value>
   </data>
+  <data name="GrpCommand.Text" xml:space="preserve">
+    <value>命令（按住 Ctrl 自動執行）</value>
+  </data>
   <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
     <value>執行(F5)</value>
   </data>
-  <data name="GrpCommand.Text" xml:space="preserve">
-    <value>命令（按住 Ctrl 自動執行）</value>
+  <data name="TPRemoteCall.Text" xml:space="preserve">
+    <value>遠程</value>
   </data>
   <data name="LnkInventoryKamera.Text" xml:space="preserve">
     <value>存檔掃描開源工具</value>
@@ -145,6 +148,9 @@
   <data name="LblHostTip.Text" xml:space="preserve">
     <value>請確保地址中包含 http:// 或 https://</value>
   </data>
+  <data name="GrpServerStatus.Text" xml:space="preserve">
+    <value>伺服器狀態</value>
+  </data>
   <data name="LnkOpenCommandLabel.Text" xml:space="preserve">
     <value>遠程執行插件</value>
   </data>
@@ -154,8 +160,11 @@
   <data name="LblPlayerCountLabel.Text" xml:space="preserve">
     <value>當前玩家數</value>
   </data>
-  <data name="GrpServerStatus.Text" xml:space="preserve">
-    <value>伺服器狀態</value>
+  <data name="GrpRemoteCommand.Text" xml:space="preserve">
+    <value>遠程執行</value>
+  </data>
+  <data name="TPPlayerCheck.Text" xml:space="preserve">
+    <value>玩家驗證</value>
   </data>
   <data name="LnkRCHelp.Text" xml:space="preserve">
     <value>幫助</value>
@@ -169,9 +178,6 @@
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>發送驗證碼</value>
   </data>
-  <data name="TPPlayerCheck.Text" xml:space="preserve">
-    <value>玩家驗證</value>
-  </data>
   <data name="BtnConsoleConnect.Text" xml:space="preserve">
     <value>連接</value>
   </data>
@@ -179,17 +185,14 @@
     <value>請注意，控制台狀態下普通命令必須指定目標
 （即設置包含UID）</value>
   </data>
-  <data name="GrpRemoteCommand.Text" xml:space="preserve">
-    <value>遠程執行</value>
-  </data>
   <data name="BtnQueryServerStatus.Text" xml:space="preserve">
     <value>查詢</value>
   </data>
   <data name="LblHost.Text" xml:space="preserve">
     <value>伺服器地址</value>
   </data>
-  <data name="TPRemoteCall.Text" xml:space="preserve">
-    <value>遠程</value>
+  <data name="TPAbout.Text" xml:space="preserve">
+    <value>關於</value>
   </data>
   <data name="LblSupportDescription.Text" xml:space="preserve">
     <value>割草機工具箱
@@ -199,15 +202,15 @@
 如果願意請我喝一杯奶茶，那就更好了 : )
 指令生成有問題，或者有新的功能請求，都可以來Github提出</value>
   </data>
-  <data name="TPAbout.Text" xml:space="preserve">
-    <value>關於</value>
-  </data>
   <data name="BtnBan.Text" xml:space="preserve">
     <value>封號</value>
   </data>
   <data name="LblBanUID.Text" xml:space="preserve">
     <value>目標UID</value>
   </data>
+  <data name="GrpAccount.Text" xml:space="preserve">
+    <value>賬號管理</value>
+  </data>
   <data name="BtnDeleteAccount.Text" xml:space="preserve">
     <value>- 刪除</value>
   </data>
@@ -217,8 +220,8 @@
   <data name="LblAccountUserName.Text" xml:space="preserve">
     <value>用戶名</value>
   </data>
-  <data name="GrpAccount.Text" xml:space="preserve">
-    <value>賬號管理</value>
+  <data name="GrpPermission.Text" xml:space="preserve">
+    <value>權限管理</value>
   </data>
   <data name="LblPerm.Text" xml:space="preserve">
     <value>權限</value>
@@ -226,17 +229,12 @@
   <data name="LblPermUID.Text" xml:space="preserve">
     <value>目標UID</value>
   </data>
-  <data name="GrpPermission.Text" xml:space="preserve">
-    <value>權限管理</value>
+  <data name="TPScene.Text" xml:space="preserve">
+    <value>場景</value>
   </data>
   <data name="ChkIncludeSceneId.Text" xml:space="preserve">
     <value>含場景ID</value>
   </data>
-  <data name="LblTp.Text" xml:space="preserve">
-    <value>座標傳送
-提示：遊戲內可以通過小地圖的'魚鉤'標記來快捷傳送
-命令中可以用~表示當前位置，~100表示相對當前100</value>
-  </data>
   <data name="BtnTeleport.Text" xml:space="preserve">
     <value>傳送</value>
   </data>
@@ -248,8 +246,10 @@
 
 提示：大部分場景沒有作用，無法進入。</value>
   </data>
-  <data name="TPScene.Text" xml:space="preserve">
-    <value>場景</value>
+  <data name="LblTp.Text" xml:space="preserve">
+    <value>座標傳送
+提示：遊戲內可以通過小地圖的'魚鉤'標記來快捷傳送
+命令中可以用~表示當前位置，~N 表示相對當前N</value>
   </data>
   <data name="BtnSaveGiveItemLog.Text" xml:space="preserve">
     <value>√ 記錄</value>
@@ -270,6 +270,9 @@
     <value>給玩家指定物品
 說明：可選擇直接給到背包或者掉落到世界</value>
   </data>
+  <data name="BtnGiveAllWeapons.Text" xml:space="preserve">
+    <value>獲得所有武器</value>
+  </data>
   <data name="LblWeaponDescription.Text" xml:space="preserve">
     <value>獲取武器
 
@@ -290,33 +293,36 @@
   <data name="LblWeaponLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>獲得角色經驗時</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>當前角色屬性將會重置</value>
+  <data name="TPStats.Text" xml:space="preserve">
+    <value>數據</value>
   </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>角色屬性</value>
   </data>
-  <data name="LnkTalentNormalATK.Text" xml:space="preserve">
-    <value>普通攻擊</value>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>解鎖</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>鎖定</value>
   </data>
   <data name="GrpTalentLevel.Text" xml:space="preserve">
     <value>技能等級</value>
   </data>
+  <data name="LnkTalentNormalATK.Text" xml:space="preserve">
+    <value>普通攻擊</value>
+  </data>
   <data name="LblStatsDescription.Text" xml:space="preserve">
     <value>設置當前活躍角色數據</value>
   </data>
-  <data name="TPStats.Text" xml:space="preserve">
-    <value>數據</value>
-  </data>
   <data name="BtnGiveAllChar.Text" xml:space="preserve">
     <value>一鍵獲得所有角色</value>
   </data>
   <data name="LblAvatarLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
+  <data name="ChkInfiniteHP.Text" xml:space="preserve">
+    <value>無限血</value>
+  </data>
   <data name="BtnSaveSpawnLog.Text" xml:space="preserve">
     <value>√ 記錄</value>
   </data>
@@ -326,15 +332,21 @@
   <data name="GrpSpawnRecord.Text" xml:space="preserve">
     <value>生成記錄本</value>
   </data>
+  <data name="GrpEntityType.Text" xml:space="preserve">
+    <value>列表分類</value>
+  </data>
+  <data name="RbEntityAnimal.Size" type="System.Drawing.Size, System.Drawing">
+    <value>62, 21</value>
+  </data>
   <data name="RbEntityAnimal.Text" xml:space="preserve">
     <value>生物誌</value>
   </data>
+  <data name="RbEntityMonster.Size" type="System.Drawing.Size, System.Drawing">
+    <value>74, 21</value>
+  </data>
   <data name="RbEntityMonster.Text" xml:space="preserve">
     <value>討伐對象</value>
   </data>
-  <data name="GrpEntityType.Text" xml:space="preserve">
-    <value>列表分類</value>
-  </data>
   <data name="LblSpawnDescription.Text" xml:space="preserve">
     <value>在玩家附近召喚生物</value>
   </data>
@@ -344,6 +356,12 @@
   <data name="LblEntityLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
+  <data name="TPQuest.Text" xml:space="preserve">
+    <value>任務</value>
+  </data>
+  <data name="GrpQuestFilters.Text" xml:space="preserve">
+    <value>列表過濾</value>
+  </data>
   <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
     <value>測試任務</value>
   </data>
@@ -353,9 +371,6 @@
   <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>
@@ -367,8 +382,8 @@
 提示：許多任務需要服務端腳本支持
 囙此任務可以接，可以完成，但是不一定可以做</value>
   </data>
-  <data name="TPQuest.Text" xml:space="preserve">
-    <value>任務</value>
+  <data name="TPArtifact.Text" xml:space="preserve">
+    <value>聖遺物</value>
   </data>
   <data name="LblArtifactSet.Text" xml:space="preserve">
     <value>套裝</value>
@@ -385,8 +400,8 @@
   <data name="LblArtifactStars.Text" xml:space="preserve">
     <value>星級</value>
   </data>
-  <data name="TPArtifact.Text" xml:space="preserve">
-    <value>聖遺物</value>
+  <data name="TPCustom.Text" xml:space="preserve">
+    <value>自定義</value>
   </data>
   <data name="BtnExportCustomCommands.Text" xml:space="preserve">
     <value>導出</value>
@@ -400,8 +415,8 @@
   <data name="BtnRemoveCustomCommand.Text" xml:space="preserve">
     <value>× 刪除</value>
   </data>
-  <data name="TPCustom.Text" xml:space="preserve">
-    <value>自定義</value>
+  <data name="TPHome.Text" xml:space="preserve">
+    <value>主頁</value>
   </data>
   <data name="BtnOpenTextMap.Text" xml:space="preserve">
     <value>文本瀏覽器</value>
@@ -412,7 +427,8 @@
   <data name="ChkTopMost.Text" xml:space="preserve">
     <value>置頂</value>
   </data>
-  <data name="TPHome.Text" xml:space="preserve">
-    <value>主頁</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
 </root>

Source/GrasscutterTools/Forms/FormTextMapBrowser.cs

@@ -18,7 +18,6 @@
  **/
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;

Source/GrasscutterTools/Game/CommandVersion.cs

@@ -0,0 +1,126 @@
+/**
+ *  Grasscutter Tools
+ *  Copyright (C) 2022 jie65535
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 
+ **/
+using System;
+
+namespace GrasscutterTools.Game
+{
+    /// <summary>
+    /// 命令版本
+    /// 
+    /// 用法：
+    /// ver = Version.TryParse(input, out Version current) ? new CommandVersion(current) : CommandVersion.Latest();
+    /// 
+    /// </summary>
+    internal class CommandVersion
+    {
+        /// <summary>
+        /// 初始化当前版本
+        /// </summary>
+        /// <param name="current"></param>
+        public CommandVersion(Version current)
+        {
+            this.current = current ?? throw new ArgumentNullException(nameof(current));
+        }
+
+        private Version current;
+
+        /// <summary>
+        /// 当前命令版本
+        /// </summary>
+        public Version Current
+        {
+            get => current;
+            set
+            {
+                if (current != value)
+                {
+                    current = value;
+                    OnVersionChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 选中版本改变事件
+        /// </summary>
+        public event EventHandler VersionChanged;
+
+        /// <summary>
+        /// 触发版本更改事件
+        /// </summary>
+        private void OnVersionChanged() => VersionChanged?.Invoke(this, EventArgs.Empty);
+
+        /// <summary>
+        /// 当前支持的最新版本 - 当未选择版本时，默认为最新版本
+        /// </summary>
+        public static CommandVersion Latest() => new CommandVersion(List[List.Length - 1]);
+
+
+        #region - 版本列表 Version List -
+
+        // 忽略更早以前的版本
+        /// <summary>
+        /// v1.2.1  2022/6/18
+        /// git 30c7bb94439a123417a6a1e0116acd3c40f2d115
+        /// </summary>
+        public static readonly Version V1_2_1 = new Version(1, 2, 1);
+
+        /// <summary>
+        /// v1.2.1 -> v1.2.2  2022/6/22
+        /// git aa43943025fefcda9739c9fcf242e67f1a7b83b4
+        /// </summary>
+        public static readonly Version V1_2_2 = new Version(1, 2, 2);
+
+        /// <summary>
+        /// v1.2.2 -> v1.2.3  2022/7/21
+        /// git a07b3f21e6fbeb9abfad8862d6fa0dc4a1c3c1a3
+        /// </summary>
+        public static readonly Version V1_2_3 = new Version(1, 2, 3);
+
+        /// <summary>
+        /// v1.2.3 -> v1.3.0  2022/9/3 - stable
+        /// git 155501058fcce109489a19db37d0513d2235e08e
+        /// </summary>
+        public static readonly Version V1_3_0 = new Version(1, 3, 0);
+
+        /// <summary>
+        /// v1.3.0 -> v1.3.1  2022/9/3
+        /// git 6cf83b30eeaa98a68de2d786d7ca85ae21a95e32
+        /// </summary>
+        public static readonly Version V1_3_1 = new Version(1, 3, 1);
+
+        // More...
+        /// <summary>
+        /// v1.2.3 -> v1.2.4  2022/7/21
+        /// git hash
+        /// </summary>
+        //public static readonly Version V1_2_4 = new Version(1, 2, 4);
+
+        public static Version[] List { get; } = new Version[] {
+            V1_2_1,
+            V1_2_2,
+            V1_2_3,
+            V1_3_0,
+            V1_3_1,
+            //V1_3_2,
+        };
+
+        #endregion - 版本列表 Version List -
+    }
+}

Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs

@@ -16,8 +16,6 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  * 
  **/
-using System.ComponentModel;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

Source/GrasscutterTools/Game/GameData.cs

@@ -33,7 +33,7 @@ namespace GrasscutterTools.Game
             AvatarColors = new ItemMap(Resources.AvatarColor);
             Items = new ItemMap(Resources.Item);
             Monsters = new ItemMap(Resources.Monster);
-            NPCs = new ItemMap(Resources.NPC);
+            //NPCs = new ItemMap(Resources.NPC);
             Scenes = new ItemMap(Resources.Scene);
             Weapons = new ItemMap(Resources.Weapon);
             WeaponColors = new ItemMap(Resources.WeaponColor);
@@ -59,7 +59,7 @@ namespace GrasscutterTools.Game
 
         public static ItemMap Monsters { get; private set; }
 
-        public static ItemMap NPCs { get; private set; }
+        //public static ItemMap NPCs { get; private set; }
 
         public static ItemMap Scenes { get; private set; }
 

Source/GrasscutterTools/Game/ItemMap.cs

@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  * 
  **/
+using System;
 using System.Collections.Generic;
 
 namespace GrasscutterTools.Game
@@ -24,7 +25,7 @@ namespace GrasscutterTools.Game
     {
         public ItemMap(string idNamePairs)
         {
-            var lines = idNamePairs.Split('\n');
+            var lines = idNamePairs.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
             var capacity = lines.Length;
             //IdMap = new Dictionary<int, string>(capacity);
             //NameMap = new Dictionary<string, int>(capacity);

Source/GrasscutterTools/GrasscutterTools.csproj

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props" Condition="Exists('..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props')" />
-  <Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -17,6 +15,21 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -40,160 +53,36 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\IconGrasscutter.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup />
   <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+    <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>false</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>GrasscutterTools.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Resources\Newtonsoft.Json.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\TextBoxXP.cs">
@@ -225,6 +114,7 @@
     <Compile Include="Forms\FormTextMapBrowser.Designer.cs">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
     </Compile>
+    <Compile Include="Game\CommandVersion.cs" />
     <Compile Include="Game\Gacha\GachaBanner2.cs" />
     <Compile Include="Game\GameCommand.cs" />
     <Compile Include="Game\Gacha\BannerType.cs" />
@@ -233,7 +123,6 @@
     <Compile Include="Game\ItemMap.cs" />
     <Compile Include="Game\SetStatsCommand.cs" />
     <Compile Include="Game\TextMapData.cs" />
-    <Compile Include="Github\ReleaseAPI.cs" />
     <Compile Include="GOOD\GOOD.cs" />
     <Compile Include="GOOD\Artifact.cs" />
     <Compile Include="GOOD\Character.cs" />
@@ -250,6 +139,7 @@
     </Compile>
     <Compile Include="Utils\ArtifactUtils.cs" />
     <Compile Include="Utils\HttpHelper.cs" />
+    <Compile Include="Utils\ReleaseAPI.cs" />
     <EmbeddedResource Include="Forms\FormGachaBannerEditor2.en-us.resx">
       <DependentUpon>FormGachaBannerEditor2.cs</DependentUpon>
     </EmbeddedResource>
@@ -287,6 +177,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormMain.zh-TW.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormTextMapBrowser.en-US.resx">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
@@ -335,8 +226,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
-    <None Include="Properties\app.manifest" />
+    <None Include="GrasscutterTools.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -365,10 +255,10 @@
     <Content Include="Resources\en-us\GachaBennerPrefab.txt" />
     <Content Include="Resources\en-us\Item.txt" />
     <Content Include="Resources\en-us\Monster.txt" />
-    <Content Include="Resources\en-us\NPC.txt" />
     <Content Include="Resources\en-us\Quest.txt" />
     <Content Include="Resources\en-us\Scene.txt" />
     <Content Include="Resources\en-us\Weapon.txt" />
+    <None Include="Resources\Newtonsoft.Json.dll" />
     <Content Include="Resources\ru-ru\Animal.txt" />
     <Content Include="Resources\ru-ru\Artifact.txt" />
     <Content Include="Resources\ru-ru\ArtifactCat.txt" />
@@ -379,7 +269,6 @@
     <Content Include="Resources\ru-ru\GachaBennerPrefab.txt" />
     <Content Include="Resources\ru-ru\Item.txt" />
     <Content Include="Resources\ru-ru\Monster.txt" />
-    <Content Include="Resources\ru-ru\NPC.txt" />
     <Content Include="Resources\ru-ru\Quest.txt" />
     <Content Include="Resources\ru-ru\Scene.txt" />
     <Content Include="Resources\ru-ru\Weapon.txt" />
@@ -400,7 +289,6 @@
     <Content Include="Resources\zh-cn\GachaBennerPrefab.txt" />
     <Content Include="Resources\zh-cn\Item.txt" />
     <Content Include="Resources\zh-cn\Monster.txt" />
-    <Content Include="Resources\zh-cn\NPC.txt" />
     <Content Include="Resources\zh-cn\Quest.txt" />
     <Content Include="Resources\zh-cn\Scene.txt" />
     <Content Include="Resources\zh-cn\Weapon.txt" />
@@ -414,7 +302,6 @@
     <Content Include="Resources\zh-tw\GachaBennerPrefab.txt" />
     <Content Include="Resources\zh-tw\Item.txt" />
     <Content Include="Resources\zh-tw\Monster.txt" />
-    <Content Include="Resources\zh-tw\NPC.txt" />
     <Content Include="Resources\zh-tw\Quest.txt" />
     <Content Include="Resources\zh-tw\Scene.txt" />
     <Content Include="Resources\zh-tw\Weapon.txt" />
@@ -431,18 +318,10 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Resource.Embedder">
+      <Version>2.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.6.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props'))" />
-    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-  </Target>
-  <Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
-  <Import Project="..\packages\Fody.6.6.1\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.1\build\Fody.targets')" />
-  <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>

Source/GrasscutterTools/MultiLanguage.cs

@@ -23,14 +23,20 @@ namespace GrasscutterTools
 {
     internal static class MultiLanguage
     {
-        public static string DefaultLanguage = "zh-CN";
+        /// <summary>
+        /// 语言名称列表
+        /// </summary>
+        public static readonly string[] LanguageNames = new string[] { "简体中文", "繁體中文", "English", "Русский" };
+
+        /// <summary>
+        /// 语言代码列表
+        /// </summary>
+        public static readonly string[] Languages = new string[] { "zh-CN", "zh-TW", "en-US", "ru-RU" };
 
         public static void SetDefaultLanguage(string lang)
         {
             System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang);
-            DefaultLanguage = lang;
             Properties.Settings.Default.DefaultLanguage = lang;
-            Properties.Settings.Default.Save();
         }
 
         /// <summary>

Source/GrasscutterTools/Program.cs

@@ -17,6 +17,8 @@
  * 
  **/
 using System;
+using System.Globalization;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
@@ -27,6 +29,33 @@ namespace GrasscutterTools
 {
     internal static class Program
     {
+        static Program()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssembly;
+        }
+
+        private static Assembly OnResolveAssembly(object sender, ResolveEventArgs args)
+        {
+            //var executingAssembly = Assembly.GetExecutingAssembly();
+            //var assemblyName = new AssemblyName(args.Name);
+
+            //var path = assemblyName.Name + ".dll";
+            //if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
+            //    path = $@"{assemblyName.CultureInfo}\{path}";
+            //using (var stream = executingAssembly.GetManifestResourceStream(path))
+            //{
+            //    if (stream == null) return null;
+            //    var assemblyRawBytes = new byte[stream.Length];
+            //    stream.Read(assemblyRawBytes, 0, assemblyRawBytes.Length);
+            //    return Assembly.Load(assemblyRawBytes);
+            //}
+
+            // 手工加载嵌入的dll文件
+            if (new AssemblyName(args.Name).Name == "Newtonsoft.Json")
+                return Assembly.Load(Resources.Newtonsoft_Json);
+            return null;
+        }
+
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>
@@ -43,6 +72,10 @@ namespace GrasscutterTools
             //处理非UI线程异常
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
+            // 初始化语言环境
+            if (!string.IsNullOrEmpty(Settings.Default.DefaultLanguage))
+                MultiLanguage.SetDefaultLanguage(Settings.Default.DefaultLanguage);
+
             Application.Run(new Forms.FormMain());
         }
 

Source/GrasscutterTools/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("GrasscutterTools")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Grasscutter Command Generator")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GrasscutterTools")]
@@ -19,7 +19,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("b26333ff-5560-4cba-af3c-4b80db6f8025")]
+//[assembly: Guid("b26333ff-5560-4cba-af3c-4b80db6f8025")]
 
 // 程序集的版本信息由下列四个值组成:
 //
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.6.8")]
+[assembly: AssemblyFileVersion("1.6.8")]

Source/GrasscutterTools/Properties/Resources.en-us.resx

@@ -166,6 +166,9 @@
   <data name="CommandContentCannotBeEmpty" xml:space="preserve">
     <value>Command cannot be empty</value>
   </data>
+  <data name="WaypointNameCannotBeEmpty" xml:space="preserve">
+    <value>Waypoint name cannot be empty</value>
+  </data>
   <data name="CommandNotFound" xml:space="preserve">
     <value>Command not found</value>
   </data>
@@ -204,11 +207,8 @@ Update info :
 -------------------------------------------
 Do you want to check for updates? Selecting No will no longer remind you of this version.</value>
   </data>
-  <data name="NPC" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\en-us\NPC.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="OpenCommandHelp" xml:space="preserve">
-    <value>1. Fill in the correct uid\n2. Send verification code to player\n3. Enter the correct verification code\n4. Connection\n5. Enjoy</value>
+    <value>1. Fill in the correct UID\n2. Send verification code to player\n3. Enter the correct verification code\n4. Connection\n5. Enjoy</value>
   </data>
   <data name="PermissionCannotBeEmpty" xml:space="preserve">
     <value>Permission cannot be empty!</value>
@@ -223,7 +223,7 @@ Do you want to check for updates? Selecting No will no longer remind you of this
     <value>..\Resources\en-us\Quest.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="RequireOpenCommandTip" xml:space="preserve">
-    <value>Please connect to a server that supports [opencommand] first</value>
+    <value>Please connect to a server that supports [OpenCommand] first</value>
   </data>
   <data name="RestoreCustomCommands" xml:space="preserve">
     <value>Are you sure you want to restore custom commands to defaults?</value>

Source/GrasscutterTools/Properties/Resources.resx

@@ -216,9 +216,6 @@
 --------------------------------------------
 是否查看更新？选择否将不再提醒该版本。</value>
   </data>
-  <data name="NPC" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-cn\NPC.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="OpenCommandHelp" xml:space="preserve">
     <value>1. 填写正确的UID\n2. 向玩家发送验证码\n3. 输入正确的验证码\n4. 连接\n5. 享受</value>
   </data>
@@ -273,4 +270,7 @@
   <data name="GOODImportSuccess" xml:space="preserve">
     <value>导入成功!</value>
   </data>
+  <data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

Source/GrasscutterTools/Properties/Resources.ru-ru.resx

@@ -137,7 +137,7 @@
     <value>..\Resources\ru-ru\ArtifactSubAttribution.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="AskConfirmDeletion" xml:space="preserve">
-    <value>Are you sure you want to delete this command?</value>
+    <value>Вы точно хотите удалить эту команду?</value>
   </data>
   <data name="Avatar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ru-ru\Avatar.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
@@ -149,7 +149,7 @@
     <value>..\Resources\ru-ru\AvatarStats.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="BrowserOpenFailedTip" xml:space="preserve">
-    <value>Браузерe не удалось открыть. Вы можете вручную получить доступ к следующему адресу:</value>
+    <value>Не удалось открыть в браузере. Вы можете вручную получить доступ к следующему адресу:</value>
   </data>
   <data name="CheckToNewVersion" xml:space="preserve">
     <value>Переход на новую версию</value>
@@ -161,7 +161,7 @@
     <value>Повторная отправка через {0} секунд</value>
   </data>
   <data name="CodeSending" xml:space="preserve">
-    <value>отправка...</value>
+    <value>Отправка...</value>
   </data>
   <data name="CommandContentCannotBeEmpty" xml:space="preserve">
     <value>Команда не может быть пустой</value>
@@ -170,7 +170,7 @@
     <value>Команда не найдена</value>
   </data>
   <data name="CommandTagCannotBeEmpty" xml:space="preserve">
-    <value>Командный тег не может быть пустым</value>
+    <value>Тег команды не может быть пустым</value>
   </data>
   <data name="ConnectedTip" xml:space="preserve">
     <value>Теперь вы можете выполнять команды удаленно!</value>
@@ -185,7 +185,7 @@
     <value>..\Resources\ru-ru\GachaBennerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Help" xml:space="preserve">
-    <value>Help</value>
+    <value>Помощь</value>
   </data>
   <data name="IconGrasscutter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\IconGrasscutter.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -202,13 +202,10 @@
 Информация об обновлении : 
 {2}
 -------------------------------------------
-Вы хотите проверить наличие обновлений? Выбор Нет больше не будет напоминать вам об этой версии.</value>
-  </data>
-  <data name="NPC" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ru-ru\NPC.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+Вы хотите проверить наличие обновлений? Выбирая "Нет", программа больше не будет напоминать вам об этой версии.</value>
   </data>
   <data name="OpenCommandHelp" xml:space="preserve">
-    <value>1. Заполните правильный uid\n2. Отправьте проверочный код игроку\n3. Введите правильный проверочный код\n4. Соединение\n5. Наслаждаться</value>
+    <value>1. Введите правильный UID\n2. Отправьте проверочный код игроку\n3. Введите правильный проверочный код\n4. Покдлючитесь\n5. Наслаждайтесь!</value>
   </data>
   <data name="PermissionCannotBeEmpty" xml:space="preserve">
     <value>Разрешение не может быть пустым!</value>
@@ -223,9 +220,9 @@
     <value>..\Resources\ru-ru\Quest.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="RequireOpenCommandTip" xml:space="preserve">
-    <value>Пожалуйста, сначала подключитесь к серверу, который поддерживает [команду открытия]</value>
+    <value>Пожалуйста, сначала подключитесь к серверу, который поддерживает [OpenCommand]</value>
   </data>
-  <data name="RestoreCustomCommands" xml:space="preserve">
+	<data name="RestoreCustomCommands" xml:space="preserve">
     <value>Вы уверены, что хотите восстановить пользовательские команды по умолчанию?</value>
   </data>
   <data name="Scene" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -238,7 +235,7 @@
     <value>Не удалось сохранить настройки:</value>
   </data>
   <data name="Tips" xml:space="preserve">
-    <value>Совет</value>
+    <value>Внимание</value>
   </data>
   <data name="TokenCannotBeEmpty" xml:space="preserve">
     <value>Токен не может быть пустым</value>

Source/GrasscutterTools/Properties/Resources.zh-TW.resx

@@ -201,9 +201,6 @@
 --------------------------------------------
 是否查看更新？選擇否將不再提醒該版本。</value>
   </data>
-  <data name="NPC" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-tw\NPC.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="OpenCommandHelp" xml:space="preserve">
     <value>1. 填寫正確的UID\n2. 向玩家發送驗證碼\n3. 輸入正確的驗證碼\n4. 連接\n5. 享受</value>
   </data>

Source/GrasscutterTools/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace GrasscutterTools.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -49,7 +49,7 @@ namespace GrasscutterTools.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("zh-CN")]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
         public string DefaultLanguage {
             get {
                 return ((string)(this["DefaultLanguage"]));
@@ -133,7 +133,7 @@ namespace GrasscutterTools.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.2.2")]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
         public string CommandVersion {
             get {
                 return ((string)(this["CommandVersion"]));

Source/GrasscutterTools/Properties/Settings.settings

@@ -9,7 +9,7 @@
       <Value Profile="(Default)">10001</Value>
     </Setting>
     <Setting Name="DefaultLanguage" Type="System.String" Scope="User">
-      <Value Profile="(Default)">zh-CN</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="ResourcesDirPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -30,7 +30,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="CommandVersion" Type="System.String" Scope="User">
-      <Value Profile="(Default)">1.2.2</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="IsTopMost" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>

Source/GrasscutterTools/Properties/app.manifest

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC 清单选项
-             如果想要更改 Windows 用户帐户控制级别，请使用
-             以下节点之一替换 requestedExecutionLevel 节点。
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
-            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
-            元素。
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-      <applicationRequestMinimum>
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
-      </applicationRequestMinimum>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
-           Windows 版本的列表。取消评论适当的元素，
-           Windows 将自动选择最兼容的环境。 -->
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
-       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
-       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
-       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
-       
-       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
-    </windowsSettings>
-  </application>
-  -->
-  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-</assembly>

Source/GrasscutterTools/Resources/en-us/ArtifactCat.txt

@@ -1,4 +1,4 @@
-20:Deepwood Memories
+20:Deepwood Memories
 21:Gilded Dreams
 51:Resolution of Sojourner
 52:Brave Heart

Source/GrasscutterTools/Resources/en-us/Avatar.txt

@@ -52,4 +52,9 @@
 1066:Kamisato Ayato
 1067:Collei
 1068:Dori
-1069:Tighnari
+1069:Tighnari
+1070:Nilou
+1071:Cyno
+1072:Candace
+1073:Nahida
+1074:Layla

Source/GrasscutterTools/Resources/en-us/CustomCommands.txt

@@ -8,6 +8,8 @@ Level up to 60
 /give 102 x1880200
 Set World Level
 /prop wl 8
+Unlock Map
+/prop unlockmap 1
 Unlock The Tower
 /prop ut 12
 Set BattlePass Level

Source/GrasscutterTools/Resources/en-us/Item.txt

@@ -41,6 +41,9 @@
 143:Creative Note
 144:Whimsical Draft
 145:Ancient Iron Coin
+151:Mushroom Currency
+152:Fungus Medal
+153:Shattered Phenocryst
 201:Primogem
 202:Mora
 203:Genesis Crystal
@@ -2206,6 +2209,11 @@
 108445:Suspicious Milky Mushroom Crisp Tower
 108446:Milky Mushroom Crisp Tower
 108447:Delicious Milky Mushroom Crisp Tower
+108470:Suspicious Rose Custard
+108471:Rose Custard
+108472:Delicious Rose Custard
+108473:Extravagant Slumber
+108474:Halvamazd
 109000:Recipe Item
 109101:Recipe: Chicken-Mushroom Skewer
 109102:Recipe: Fisherman's Toast
@@ -2334,6 +2342,7 @@
 109508:Recipe: Meat Lovers' Mushroom Pizza
 109509:Recipe: Sunset Berry Tea
 109510:Recipe: Milky Mushroom Crisp Tower
+109517:Recipe: Rose Custard
 110000:Crafted Items
 110001:Flour
 110002:Cream
@@ -2478,6 +2487,10 @@
 113035:Runic Fang
 113036:Majestic Hooked Beak
 113037:Thunderclap Fruitcore
+113040:Quelled Creeper
+113041:???
+113042:???
+113043:???
 114001:Tile of Decarabian's Tower
 114002:Debris of Decarabian's City
 114003:Fragment of Decarabian's Epic
@@ -2633,6 +2646,17 @@
 120041:Dissection Records
 120042:Ragged Attendance Record
 120059:An Elegantly-Written Note
+120127:???
+120152:???
+120153:???
+120154:???
+120155:???
+120156:???
+120157:???
+120158:???
+120159:???
+120160:???
+120161:???
 130001:Silk Flower Seed
 130002:Sweet Flower Seed
 130003:Cecilia Seed
@@ -2862,6 +2886,8 @@
 200903:Narukawa Ukai
 200904:Moonstringer
 200905:Serendipity
+207300:For All Knowledge, a Verse
+207400:Dreaming Star
 210001:Genshin Impact: A New World
 210002:Travel Notes: Catch the Wind
 210003:Amber: Bunny
@@ -2990,6 +3016,9 @@
 210130:Sumeru: Shimmering Woods
 210131:Sumeru: Observance
 210132:Sumeru: Unsullied
+210140:Nahida·???
+210141:Layla·???
+210142:Travel Notes: Fungus Land
 220001:Anemoculus Resonance Stone
 220002:Geoculus Resonance Stone
 220003:Geo Treasure Compass
@@ -3053,6 +3082,8 @@
 220066:Vintage Lyre
 220070:"Bubbly Kamera"
 220071:"Kusava"
+220073:Wisdom Orb
+222002:N/A
 221001:Instructions: Anemoculus Resonance Stone
 221002:Instructions: Geoculus Resonance Stone
 221003:Diagram: Geo Treasure Compass

Source/GrasscutterTools/Resources/en-us/Monster.txt

@@ -1,340 +1,215 @@
-20010101: Dendro Slime
-20010201: Large Dendro Slime
-20010202: Large Dendro Slime
-20010301: Anemo Slime
-20010302: Anemo Slime
-20010401: Large Anemo Slime
-20010402: Large Anemo Slime
-20010403: Large Anemo Slime
-20010501: Electro Slime
-20010502: Electro Slime
-20010601: Large Electro Slime
-20010602: Large Electro Slime
-20010604: Large Electro Slime
-20010701: Mutant Electro Slime
-20010702: Mutant Electro Slime
-20010703: Mutant Electro Slime
-20010801: Cryo Slime
-20010802: Cryo Slime
-20010803: Cryo Slime
-20010901: Large Cryo Slime
-20010902: Large Cryo Slime
-20010903: Large Cryo Slime
-20010904: Large Cryo Slime
-20011001: Hydro Slime
-20011002: Hydro Slime
-20011101: Large Hydro Slime
-20011102: Large Hydro Slime
-20011103: Large Hydro Slime
-20011201: Pyro Slime
-20011202: Pyro Slime
-20011203: Pyro Slime
-20011301: Large Pyro Slime
-20011302: Large Pyro Slime
-20011304: Large Pyro Slime
-20011401: Geo Slime
-20011402: Geo Slime
-20011501: Large Geo Slime
-20011502: Large Geo Slime
-20011503: Large Geo Slime
-20011601: Hydro Hypostasis Summon: Split (L)
-20011701: Hydro Hypostasis Summon: Split (S)
-20011801: Hydro Hypostasis Summon: Self-Destruct
-20011901: Hydro Hypostasis Summon: Heal
-20020101: Eye of the Storm
-20040101: Electro Hypostasis
-20040102: Electro Hypostasis
-20040201: Anemo Hypostasis
-20040202: Anemo Hypostasis
-20040301: Geo Hypostasis
-20040302: Geo Hypostasis
-20040401: Hydro Hypostasis
-20040501: Cryo Hypostasis
-20040601: Pyro Hypostasis
-20050101: Oceanid
-20050102: Oceanid
-20050201: Oceanid Boar
-20050202: Oceanid Boar
-20050203: Oceanid Boar
-20050301: Oceanid Crane
-20050302: Oceanid Crane
-20050401: Oceanid Crab
-20050402: Oceanid Crab
-20050403: Oceanid Crab
-20050501: Oceanid Finch
-20050502: Oceanid Finch
-20050601: Oceanid Mallard
-20050602: Oceanid Mallard
-20050603: Oceanid Mallard
-20050701: Oceanid Ferret
-20050702: Oceanid Ferret
-20050703: Oceanid Ferret
-20050801: Oceanid Frog
-20050802: Oceanid Frog
-20050901: Oceanid Raptor
-20060101: Hydro Specter
-20060201: Geo Specter
-20060301: Anemo Specter
-20060401: Cryo Specter
-20060501: Electro Specter
-20060601: Pyro Specter
-20070101: Thunder Manifestation
-21010101: Hilichurl
-21010102: Hilichurl
-21010201: Hilichurl Fighter
-21010301: Wooden Shield Hilichurl Guard
-21010302: Wooden Shield Hilichurl Guard
-21010401: Hilichurl Shooter
-21010402: Hilichurl Shooter
-21010501: Pyro Hilichurl Shooter
-21010502: Pyro Hilichurl Shooter
-21010601: Hilichurl Grenadier
-21010603: Hilichurl Grenadier
-21010701: Hilichurl Berserker
-21010702: Hilichurl Berserker
-21010901: Cryo Hilichurl Shooter
-21010902: Cryo Hilichurl Shooter
-21011001: Electro Hilichurl Shooter
-21011002: Electro Hilichurl Shooter
-21011201: Rock Shield Hilichurl Guard
-21011202: Rock Shield Hilichurl Guard
-21011301: Cryo Hilichurl Grenadier
-21011302: Cryo Hilichurl Grenadier
-21011401: Ice Shield Hilichurl Guard
-21011402: Ice Shield Hilichurl Guard
-21011403: Ice Shield Hilichurl Guard
-21011501: Unusual Hilichurl
-21011601: Electro Hilichurl Grenadier
-21011602: Electro Hilichurl Grenadier
-21020101: Wooden Shieldwall Mitachurl
-21020102: Wooden Shieldwall Mitachurl
-21020201: Blazing Axe Mitachurl
-21020202: Blazing Axe Mitachurl
-21020203: Blazing Axe Mitachurl
-21020301: Rock Shieldwall Mitachurl
-21020302: Rock Shieldwall Mitachurl
-21020401: Frostarm Lawachurl
-21020402: Frostarm Lawachurl
-21020501: Stonehide Lawachurl
-21020502: Stonehide Lawachurl
-21020601: Ice Shieldwall Mitachurl
-21020602: Ice Shieldwall Mitachurl
-21020701: Crackling Axe Mitachurl
-21020702: Crackling Axe Mitachurl
-21020703: Crackling Axe Mitachurl
-21020801: Thunderhelm Lawachurl
-21020802: Thunderhelm Lawachurl
-21030101: Hydro Samachurl
-21030102: Hydro Samachurl
-21030103: Hydro Samachurl
-21030201: Dendro Samachurl
-21030202: Dendro Samachurl
-21030203: Dendro Samachurl
-21030301: Anemo Samachurl
-21030302: Anemo Samachurl
-21030303: Anemo Samachurl
-21030304: Anemo Samachurl
-21030401: Geo Samachurl
-21030402: Geo Samachurl
-21030403: Geo Samachurl
-21030501: Cryo Samachurl
-21030502: Cryo Samachurl
-21030601: Electro Samachurl
-21030602: Electro Samachurl
-21030603: Electro Samachurl
-22010101: Pyro Abyss Mage
-22010102: Pyro Abyss Mage
-22010103: Pyro Abyss Mage
-22010104: Pyro Abyss Mage
-22010105: Pyro Abyss Mage
-22010201: Cryo Abyss Mage
-22010202: Cryo Abyss Mage
-22010203: Cryo Abyss Mage
-22010204: Cryo Abyss Mage
-22010205: Cryo Abyss Mage
-22010301: Hydro Abyss Mage
-22010302: Hydro Abyss Mage
-22010303: Hydro Abyss Mage
-22010304: Hydro Abyss Mage
-22010305: Hydro Abyss Mage
-22010401: Electro Abyss Mage
-22010402: Electro Abyss Mage
-22010403: Electro Abyss Mage
-22010404: Electro Abyss Mage
-22020101: Abyss Herald: Wicked Torrents
-22020102: Abyss Herald: Wicked Torrents
-22030101: Abyss Lector: Violet Lightning
-22030102: Abyss Lector: Violet Lightning
-22030201: Abyss Lector: Fathomless Flames
-22030202: Abyss Lector: Fathomless Flames
-22040101: Rockfond Rifthound Whelp
-22040201: Thundercraven Rifthound Whelp
-22050101: Rockfond Rifthound
-22050201: Thundercraven Rifthound
-22060101: Golden Wolflord
-22070101: Shadowy Husk: Standard Bearer
-22070102: Shadowy Husk: Standard Bearer
-22070201: Shadowy Husk: Line Breaker
-22070202: Shadowy Husk: Line Breaker
-22070301: Shadowy Husk: Defender
-22070302: Shadowy Husk: Defender
-22080101: Black Serpent Knight: Windcutter
-22090101: Guess!
-23010101: Fatui Skirmisher - Cryogunner Legionnaire
-23010201: Fatui Skirmisher - Hydrogunner Legionnaire
-23010301: Fatui Skirmisher - Electrohammer Vanguard
-23010401: Fatui Skirmisher - Geochanter Bracer
-23010501: Fatui Skirmisher - Anemoboxer Vanguard
-23010601: Fatui Skirmisher - Pyroslinger Bracer
-23020101: Fatui Pyro Agent
-23020102: Fatui Pyro Agent
-23030101: Fatui Electro Cicin Mage
-23030102: Fatui Electro Cicin Mage
-23040101: Fatui Cryo Cicin Mage
-23040102: Fatui Cryo Cicin Mage
-23050101: Mirror Maiden
-24010101: Ruin Guard
-24010102: Ruin Guard
-24010108: Ruin Guard
-24010109: Ruin Guard
-24010201: Ruin Hunter
-24010202: Ruin Hunter
-24010301: Ruin Grader
-24010302: Ruin Grader
-24010303: Ruin Grader
-24010401: Ruin Serpent
-24020101: Ruin Cruiser
-24020102: Ruin Cruiser
-24020103: Ruin Cruiser
-24020201: Ruin Destroyer
-24020202: Ruin Destroyer
-24020203: Ruin Destroyer
-24020301: Ruin Defender
-24020302: Ruin Defender
-24020303: Ruin Defender
-24020401: Ruin Scout
-24020402: Ruin Scout
-24020403: Ruin Scout
-24021101: Perpetual Mechanical Array
-24021102: Perpetual Mechanical Array
-25010101: Liuliu
-25010102: Mystery Man
-25010103: Treasure Hoarders: Liuliu
-25010104: Treasure Hoarders: Liuliu
-25010105: Treasure Hoarders: Liuliu
-25010106: Treasure Hoarders: Liuliu
-25010201: Treasure Hoarders: Scout
-25010203: Treasure Hoarders: Scout
-25010204: Treasure Hoarders: Scout
-25010205: Treasure Hoarders: Scout
-25010206: Treasure Hoarders: Scout
-25010207: Treasure Hoarders: Scout
-25010208: Treasure Hoarders: Scout
-25010301: Treasure Hoarders: Pyro Potioneer
-25010302: Treasure Hoarders: Pyro Potioneer
-25010401: Treasure Hoarders: Hydro Potioneer
-25010501: Treasure Hoarders: Electro Potioneer
-25010601: Treasure Hoarders: Cryo Potioneer
-25010701: Treasure Hoarders: Handyman
-25020101: Treasure Hoarders: Raptor
-25020102: Treasure Hoarders: Raptor
-25020201: Treasure Hoarders: Marksman
-25020204: Treasure Hoarders: Marksman
-25030101: Treasure Hoarders: Carmen
-25030102: Treasure Hoarders: Carmen
-25030103: Treasure Hoarders: Carmen
-25030201: Treasure Hoarders: Gravedigger
-25030301: Treasure Hoarders: Oarsman
-25040101: Treasure Hoarders: Boss
-25040102: Treasure Hoarders: Boss
-25040103: Treasure Hoarders: Boss
-25050101: Millelith Soldier
-25050201: Millelith Sergeant
-25050301: Shogunate Infantry
-25050401: Shogunate Infantry Captain
-25050402: Shogunate Infantry Captain
-25050501: Sangonomiya Cohort
-25050502: Sangonomiya Cohort
-25060101: Treasure Hoarders: Pugilist
-25060102: Treasure Hoarders: Pugilist
-25070101: Treasure Hoarders: Crusher
-25070201: Treasure Hoarders: Wallenstein
-25070202: Treasure Hoarders: Wallenstein
-25080101: Nobushi: Jintouban
-25080201: Nobushi: Hitsukeban
-25080202: Nobushi: Hitsukeban
-25080301: Nobushi: Kikouban
-25080401: Yoriki Samurai
-25080402: Yoriki Samurai
-25090101: Maguu Kenki
-25090102: Maguu Kenki: Wind Bunshin
-25090103: Maguu Kenki: Ice Bunshin
-25090104: Maguu Kenki: Masked Bunshin
-25090201: Maguu Kenki: Lone Gale
-25090301: Maguu Kenki: Galloping Frost
-25090401: Maguu Kenki: Mask of Terror
-25100101: Kairagi: Dancing Thunder
-25100102: Kairagi: Dancing Thunder
-25100201: Kairagi: Fiery Might
-25100301: Ochimusha: Ensorcelled Thunder
-25100302: Ochimusha: Ensorcelled Thunder
-25100401: Ochimusha: Cankered Flame
-26010101: Cryo Whopperflower
-26010102: Cryo Whopperflower
-26010103: Cryo Whopperflower
-26010104: Cryo Whopperflower
-26010201: Pyro Whopperflower
-26010301: Electro Whopperflower
-26020101: Cryo Regisvine
-26020102: Cryo Regisvine
-26020201: Pyro Regisvine
-26030101: Geovishap Hatchling
-26040101: Geovishap (Hydro)
-26040102: Geovishap (Pyro)
-26040103: Geovishap (Cryo)
-26040104: Geovishap (Electro)
-26040105: Geovishap
-26050101: Primo Geovishap (Hydro)
-26050201: Primo Geovishap (Pyro)
-26050301: Primo Geovishap (Cryo)
-26050401: Primo Geovishap (Electro)
-26050501: Primo Geovishap
-26050601: Primordial Bathysmal Vishap
-26050701: Rimebiter Bathysmal Vishap
-26050702: Rimebiter Bathysmal Vishap
-26050801: Bolteater Bathysmal Vishap
-26050802: Bolteater Bathysmal Vishap
-26050901: Primordial Bathysmal Vishap
-26051001: Primordial Bathysmal Vishap Hatchling
-26051101: Bolteater Bathysmal Vishap Hatchling
-26060101: Electro Cicin
-26060201: Hydro Cicin
-26060301: Cryo Cicin
-26080101: Beisht
-26090101: Floating Hydro Fungus
-29010101: Stormterror
-29010102: Stormterror
-29010103: Stormterror
-29010104: Stormterror
-29020101: Boreas, Great Wolf King of the North
-29020102: Lupus Boreas, Dominator of Wolves
-29030101: Childe - Eleventh of the Fatui Harbingers
-29030102: Childe - Delusion Unleashed
-29030103: Childe
-29030104: Childe - Eleventh of the Fatui Harbingers
-29030105: Childe - Delusion Unleashed
-29030106: Childe
-29040101: Azhdaha (Pyro, Electro)
-29040102: Azhdaha (Hydro, Electro)
-29040103: Azhdaha (Pyro, Cryo)
-29040104: Azhdaha (Hydro, Cryo)
-29040111: Azhdaha
-29050101: La Signora
-29050102: La Signora - Crimson Witch of Embers
-29050103: La Signora
-29050104: La Signora - Crimson Witch of Embers
-29060101: Raiden Shogun
-29060102: Raiden Ei
-29060201: Magatsu Mitake Narukami no Mikoto
-29060202: Magatsu Mitake Narukami no Mikoto
-29060203: Magatsu Mitake Narukami no Mikoto
+20010101:Dendro Slime
+20010201:Large Dendro Slime
+20010301:Anemo Slime
+20010401:Large Anemo Slime
+20010501:Electro Slime 
+20010601:Large Electro Slime
+20010701:Mutant Electro Slime
+20010801:Cryo Slime
+20010901:Large Cryo Slime
+20011001:Hydro Slime
+20011101:Large Hydro Slime
+20011201:Pyro Slime
+20011301:Large Pyro Slime
+20011401:Geo Slime
+20011501:Large Geo Slime
+20011601:Hydro Hypostasis Summon:Split (L)
+20011701:Hydro Hypostasis Summon:Split (S)
+20011801:Hydro Hypostasis Summon:Self-Destruct
+20011901:Hydro Hypostasis Summon:Heal
+20020101:Eye of the Storm
+20040101:Electro Hypostasis
+20040201:Anemo Hypostasis
+20040301:Geo Hypostasis
+20040401:Hydro Hypostasis
+20040501:Cryo Hypostasis
+20040601:Pyro Hypostasis
+20040701:Dendro Hypostasis
+20050102:Oceanid
+20050201:Oceanid Boar
+20050301:Oceanid Crane
+20050401:Oceanid Crab
+20050501:Oceanid Finch
+20050601:Oceanid Mallard
+20050701:Oceanid Ferret
+20050801:Oceanid Frog
+20050901:Oceanid Raptor
+20060101:Hydro Specter
+20060201:Geo Specter
+20060301:Anemo Specter
+20060401:Cryo Specter
+20060501:Electro Specter
+20060601:Pyro Specter
+26120301:Hydro Mushroom 
+26120201:Cryo Mushroom
+26120101:Dendro Mushroom
+20070101:Thunder Manifestation
+21010101:Hilichurl
+21010201:Hilichurl Fighter
+21010301:Wooden Shield Hilichurl Guard
+21010401:Hilichurl Shooter
+21010501:Pyro Hilichurl Shooter
+21010601:Hilichurl Grenadier
+21010701:Hilichurl Berserker
+21010901:Cryo Hilichurl Shooter
+21011001:Electro Hilichurl Shooter
+21011201:Rock Shield Hilichurl Guard
+21011301:Cryo Hilichurl Grenadier
+21011401:Ice Shield Hilichurl Guard
+21011501:Unusual Hilichurl
+21011601:Electro Hilichurl Grenadier
+21020101:Wooden Shieldwall Mitachurl
+21020201:Blazing Axe Mitachurl
+21020301:Rock Shieldwall Mitachurl
+21020401:Frostarm Lawachurl
+21020501:Stonehide Lawachurl
+21020601:Ice Shieldwall Mitachurl
+21020701:Crackling Axe Mitachurl
+21020801:Thunderhelm Lawachurl
+21030101:Hydro Samachurl
+21030201:Dendro Samachurl
+21030301:Anemo Samachurl
+21030401:Geo Samachurl
+21030501:Cryo Samachurl
+21030601:Electro Samachurl
+22010101:Pyro Abyss Mage
+22010201:Cryo Abyss Mage
+22010301:Hydro Abyss Mage
+22010401:Electro Abyss Mage
+22020101:Abyss Herald:Wicked Torrents
+22030101:Abyss Lector:Violet Lightning
+22030201:Abyss Lector:Fathomless Flames
+22040101:Rockfond Rifthound Whelp
+22040201:Thundercraven Rifthound Whelp
+22050101:Rockfond Rifthound
+22050201:Thundercraven Rifthound
+22060101:Golden Wolflord
+22070101:Shadowy Husk:Standard Bearer
+22070201:Shadowy Husk:Line Breaker
+22070301:Shadowy Husk:Defender
+22080101:Black Serpent Knight:Windcutter
+22090101:Guess!
+23010101:Fatui Skirmisher - Cryogunner Legionnaire
+23010201:Fatui Skirmisher - Hydrogunner Legionnaire
+23010301:Fatui Skirmisher - Electrohammer Vanguard
+23010401:Fatui Skirmisher - Geochanter Bracer
+23010501:Fatui Skirmisher - Anemoboxer Vanguard
+23010601:Fatui Skirmisher - Pyroslinger Bracer
+23020101:Fatui Pyro Agent
+23020102:Fatui Pyro Agent
+23030101:Fatui Electro Cicin Mage
+23040101:Fatui Cryo Cicin Mage
+23050101:Mirror Maiden
+24010101:Ruin Guard
+24010201:Ruin Hunter
+24010301:Ruin Grader
+24010401:Ruin Serpent
+24020101:Ruin Cruiser
+24020201:Ruin Destroyer
+24020301:Ruin Defender
+24020401:Ruin Scout
+24030201:Ruin gargoyle
+24030101:Ruin gargoyle (Winged)
+24021101:Perpetual Mechanical Array
+24021102:Perpetual Mechanical Array
+25010101:Liuliu
+25010102:Mystery Man
+25010103:Treasure Hoarders:Liuliu
+25010201:Treasure Hoarders:Scout
+25010301:Treasure Hoarders:Pyro Potioneer
+25010401:Treasure Hoarders:Hydro Potioneer
+25010501:Treasure Hoarders:Electro Potioneer
+25010601:Treasure Hoarders:Cryo Potioneer
+25010701:Treasure Hoarders:Handyman
+25020101:Treasure Hoarders:Raptor
+25020102:Treasure Hoarders:Raptor
+25020201:Treasure Hoarders:Marksman
+25030101:Treasure Hoarders:Carmen
+25030201:Treasure Hoarders:Gravedigger
+25030301:Treasure Hoarders:Oarsman
+25040101:Treasure Hoarders:Boss
+25050101:Millelith Soldier
+25050201:Millelith Sergeant
+25050301:Shogunate Infantry
+25050401:Shogunate Infantry Captain
+25050501:Sangonomiya Cohort
+25060101:Treasure Hoarders:Pugilist
+25070101:Treasure Hoarders:Crusher
+25070202:Treasure Hoarders:Wallenstein
+25080101:Nobushi:Jintouban
+25080201:Nobushi:Hitsukeban
+25080301:Nobushi:Kikouban
+25080401:Yoriki Samurai
+25090101:Maguu Kenki
+25090102:Maguu Kenki:Wind Bunshin
+25090103:Maguu Kenki:Ice Bunshin
+25090104:Maguu Kenki:Masked Bunshin
+25090201:Maguu Kenki:Lone Gale
+25090301:Maguu Kenki:Galloping Frost
+25090401:Maguu Kenki:Mask of Terror
+25100101:Kairagi:Dancing Thunder
+25100201:Kairagi:Fiery Might
+25100301:Ochimusha:Ensorcelled Thunder
+25100401:Ochimusha:Cankered Flame
+25210105:Desert bandit
+25310201:Desert Cryo
+25210204:Desert bandit
+25210306:Desert Guard
+25210504:Desert pirate
+26010101:Cryo Whopperflower
+26010102:Cryo Whopperflower
+26010103:Cryo Whopperflower
+26010104:Cryo Whopperflower
+26010201:Pyro Whopperflower
+26010301:Electro Whopperflower
+26020101:Cryo Regisvine
+26020201:Pyro Regisvine
+26020301:Electro Regisvine
+26030101:Geovishap Hatchling
+26040101:Geovishap (Hydro)
+26040102:Geovishap (Pyro)
+26040103:Geovishap (Cryo)
+26040104:Geovishap (Electro)
+26040105:Geovishap
+26050101:Primo Geovishap (Hydro)
+26050201:Primo Geovishap (Pyro)
+26050301:Primo Geovishap (Cryo)
+26050401:Primo Geovishap (Electro)
+26050501:Primo Geovishap
+26050601:Primordial Bathysmal Vishap
+26050701:Rimebiter Bathysmal Vishap
+26050801:Bolteater Bathysmal Vishap
+26050901:Primordial Bathysmal Vishap
+26051001:Primordial Bathysmal Vishap Hatchling
+26051101:Bolteater Bathysmal Vishap Hatchling
+26060101:Electro Cicin
+26060201:Hydro Cicin
+26060301:Cryo Cicin
+26080101:Beisht
+26090101:Floating Hydro Fungus
+26110101:Jadeplume Terrorshroom
+29010101:Stormterror
+29020101:Boreas, Great Wolf King of the North
+29020102:Lupus Boreas, Dominator of Wolves
+29030101:Childe
+29030102:Childe - Delusion Unleashed
+29030103:Childe - Eleventh of the Fatui Harbingers
+29040101:Azhdaha (Pyro, Electro)
+29040102:Azhdaha (Hydro, Electro)
+29040103:Azhdaha (Pyro, Cryo)
+29040104:Azhdaha (Hydro, Cryo)
+29040111:Azhdaha
+29050101:La Signora
+29050102:La Signora - Crimson Witch of Embers
+29060101:Raiden Shogun
+29060102:Raiden Ei
+29060201:Magatsu Mitake Narukami no Mikoto
+29070101:???(Scaramouche)
+31010101:Hilichurl
+31020101:Mitachurl shield
+31020201:Axe Mitachurl
+24030301 : BlightDrake
+24040101 : Primal Construct: Repulsor
+24040201 : Primal Construct: Reshaper
+24040301 : Primal Construct: Prospector
+24050101 : Semi-Perpetual Control Matrix

Source/GrasscutterTools/Resources/en-us/Weapon.txt

@@ -21,6 +21,8 @@
 11414:Amenoma Kageuchi
 11415:Cinnabar Spindle
 11416:Kagotsurube Isshin
+11417:Sapwood Blade
+11418:Xiphos’ Moonlight
 11419:Prized Isshin Blade
 11420:Prized Isshin Blade
 11421:Prized Isshin Blade
@@ -33,6 +35,7 @@
 11507:One Side
 11509:Mistsplitter Reforged
 11510:Haran Geppaku Futsu
+11511:Key of Khaj-Nisut
 12101:Waster Greatsword
 12201:Old Merc's Pal
 12301:Ferrous Shadow
@@ -54,7 +57,9 @@
 12411:Snow-Tombed Starsilver
 12412:Luxurious Sea-Lord
 12414:Katsuragikiri Nagamasa
+12415:Makhaira Aquamarine
 12416:Akuoumaru
+12417:Forest Regalia
 12501:Skyward Pride
 12502:Wolf's Gravestone
 12503:Song of Broken Pines
@@ -80,6 +85,8 @@
 13414:Kitain Cross Spear
 13415:"The Catch"
 13416:Wavebreaker's Fin
+13417:Moonpiercer
+13419:Missive Windspear
 13501:Staff of Homa
 13502:Skyward Spine
 13504:Vortex Vanquisher
@@ -87,6 +94,7 @@
 13506:Deicide
 13507:Calamity Queller
 13509:Engulfing Lightning
+13511:Staff of the Scarlet Sands
 14101:Apprentice's Notes
 14201:Pocket Grimoire
 14301:Magic Guide
@@ -109,6 +117,8 @@
 14413:Dodoco Tales
 14414:Hakushin Ring
 14415:Oathsworn Eye
+14416:Wandering Evenstar
+14417:Fruit of Fulfillment
 14501:Skyward Atlas
 14502:Lost Prayer to the Sacred Winds
 14503:Lost Ballade
@@ -116,6 +126,7 @@
 14505:Primordial Jade Regalia
 14506:Everlasting Moonglow
 14509:Kagura's Verity
+14511:A Thousand Floating Dreams
 15101:Hunter's Bow
 15201:Seasoned Hunter's Bow
 15301:Raven Bow
@@ -140,6 +151,8 @@
 15414:Hamayumi
 15415:Predator
 15416:Mouun's Moon
+15417:King's Squire
+15418:End of the Line
 15501:Skyward Harp
 15502:Amos' Bow
 15503:Elegy for the End

Source/GrasscutterTools/Resources/ru-ru/ArtifactCat.txt

@@ -1,5 +1,5 @@
-20:Deepwood Memories
-21:Gilded Dreams
+20:Воспоминания дремучего леса
+21:Позолоченные сны
 51:Решимость временщика
 52:Душа храбреца
 53:Воля защитника
@@ -26,7 +26,7 @@
 81:Церемония древней знати
 82:Рыцарь крови
 83:Шаман огня
-84:Prayers for Destiny
+84:Шаман воды
 85:Шаман молний
 86:Шаман ветра
 87:Шаман льда

Source/GrasscutterTools/Resources/ru-ru/ArtifactMainAttribution.txt

@@ -1,66 +1,66 @@
-10001: Здоровья
-10002: Здоровья Процент
-10003: Атаки
-10004: Атаки Процент
-10005: Защиты
-10006: Защиты Процент
-10007: Восстановление Энергии
-10008: Мастерство стехий
-10009: Пиро Сопротивление
-10010: Электро Сопротивление
-10011: Крио Сопротивление
-10012: Гидро Сопротивление
-10013: Анемо Сопротивление
-10014: Гео Сопротивление
-10015: Дендро Сопротивление
-12001: Атаки
-13001: Здоровья
-13002: Здоровья Процент
-13003: Атаки
-13004: Атаки Процент
-13005: Защиты
-13006: Защиты Процент
-13007: Крит шанс
-13008: Крит урон
-13009: Бонус Лечения
-13010: Мастерство стехий
-14001: Здоровья
-15001: Здоровья
-15002: Здоровья Процент
-15003: Атаки
-15004: Атаки Процент
-15005: Защиты
-15006: Защиты Процент
-15007: Мастерство стехий
-15008: Пиро Бонус урона
-15009: Электро Бонус урона
-15010: Крио Бонус урона
-15011: Гидро Бонус урона
-15012: Анемо Бонус урона
-15013: Гео Бонус урона
-15014: Дендро Бонус урона
-15015: Физ. Бонус урона
-10990: Атаки Процент
-10980: Здоровья Процент
-10970: Защиты Процент
-10960: Восстановление Энергии
-10950: Мастерство стехий
-30990: Атаки Процент
-30980: Здоровья Процент
-30970: Защиты Процент
-30960: Крит шанс
-30950: Крит урон
-30940: Бонус Лечения
-30930: Мастерство стехий
-50990: Атаки Процент
-50980: Здоровья Процент
-50970: Защиты Процент
-50960: Бонус пиро урона
-50950: Бонус электро урона
-50940: Бонус крио урона
-50930: Бонус гидро урона
-50920: Бонус анемо урона
-50910: Бонус гео урона
-50900: Бонус дендро урона
+10001: Здоровье (HP)
+10002: Процент здоровья (HP%)
+10003: Атака
+10004: Процент атаки 
+10005: Защита
+10006: Процент защиты
+10007: Восстановление энергии
+10008: Мастерство стихий
+10009: Пиро сопротивление
+10010: Электро сопротивление
+10011: Крио сопротивление
+10012: Гидро сопротивление
+10013: Анемо сопротивление
+10014: Гео сопротивление
+10015: Дендро сопротивление
+12001: Атака
+13001: Здоровье (HP)
+13002: Процент здоровья (HP%)
+13003: Атака
+13004: Процент атаки
+13005: Защита
+13006: Процент защиты
+13007: Шанс крит. урона
+13008: Критический урон
+13009: Бонус лечения
+13010: Мастерство стихий
+14001: Здоровье (HP)
+15001: Здоровье (HP)
+15002: Процент здоровья (HP%)
+15003: Атака
+15004: Процент атаки 
+15005: Защита
+15006: Процент защиты
+15007: Мастерство стихий
+15008: Бонус Пиро урона
+15009: Бонус Электро урона
+15010: Бонус Крио урона
+15011: Бонус Гидро урона
+15012: Бонус Анемо урона
+15013: Бонус Гео урона
+15014: Бонус Дендро урона
+15015: Бонус физического урона
+10990: Процент атаки 
+10980: Процент здоровья (HP%)
+10970: Процент защиты
+10960: Восстановление энергии
+10950: Мастерство стихий
+30990: Процент атаки 
+30980: Процент здоровья (HP%)
+30970: Процент защиты
+30960: Шанс крит. урона
+30950: Критический урон
+30940: Бонус лечения
+30930: Мастерство стихий
+50990: Процент атаки 
+50980: Процент здоровья (HP%)
+50970: Процент защиты
+50960: Бонус Пиро урона
+50950: Бонус Электро урона
+50940: Бонус Крио урона
+50930: Бонус Гидро урона
+50920: Бонус Анемо урона
+50910: Бонус Гео урона
+50900: Бонус Дендро урона
 50890: Бонус физического урона
-50880: Мастерство стехий
+50880: Мастерство стихий

Source/GrasscutterTools/Resources/ru-ru/ArtifactSubAttribution.txt

@@ -1,37 +1,37 @@
-101021: Здоровье+24
-101022: Здоровье+30
-201021: Здоровье+50
-201022: Здоровье+61
-201023: Здоровье+72
-301021: Здоровье+100
-301022: Здоровье+115
-301023: Здоровье+129
-301024: Здоровье+143
-401021: Здоровье+167
-401022: Здоровье+191
-401023: Здоровье+215
-401024: Здоровье+239
-501021: Здоровье+209
-501022: Здоровье+239
-501023: Здоровье+269
-501024: Здоровье+299
-101031: Здоровье Процент+1.2%
-101032: Здоровье Процент+1.5%
-201031: Здоровье Процент+1.6%
-201032: Здоровье Процент+2.0%
-201033: Здоровье Процент+2.3%
-301031: Здоровье Процент+2.4%
-301032: Здоровье Процент+2.8%
-301033: Здоровье Процент+3.2%
-301034: Здоровье Процент+3.5%
-401031: Здоровье Процент+3.3%
-401032: Здоровье Процент+3.7%
-401033: Здоровье Процент+4.2%
-401034: Здоровье Процент+4.7%
-501031: Здоровье Процент+4.1%
-501032: Здоровье Процент+4.7%
-501033: Здоровье Процент+5.2%
-501034: Здоровье Процент+5.8%
+101021: Здоровье (HP)+24
+101022: Здоровье (HP)+30
+201021: Здоровье (HP)+50
+201022: Здоровье (HP)+61
+201023: Здоровье (HP)+72
+301021: Здоровье (HP)+100
+301022: Здоровье (HP)+115
+301023: Здоровье (HP)+129
+301024: Здоровье (HP)+143
+401021: Здоровье (HP)+167
+401022: Здоровье (HP)+191
+401023: Здоровье (HP)+215
+401024: Здоровье (HP)+239
+501021: Здоровье (HP)+209
+501022: Здоровье (HP)+239
+501023: Здоровье (HP)+269
+501024: Здоровье (HP)+299
+101031: Процент здоровья (HP%)+1.2%
+101032: Процент здоровья (HP%)+1.5%
+201031: Процент здоровья (HP%)+1.6%
+201032: Процент здоровья (HP%)+2.0%
+201033: Процент здоровья (HP%)+2.3%
+301031: Процент здоровья (HP%)+2.4%
+301032: Процент здоровья (HP%)+2.8%
+301033: Процент здоровья (HP%)+3.2%
+301034: Процент здоровья (HP%)+3.5%
+401031: Процент здоровья (HP%)+3.3%
+401032: Процент здоровья (HP%)+3.7%
+401033: Процент здоровья (HP%)+4.2%
+401034: Процент здоровья (HP%)+4.7%
+501031: Процент здоровья (HP%)+4.1%
+501032: Процент здоровья (HP%)+4.7%
+501033: Процент здоровья (HP%)+5.2%
+501034: Процент здоровья (HP%)+5.8%
 101051: Атака+2
 101052: Атака+2
 201051: Атака+3
@@ -49,23 +49,23 @@
 501052: Атака+16
 501053: Атака+18
 501054: Атака+19
-101061: Атака Процент+1.2%
-101062: Атака Процент+1.5%
-201061: Атака Процент+1.6%
-201062: Атака Процент+2.0%
-201063: Атака Процент+2.3%
-301061: Атака Процент+2.4%
-301062: Атака Процент+2.8%
-301063: Атака Процент+3.2%
-301064: Атака Процент+3.5%
-401061: Атака Процент+3.3%
-401062: Атака Процент+3.7%
-401063: Атака Процент+4.2%
-401064: Атака Процент+4.7%
-501061: Атака Процент+4.1%
-501062: Атака Процент+4.7%
-501063: Атака Процент+5.2%
-501064: Атака Процент+5.8%
+101061: Процент атаки+1.2%
+101062: Процент атаки+1.5%
+201061: Процент атаки+1.6%
+201062: Процент атаки+2.0%
+201063: Процент атаки+2.3%
+301061: Процент атаки+2.4%
+301062: Процент атаки+2.8%
+301063: Процент атаки+3.2%
+301064: Процент атаки+3.5%
+401061: Процент атаки+3.3%
+401062: Процент атаки+3.7%
+401063: Процент атаки+4.2%
+401064: Процент атаки+4.7%
+501061: Процент атаки+4.1%
+501062: Процент атаки+4.7%
+501063: Процент атаки+5.2%
+501064: Процент атаки+5.8%
 101081: Защита+2
 101082: Защита+2
 201081: Защита+4
@@ -83,253 +83,253 @@
 501082: Защита+19
 501083: Защита+21
 501084: Защита+23
-101091: Защита Процент+1.5%
-101092: Защита Процент+1.8%
-201091: Защита Процент+2.0%
-201092: Защита Процент+2.5%
-201093: Защита Процент+2.9%
-301091: Защита Процент+3.1%
-301092: Защита Процент+3.5%
-301093: Защита Процент+3.9%
-301094: Защита Процент+4.4%
-401091: Защита Процент+4.1%
-401092: Защита Процент+4.7%
-401093: Защита Процент+5.2%
-401094: Защита Процент+5.8%
-501091: Защита Процент+5.1%
-501092: Защита Процент+5.8%
-501093: Защита Процент+6.6%
-501094: Защита Процент+7.3%
-101231: Энергетическая перезарядка+1.3%
-101232: Энергетическая перезарядка+1.6%
-201231: Энергетическая перезарядка+1.8%
-201232: Энергетическая перезарядка+2.2%
-201233: Энергетическая перезарядка+2.6%
-301231: Энергетическая перезарядка+2.7%
-301232: Энергетическая перезарядка+3.1%
-301233: Энергетическая перезарядка+3.5%
-301234: Энергетическая перезарядка+3.9%
-401231: Энергетическая перезарядка+3.6%
-401232: Энергетическая перезарядка+4.1%
-401233: Энергетическая перезарядка+4.7%
-401234: Энергетическая перезарядка+5.2%
-501231: Энергетическая перезарядка+4.5%
-501232: Энергетическая перезарядка+5.2%
-501233: Энергетическая перезарядка+5.8%
-501234: Энергетическая перезарядка+6.5%
-101241: Элементальное мастерство+5
-101242: Элементальное мастерство+6
-201241: Элементальное мастерство+7
-201242: Элементальное мастерство+8
-201243: Элементальное мастерство+9
-301241: Элементальное мастерство+10
-301242: Элементальное мастерство+11
-301243: Элементальное мастерство+13
-301244: Элементальное мастерство+14
-401241: Элементальное мастерство+13
-401242: Элементальное мастерство+15
-401243: Элементальное мастерство+17
-401244: Элементальное мастерство+19
-501241: Элементальное мастерство+16
-501242: Элементальное мастерство+19
-501243: Элементальное мастерство+21
-501244: Элементальное мастерство+23
-101201: КРИТ Рейтинг+0.8%
-101202: КРИТ Рейтинг+1.0%
-201201: КРИТ Рейтинг+1.1%
-201202: КРИТ Рейтинг+1.3%
-201203: КРИТ Рейтинг+1.5%
-301201: КРИТ Рейтинг+1.6%
-301202: КРИТ Рейтинг+1.9%
-301203: КРИТ Рейтинг+2.1%
-301204: КРИТ Рейтинг+2.3%
-401201: КРИТ Рейтинг+2.2%
-401202: КРИТ Рейтинг+2.5%
-401203: КРИТ Рейтинг+2.8%
-401204: КРИТ Рейтинг+3.1%
-501201: КРИТ Рейтинг+2.7%
-501202: КРИТ Рейтинг+3.1%
-501203: КРИТ Рейтинг+3.5%
-501204: КРИТ Рейтинг+3.9%
-101221: КРИТИЧЕСКИЙ Урон+1.5%
-101222: КРИТИЧЕСКИЙ Урон+1.9%
-201221: КРИТИЧЕСКИЙ Урон+2.2%
-201222: КРИТИЧЕСКИЙ Урон+2.6%
-201223: КРИТИЧЕСКИЙ Урон+3.1%
-301221: КРИТИЧЕСКИЙ Урон+3.3%
-301222: КРИТИЧЕСКИЙ Урон+3.7%
-301223: КРИТИЧЕСКИЙ Урон+4.2%
-301224: КРИТИЧЕСКИЙ Урон+4.7%
-401221: КРИТИЧЕСКИЙ Урон+4.3%
-401222: КРИТИЧЕСКИЙ Урон+5.0%
-401223: КРИТИЧЕСКИЙ Урон+5.6%
-401224: КРИТИЧЕСКИЙ Урон+6.2%
-501221: КРИТИЧЕСКИЙ Урон+5.4%
-501222: КРИТИЧЕСКИЙ Урон+6.2%
-501223: КРИТИЧЕСКИЙ Урон+7.0%
-501224: КРИТИЧЕСКИЙ Урон+7.8%
-999001: КРИТИЧЕСКИЙ Урон+350.0%
-999002: КРИТ Рейтинг+100.0%
+101091: Процент защиты+1.5%
+101092: Процент защиты+1.8%
+201091: Процент защиты+2.0%
+201092: Процент защиты+2.5%
+201093: Процент защиты+2.9%
+301091: Процент защиты+3.1%
+301092: Процент защиты+3.5%
+301093: Процент защиты+3.9%
+301094: Процент защиты+4.4%
+401091: Процент защиты+4.1%
+401092: Процент защиты+4.7%
+401093: Процент защиты+5.2%
+401094: Процент защиты+5.8%
+501091: Процент защиты+5.1%
+501092: Процент защиты+5.8%
+501093: Процент защиты+6.6%
+501094: Процент защиты+7.3%
+101231: Восстановление энергии+1.3%
+101232: Восстановление энергии+1.6%
+201231: Восстановление энергии+1.8%
+201232: Восстановление энергии+2.2%
+201233: Восстановление энергии+2.6%
+301231: Восстановление энергии+2.7%
+301232: Восстановление энергии+3.1%
+301233: Восстановление энергии+3.5%
+301234: Восстановление энергии+3.9%
+401231: Восстановление энергии+3.6%
+401232: Восстановление энергии+4.1%
+401233: Восстановление энергии+4.7%
+401234: Восстановление энергии+5.2%
+501231: Восстановление энергии+4.5%
+501232: Восстановление энергии+5.2%
+501233: Восстановление энергии+5.8%
+501234: Восстановление энергии+6.5%
+101241: Мастерство стихий+5
+101242: Мастерство стихий+6
+201241: Мастерство стихий+7
+201242: Мастерство стихий+8
+201243: Мастерство стихий+9
+301241: Мастерство стихий+10
+301242: Мастерство стихий+11
+301243: Мастерство стихий+13
+301244: Мастерство стихий+14
+401241: Мастерство стихий+13
+401242: Мастерство стихий+15
+401243: Мастерство стихий+17
+401244: Мастерство стихий+19
+501241: Мастерство стихий+16
+501242: Мастерство стихий+19
+501243: Мастерство стихий+21
+501244: Мастерство стихий+23
+101201: Шанс крит. урона+0.8%
+101202: Шанс крит. урона+1.0%
+201201: Шанс крит. урона+1.1%
+201202: Шанс крит. урона+1.3%
+201203: Шанс крит. урона+1.5%
+301201: Шанс крит. урона+1.6%
+301202: Шанс крит. урона+1.9%
+301203: Шанс крит. урона+2.1%
+301204: Шанс крит. урона+2.3%
+401201: Шанс крит. урона+2.2%
+401202: Шанс крит. урона+2.5%
+401203: Шанс крит. урона+2.8%
+401204: Шанс крит. урона+3.1%
+501201: Шанс крит. урона+2.7%
+501202: Шанс крит. урона+3.1%
+501203: Шанс крит. урона+3.5%
+501204: Шанс крит. урона+3.9%
+101221: Критический урон+1.5%
+101222: Критический урон+1.9%
+201221: Критический урон+2.2%
+201222: Критический урон+2.6%
+201223: Критический урон+3.1%
+301221: Критический урон+3.3%
+301222: Критический урон+3.7%
+301223: Критический урон+4.2%
+301224: Критический урон+4.7%
+401221: Критический урон+4.3%
+401222: Критический урон+5.0%
+401223: Критический урон+5.6%
+401224: Критический урон+6.2%
+501221: Критический урон+5.4%
+501222: Критический урон+6.2%
+501223: Критический урон+7.0%
+501224: Критический урон+7.8%
+999001: Критический урон+350.0%
+999002: Шанс крит. урона+100.0%
 999003: Атака+233333
 999004: Защита+233333
-998001: Здоровье Процент+14.6%
-998002: Атака Процент+14.6%
-998003: Защита Процент+18.2%
-998004: КРИТ Рейтинг+9.7%
-998005: Энергетическая перезарядка+16.2%
-998006: Элементальное мастерство+58
-998007: КРИТИЧЕСКИЙ Урон+19.4%
-995001: Здоровье Процент+14.6%
-995002: Атака Процент+14.6%
-995003: Защита Процент+18.2%
-995004: КРИТ Рейтинг+9.7%
-995005: Энергетическая перезарядка+16.2%
-995006: Элементальное мастерство+58
-995007: КРИТИЧЕСКИЙ Урон+19.4%
-997001: Здоровье Процент+9.3%
-997002: Атака Процент+9.3%
-997003: Защита Процент+11.7%
-997004: КРИТ Рейтинг+6.2%
-997005: Энергетическая перезарядка+10.4%
-997006: Элементальное мастерство+37
-997007: КРИТИЧЕСКИЙ Урон+12.4%
-996001: Здоровье Процент+9.3%
-996002: Атака Процент+9.3%
-996003: Защита Процент+11.7%
-996004: КРИТ Рейтинг+6.2%
-996005: Энергетическая перезарядка+10.4%
-996006: Элементальное мастерство+37
-996007: КРИТИЧЕСКИЙ Урон+12.4%
-994001: КРИТ Рейтинг+80.0%
-993001: КРИТИЧЕСКИЙ Урон+80.0%
+998001: Процент здоровья (HP%)+14.6%
+998002: Процент атаки+14.6%
+998003: Процент защиты+18.2%
+998004: Шанс крит. урона+9.7%
+998005: Восстановление энергии+16.2%
+998006: Мастерство стихий+58
+998007: Критический урон+19.4%
+995001: Процент здоровья (HP%)+14.6%
+995002: Процент атаки+14.6%
+995003: Процент защиты+18.2%
+995004: Шанс крит. урона+9.7%
+995005: Восстановление энергии+16.2%
+995006: Мастерство стихий+58
+995007: Критический урон+19.4%
+997001: Процент здоровья (HP%)+9.3%
+997002: Процент атаки+9.3%
+997003: Процент защиты+11.7%
+997004: Шанс крит. урона+6.2%
+997005: Восстановление энергии+10.4%
+997006: Мастерство стихий+37
+997007: Критический урон+12.4%
+996001: Процент здоровья (HP%)+9.3%
+996002: Процент атаки+9.3%
+996003: Процент защиты+11.7%
+996004: Шанс крит. урона+6.2%
+996005: Восстановление энергии+10.4%
+996006: Мастерство стихий+37
+996007: Критический урон+12.4%
+994001: Шанс крит. урона+80.0%
+993001: Критический урон+80.0%
 992001: Прочность щита+80.0%
-991001: Бонус Исцеления+80.0%
-990001: Бонус Исцеление+80.0%
+991001: Бонус лечения+80.0%
+990001: Бонус лечения+80.0%
 989001: Уменшение отката+50.0%
-988001: Скорость переджения+30.0%
-987001: Пиро Урон Bonus+80.0%
-986001: Электро Урон Bonus+80.0%
-985001: Гидро Урон Bonus+80.0%
-984001: Дендро Урон Bonus+80.0%
-983001: Анемо Урон Bonus+80.0%
-982001: Гео Урон Bonus+80.0%
-981001: Крио Урон Bonus+80.0%
-980001: Физ. Урон Bonus+80.0%
-979001: Пиро Сопротивленин+80.0%
-978001: Электро Сопротивленин+80.0%
-977001: Гидро Сопротивленин+80.0%
-976001: Дендро Сопротивленин+80.0%
-975001: Анемо Сопротивленин+80.0%
-974001: Гео Сопротивленин+80.0%
-973001: Крио Сопротивленин+80.0%
-972001: Физ. Сопротивленин+80.0%
+988001: Скорость передвижения+30.0%
+987001: Бонус Пиро урона+80.0%
+986001: Бонус Электро урона+80.0%
+985001: Бонус Гидро урона+80.0%
+984001: Бонус Дендро урона+80.0%
+983001: Бонус Анемо урона+80.0%
+982001: Бонус Гео урона+80.0%
+981001: Бонус Крио урона+80.0%
+980001: Бонус физ. урона+80.0%
+979001: Пиро сопротивление+80.0%
+978001: Электро сопротивление+80.0%
+977001: Гидро сопротивление+80.0%
+976001: Дендро сопротивление+80.0%
+975001: Анемо сопротивление+80.0%
+974001: Гео сопротивление+80.0%
+973001: Крио сопротивление+80.0%
+972001: Сопротивление физ. урону+80.0%
 971001: Бонус урона+80.0%
 970001: Уменьшение урона+80.0%
 969001: Защита+-500
-968001: Элементальное мастерство+-300
-951001: Здоровье Процент+14.6%
-951002: Атака Процент+14.6%
-951003: Защита Процент+18.2%
-951004: КРИТ Рейтинг+9.7%
-951005: Энергетическая перезарядка+16.2%
-951006: Элементальное мастерство+58
-951007: КРИТИЧЕСКИЙ Урон+19.4%
-952001: Здоровье Процент+14.6%
-952002: Атака Процент+14.6%
-952003: Защита Процент+18.2%
-952004: КРИТ Рейтинг+9.7%
-952005: Энергетическая перезарядка+16.2%
-952006: Элементальное мастерство+58
-952007: КРИТИЧЕСКИЙ Урон+19.4%
-953001: Здоровье Процент+14.6%
-953002: Атака Процент+14.6%
-953003: Защита Процент+18.2%
-953004: КРИТ Рейтинг+9.7%
-953005: Энергетическая перезарядка+16.2%
-953006: Элементальное мастерство+58
-953007: КРИТИЧЕСКИЙ Урон+19.4%
-956001: Здоровье Процент+14.6%
-956002: Атака Процент+14.6%
-956003: Защита Процент+18.2%
-956004: КРИТ Рейтинг+9.7%
-956005: Энергетическая перезарядка+16.2%
-956006: Элементальное мастерство+58
-956007: КРИТИЧЕСКИЙ Урон+19.4%
-941001: Здоровье Процент+9.3%
-941002: Атака Процент+9.3%
-941003: Защита Процент+11.7%
-941004: КРИТ Рейтинг+6.2%
-941005: Энергетическая перезарядка+10.4%
-941006: Элементальное мастерство+37
-941007: КРИТИЧЕСКИЙ Урон+12.4%
-942001: Здоровье Процент+9.3%
-942002: Атака Процент+9.3%
-942003: Защита Процент+11.7%
-942004: КРИТ Рейтинг+6.2%
-942005: Энергетическая перезарядка+10.4%
-942006: Элементальное мастерство+37
-942007: КРИТИЧЕСКИЙ Урон+12.4%
-943001: Здоровье Процент+9.3%
-943002: Атака Процент+9.3%
-943003: Защита Процент+11.7%
-943004: КРИТ Рейтинг+6.2%
-943005: Энергетическая перезарядка+10.4%
-943006: Элементальное мастерство+37
-943007: КРИТИЧЕСКИЙ Урон+12.4%
-946001: Здоровье Процент+9.3%
-946002: Атака Процент+9.3%
-946003: Защита Процент+11.7%
-946004: КРИТ Рейтинг+6.2%
-946005: Энергетическая перезарядка+10.4%
-946006: Элементальное мастерство+37
-946007: КРИТИЧЕСКИЙ Урон+12.4%
-961001: Здоровье Процент+14.6%
-961002: Атака Процент+14.6%
-961003: Защита Процент+18.2%
-961004: КРИТ Рейтинг+9.7%
-961005: Энергетическая перезарядка+16.2%
-961006: Элементальное мастерство+58
-961007: КРИТИЧЕСКИЙ Урон+19.4%
-961008: Здоровье+747
+968001: Мастерство стихий+-300
+951001: Процент здоровья (HP%)+14.6%
+951002: Процент атаки+14.6%
+951003: Процент защиты+18.2%
+951004: Шанс крит. урона+9.7%
+951005: Восстановление энергии+16.2%
+951006: Мастерство стихий+58
+951007: Критический урон+19.4%
+952001: Процент здоровья (HP%)+14.6%
+952002: Процент атаки+14.6%
+952003: Процент защиты+18.2%
+952004: Шанс крит. урона+9.7%
+952005: Восстановление энергии+16.2%
+952006: Мастерство стихий+58
+952007: Критический урон+19.4%
+953001: Процент здоровья (HP%)+14.6%
+953002: Процент атаки+14.6%
+953003: Процент защиты+18.2%
+953004: Шанс крит. урона+9.7%
+953005: Восстановление энергии+16.2%
+953006: Мастерство стихий+58
+953007: Критический урон+19.4%
+956001: Процент здоровья (HP%)+14.6%
+956002: Процент атаки+14.6%
+956003: Процент защиты+18.2%
+956004: Шанс крит. урона+9.7%
+956005: Восстановление энергии+16.2%
+956006: Мастерство стихий+58
+956007: Критический урон+19.4%
+941001: Процент здоровья (HP%)+9.3%
+941002: Процент атаки+9.3%
+941003: Процент защиты+11.7%
+941004: Шанс крит. урона+6.2%
+941005: Восстановление энергии+10.4%
+941006: Мастерство стихий+37
+941007: Критический урон+12.4%
+942001: Процент здоровья (HP%)+9.3%
+942002: Процент атаки+9.3%
+942003: Процент защиты+11.7%
+942004: Шанс крит. урона+6.2%
+942005: Восстановление энергии+10.4%
+942006: Мастерство стихий+37
+942007: Критический урон+12.4%
+943001: Процент здоровья (HP%)+9.3%
+943002: Процент атаки+9.3%
+943003: Процент защиты+11.7%
+943004: Шанс крит. урона+6.2%
+943005: Восстановление энергии+10.4%
+943006: Мастерство стихий+37
+943007: Критический урон+12.4%
+946001: Процент здоровья (HP%)+9.3%
+946002: Процент атаки+9.3%
+946003: Процент защиты+11.7%
+946004: Шанс крит. урона+6.2%
+946005: Восстановление энергии+10.4%
+946006: Мастерство стихий+37
+946007: Критический урон+12.4%
+961001: Процент здоровья (HP%)+14.6%
+961002: Процент атаки+14.6%
+961003: Процент защиты+18.2%
+961004: Шанс крит. урона+9.7%
+961005: Восстановление энергии+16.2%
+961006: Мастерство стихий+58
+961007: Критический урон+19.4%
+961008: Здоровье (HP)+747
 961009: Атака+49
 961010: Защита+5787.0%
-962001: Здоровье Процент+14.6%
-962002: Атака Процент+14.6%
-962003: Защита Процент+18.2%
-962004: КРИТ Рейтинг+9.7%
-962005: Энергетическая перезарядка+16.2%
-962006: Элементальное мастерство+58
-962007: КРИТИЧЕСКИЙ Урон+19.4%
-962008: Здоровье+747
+962001: Процент здоровья (HP%)+14.6%
+962002: Процент атаки+14.6%
+962003: Процент защиты+18.2%
+962004: Шанс крит. урона+9.7%
+962005: Восстановление энергии+16.2%
+962006: Мастерство стихий+58
+962007: Критический урон+19.4%
+962008: Здоровье (HP)+747
 962009: Атака+49
 962010: Защита+58
-963001: Здоровье Процент+14.6%
-963002: Атака Процент+14.6%
-963003: Защита Процент+18.2%
-963004: КРИТ Рейтинг+9.7%
-963005: Энергетическая перезарядка+16.2%
-963006: Элементальное мастерство+58
-963007: КРИТИЧЕСКИЙ Урон+19.4%
-963008: Здоровье+747
+963001: Процент здоровья (HP%)+14.6%
+963002: Процент атаки+14.6%
+963003: Процент защиты+18.2%
+963004: Шанс крит. урона+9.7%
+963005: Восстановление энергии+16.2%
+963006: Мастерство стихий+58
+963007: Критический урон+19.4%
+963008: Здоровье (HP)+747
 963009: Атака+49
 963010: Защита+58
-964001: Здоровье Процент+14.6%
-964002: Атака Процент+14.6%
-964003: Защита Процент+18.2%
-964004: КРИТ Рейтинг+9.7%
-964005: Энергетическая перезарядка+16.2%
-964006: Элементальное мастерство+58
-964007: КРИТИЧЕСКИЙ Урон+19.4%
-964008: Здоровье+747
+964001: Процент здоровья (HP%)+14.6%
+964002: Процент атаки+14.6%
+964003: Процент защиты+18.2%
+964004: Шанс крит. урона+9.7%
+964005: Восстановление энергии+16.2%
+964006: Мастерство стихий+58
+964007: Критический урон+19.4%
+964008: Здоровье (HP)+747
 964009: Атака+49
 964010: Защита+58
-965001: Здоровье Процент+14.6%
-965002: Атака Процент+14.6%
-965003: Защита Процент+18.2%
-965004: КРИТ Рейтинг+9.7%
-965005: Энергетическая перезарядка+16.2%
-965006: Элементальное мастерство+58
-965007: КРИТИЧЕСКИЙ Урон+19.4%
-965008: Здоровье+747
+965001: Процент здоровья (HP%)+14.6%
+965002: Процент атаки+14.6%
+965003: Процент защиты+18.2%
+965004: Шанс крит. урона+9.7%
+965005: Восстановление энергии+16.2%
+965006: Мастерство стихий+58
+965007: Критический урон+19.4%
+965008: Здоровье (HP)+747
 965009: Атака+49
 965010: Защита+58

Source/GrasscutterTools/Resources/ru-ru/Avatar.txt

@@ -52,4 +52,9 @@
 1066:Камисато Аято
 1067:Коллеи
 1068:Дори
-1069:Тигнари
+1069:Тигнари
+1070:Нилу
+1071:Сайно
+1072:Кандакия
+1073:Нахида
+1074:Лайла

Source/GrasscutterTools/Resources/ru-ru/AvatarStats.json

@@ -1,24 +1,24 @@
 [
   {
-    "Name": "Текущая HP",
+    "Name": "Текущее здоровье (HP)",
     "ArgName": "hp",
     "Percent": false,
     "Tip": ""
   },
   {
-    "Name": "Макс. HP",
+    "Name": "Макс. здоровье (HP)",
     "ArgName": "maxhp",
     "Percent": false,
     "Tip": ""
   },
   {
-    "Name": "Текущая силы атаки",
+    "Name": "Текущая сила атаки",
     "ArgName": "atk",
     "Percent": false,
     "Tip": ""
   },
   {
-    "Name": "Базовая атака",
+    "Name": "Базовая сила атаки",
     "ArgName": "atkb",
     "Percent": false,
     "Tip": "Похоже, это не пересчитывает силу атаки и может работать только с классами баффов."
@@ -42,7 +42,7 @@
     "Tip": ""
   },
   {
-    "Name": "Крит. урон",
+    "Name": "Критический урон",
     "ArgName": "cdmg",
     "Percent": true,
     "Tip": ""
@@ -186,7 +186,7 @@
     "Tip": ""
   },
   {
-    "Name": "Игнорировать DEF",
+    "Name": "Игнорирование защиты",
     "ArgName": "defi",
     "Percent": true,
     "Tip": "Это, кажется, не работает."

Source/GrasscutterTools/Resources/ru-ru/CustomCommands.txt

@@ -1,24 +1,26 @@
-Непобедимый
+Непобедимость
 /prop god on
 Неограниченная выносливость
 /prop ns on
-бесконечная энергия
+Бесконечная энергия
 /prop ue on
 60 ранг приключений
 /give 102 x1880200
-Уровень мира
+8 уровень мира
 /prop wl 8
-Разгадка бездны
+Открыть всю карту
+/prop unlockmap 1
+Открыть всю бездну
 /prop ut 12
-Уровень Боевой пропуск
+Макс. уровень БП
 /prop bp 50
-Уровень дружбы
+Макс. уровень дружбы у текущего персонажа
 /setfetterlevel 10
 Лечение
 /h
 Самоубийство
 /kill 0
-Наполнить энергией
+Заспавнить шар с элем. энергией
 /spawn 2008 25
 Текущая позиция
 /pos
@@ -36,29 +38,29 @@
 /reload
 Повторно войти
 /kick
-Очистить рюкзак(ВСЁ)
+Очистить рюкзак (ВСЁ)
 /clear all lv90 r5 5*
-Очистить Оружия
+Очистить только Оружия
 /clear wp lv90 r5 5*
-Очистить Артефакты
+Очистить только Артефакты
 /clear art lv20 5*
-Очистить Материалы
+Очистить только Материалы
 /clear mat
-Сброс текущего Созвездия (Требуется повторный вход в систему)
+Сброс созвездия текущего персонажа (требуется перезаход)
 /resetconst
-Сброс ВСЕ Созвездия (Требуется повторный вход в систему)
+Сброс созвездия ВСЕХ персонажей (требуется перезаход)
 /resetconst all
 Убить всех монстров
 /killall
-Кооператив
+Мультиплеер
 /coop
 Телепортировать всех
 /tpall
 Список всех игроков
 /list uid
-Транслировать
+Сообщение всем
 /say Всем привет~
-Сообщение Сервера
+Сообщение сервера
 /a Добро пожаловать в grasscutter PS!
-Закройте Сервер
+Закрыть сервер
 /stop

Source/GrasscutterTools/Resources/ru-ru/GachaBennerPrefab.txt

@@ -34,6 +34,6 @@
 071:Вечноцветущий пурпур
 076:Лазурный поход
 081:Белая радуга
-091:Tighnari banner (Non original name)
-092:Zhongli banner (Non original name)
-093:Hunter's Path banner (Non original name)
+091:Патруль лесной чащи
+092:Горы и рынки
+093:Охотничья тропа

Source/GrasscutterTools/Resources/ru-ru/Weapon.txt

@@ -21,6 +21,8 @@
 11414:Амэнома Кагэути
 11415:Киноварное веретено
 11416:Кагоцурубэ Иссин
+11417:Деревянный клинок
+11418:Лунное сияние ксифоса
 11419:Легендарный клинок Иссин
 11420:Легендарный клинок Иссин
 11421:Легендарный клинок Иссин
@@ -33,6 +35,7 @@
 11507:Одна Сторона
 11509:Рассекающий туман
 11510:Харан гэппаку фуцу
+11511:Ключ Хадж-нисут
 12101:Двуручный меч богатыря
 12201:Лучший друг наёмника
 12301:Металлическая тень
@@ -54,7 +57,9 @@
 12411:Заснеженное звёздное серебро
 12412:Благодатный владыка вод
 12414:Кацурагикири Нагамаса
+12415:Аквамарин Махайры
 12416:Акуомару
+12417:Регалия леса
 12501:Небесное величие
 12502:Волчья погибель
 12503:Песнь разбитых сосен
@@ -80,6 +85,8 @@
 13414:Крест-копьё Китаин
 13415:«Улов»
 13416:Режущий волны плавник
+13417:Пронзающий луну
+13419:Копьё послания ветров
 13501:Посох Хомы
 13502:Небесная ось
 13504:Покоритель вихря
@@ -87,6 +94,7 @@
 13506:Богоубийство
 13507:Усмиритель бед
 13509:Сияющая жатва
+13511:Посох алых песков
 14101:Записи ученика
 14201:Карманный гримуар
 14301:Руководство по магии
@@ -109,6 +117,8 @@
 14413:Истории Додоко
 14414:Кольцо Хакусин
 14415:Око клятвы
+14416:Скитающаяся звезда
+14417:Плод восполнения
 14501:Небесный атлас
 14502:Молитва святым ветрам
 14503:Утерянная Баллада
@@ -116,6 +126,7 @@
 14505:Древняя Нефритовая Регалия
 14506:Вечное лунное сияние
 14509:Истина кагура
+14511:Сновидения тысячи ночей
 15101:Лук охотника
 15201:Лук опытного охотника
 15301:Лук ворона
@@ -140,6 +151,8 @@
 15414:Хамаюми
 15415:Хищник
 15416:Луна Моун
+15417:Приближённый короля
+15418:Иссушитель
 15501:Небесное крыло
 15502:Лук Амоса
 15503:Элегия погибели

Source/GrasscutterTools/Resources/zh-cn/Animal.txt

@@ -17,12 +17,14 @@
 28010401:藤纹陆鳗鳗
 28010402:深海鳗鳗
 28010403:赤鳍陆鳗鳗
+28010404:流沙鳗鳗
 28020101:雪狐
 28020102:红狐
 28020103:送礼雪狐
 28020104:送大礼雪狐
 28020105:雪狐
 28020106:红狐
+28020108:沙狐
 28020201:松鼠
 28020301:野林猪
 28020302:小野林猪
@@ -147,6 +149,12 @@
 28050222:藏金盗宝鼬
 28050223:大黄金盗宝鼬
 28050301:吉光虫
+28050401:圣金虫
+28060301:赤鹫
+28010304:丛林树蛙
+28060401:毒蝎
+28060501:骆骆驮兽
+28010208:赤尾蜥
 28210101:尘歌壶：黄金蟹
 28210102:尘歌壶：太阳蟹
 28210103:尘歌壶：海蓝蟹
@@ -230,9 +238,7 @@
 28020313:大蕈猪？
 28030313:暝彩鸟
 28020314:蕈猪
-28060101:棘冠鳄
-28060201:长鬓虎
-28060601:牦牦驮兽
+28030104:圣鹮
 28040801:真果角鲀
 28040802:沉波蜜桃
 28040803:吹沙角鲀
@@ -240,8 +246,9 @@
 28040901:青金斧枪鱼
 28040902:翡玉斧枪鱼
 28050106:草晶蝶
-28010304:丛林树蛙
-28010208:赤尾蜥
+28060101:棘冠鳄
+28060201:长鬓虎
+28060601:牦牦驮兽
 31010101:友军 打手丘丘人
 31020101:友军 木盾丘丘暴徒
 31020201:友军 火斧丘丘暴徒

Source/GrasscutterTools/Resources/zh-cn/ArtifactCat.txt

@@ -1,4 +1,4 @@
-20:深林的记忆
+20:深林的记忆
 21:饰金之梦
 51:行者之心
 52:勇士之心

Source/GrasscutterTools/Resources/zh-cn/Avatar.txt

@@ -52,4 +52,9 @@
 1066:神里绫人
 1067:柯莱
 1068:多莉
-1069:提纳里
+1069:提纳里
+1070:妮露
+1071:赛诺
+1072:坎蒂丝
+1073:纳西妲
+1074:莱依拉

Source/GrasscutterTools/Resources/zh-cn/CustomCommands.txt

@@ -4,25 +4,27 @@
 /prop ns on
 无限能量
 /prop ue on
-升到60级
+冒险等阶升60级
 /give 102 x1880200
-设置世界等级
+设置世界等级8
 /prop wl 8
-一键解锁深渊
+点亮地图
+/prop unlockmap 1
+一键解锁深渊12层
 /prop ut 12
-设置纪行等级
+设置纪行等级50
 /prop bp 50
-设置好感等级
+设置好感等级10
 /setfetterlevel 10
-奶
+回血
 /h
 自杀
 /kill 0
 全队充能
 /spawn 2008 25
-我在哪？
+查看坐标
 /pos
-我全都要！
+获取全部物品
 /give all x9999 lv90 c6 r5
 一万纠缠
 /give 223 x10000
@@ -48,13 +50,13 @@
 /clear art lv20 5*
 清空材料
 /clear mat
-清场
+击杀全部怪物
 /killall
-进入多人
+进入多人游戏
 /coop
-速速集合！
+[多人游戏]全体传送
 /tpall
-都有谁在？
+玩家列表
 /list uid
 发送广播
 /say 大家好啊~

Source/GrasscutterTools/Resources/zh-cn/Item.txt

@@ -41,6 +41,13 @@
 143:巧思手记
 144:随想草稿
 145:古铁钱
+147:节庆热度
+148:营业收入
+149:可用资金
+150:巧策灵感
+151:蘑菇宝钱
+152:灵蕈奖章
+153:绮碎斑晶
 201:原石
 202:摩拉
 203:创世结晶
@@ -126,6 +133,11 @@
 1067:柯莱
 1068:多莉
 1069:提纳里
+1070:妮露
+1071:赛诺
+1072:坎蒂丝
+1073:纳西妲
+1074:莱依拉
 1102:神里绫华的命星
 1103:琴的命星
 1105:旅行者（男）的命星
@@ -181,6 +193,11 @@
 1167:柯莱的命星
 1168:多莉的命星
 1169:提纳里的命星
+1170:妮露的命星
+1171:赛诺的命星
+1172:坎蒂丝的命星
+1173:纳西妲的命星
+1174:莱依拉的命星
 1201:珍珠纪行·初稿
 1202:空月祝福·新月
 2001:元素能量球(火)
@@ -1160,6 +1177,9 @@
 101217:劫波莲
 101218:墩墩桃
 101219:须弥蔷薇
+101220:赤念果
+101221:枣椰
+101225:圣金虫
 101226:活化的星蕈
 101227:枯焦的星蕈
 101228:毗波耶
@@ -1635,6 +1655,31 @@
 101965:普通的木头
 101966:愚人众的餐食
 101967:箱底的藏宝图
+101968:闪烁的零件
+101969:圣章石·谷地
+101970:圣章石·鸟首
+101971:圣章石·举臂
+101972:圣章石·沙暴
+101973:圣章石·耳郭
+101974:圣章石·树木
+101975:圣章石·雷霆
+101976:圣章石·危险
+101977:圣章石·凿锤
+101978:圣章石·日升
+101979:圣章石·王权
+101980:圣章石·羊首
+101981:圣章石·鳄首
+101982:圣章石·巨蛇
+101983:圣章石·祭祀
+101984:圣章石·劳作
+101985:圣章石·沙丘
+101986:(test)黑乎乎的怪东西
+101987:金蔷薇种子
+101988:透明遗迹的记录·其一
+101989:吞羊岩的记录
+101990:饱饮之陵的记录
+101991:索赫尔的考古笔记
+101992:阿如的倒影的记录
 101993:暮夜剧团团长的手稿
 101994:刚摘下的香辛果
 101995:没有署名的纸条
@@ -1642,6 +1687,7 @@
 101997:重熔装置
 101998:重熔片剂
 101999:雇主的命令
+102000:泛着土色的不明物体
 102001:火元素晶片
 102002:水元素晶片
 102003:草元素晶片
@@ -2206,6 +2252,33 @@
 108445:奇怪的奶香菌菇脆塔
 108446:奶香菌菇脆塔
 108447:美味的奶香菌菇脆塔
+108448:奇怪的椰炭饼
+108449:椰炭饼
+108450:美味的椰炭饼
+108451:奇怪的千层酥酥
+108452:千层酥酥
+108453:美味的千层酥酥
+108454:奇怪的枣椰蜜糖
+108455:枣椰蜜糖
+108456:美味的枣椰蜜糖
+108457:奇怪的帕蒂沙兰布丁
+108458:帕蒂沙兰布丁
+108459:美味的帕蒂沙兰布丁
+108460:奇怪的阿如拌饭
+108461:阿如拌饭
+108462:美味的阿如拌饭
+108463:？？？
+108464:？？？
+108465:？？？
+108466:婆娑一舞
+108467:决斗之魂
+108468:关怀备至
+108469:？？？
+108470:奇怪的蔷薇奶糊
+108471:蔷薇奶糊
+108472:美味的蔷薇奶糊
+108473:安眠奢想
+108474:哈瓦玛玛兹
 109000:食谱道具
 109101:食谱：野菇鸡肉串
 109102:食谱：渔人吐司
@@ -2334,6 +2407,13 @@
 109508:食谱：肉肉烤蘑菇披萨
 109509:食谱：日落莓莓茶
 109510:食谱：奶香菌菇脆塔
+109511:食谱：椰炭饼
+109512:食谱：千层酥酥
+109513:食谱：枣椰蜜糖
+109514:食谱：帕蒂沙兰布丁
+109515:食谱：阿如拌饭
+109516:？？？
+109517:食谱：蔷薇奶糊
 110000:合成产物
 110001:面粉
 110002:奶油
@@ -2441,6 +2521,9 @@
 112068:混沌容器
 112069:混沌模块
 112070:混沌锚栓
+112071:破缺棱晶
+112072:混浊棱晶
+112073:辉光棱晶
 113001:飓风之种
 113002:雷光棱镜
 113003:东风之翎
@@ -2478,6 +2561,12 @@
 113035:符纹之齿
 113036:蕈王钩喙
 113037:藏雷野实
+113038:永续机芯
+113039:导光四面体
+113040:灭诤草蔓
+113041:？？？(散兵周本材料)
+113042:？？？(散兵周本材料)
+113043:？？？(散兵周本材料)
 114001:高塔孤王的破瓦
 114002:高塔孤王的残垣
 114003:高塔孤王的断片
@@ -2621,6 +2710,9 @@
 120026:浮槃歌卷·卷二
 120027:浮槃歌卷·卷三
 120028:灵光颂
+120029:透明遗迹的记录·其二
+120030:透明遗迹的记录·其三
+120031:陈旧的钥匙
 120032:启封的羊皮卷
 120033:引路的羊皮卷
 120034:低语的羊皮卷
@@ -2632,7 +2724,70 @@
 120040:须弥考察队的笔记
 120041:解剖记录
 120042:残破的出勤记录
+120043:？？？
+120044:？？？
+120045:？？？
+120046:？？？
+120047:病历记录
+120048:诊断报告
+120049:沙瓦玛的「采购资金」
+120050:曲清的「采购资金」
+120051:关垂的「采购资金」
+120052:扎卡里亚开给马鲁夫的「药方」
+120053:扎卡里亚开给马鲁夫的「药方」
+120054:扎卡里亚开给马鲁夫的「药方」
+120055:（test）马鲁夫的万能药包
+120056:扎卡里亚给马鲁夫的药
+120057:（test）蕈兽孢粉
+120058:（test）新鲜的须弥蔷薇
 120059:字迹优雅的笔记本
+120060:（test）仙人掌凝胶
+120061:内尔敏制作的「薄荷豆汤」
+120062:（test）内尔敏做的香水
+120063:未来星
+120065:里夫的包裹
+120066:内尔敏的香料
+120067:锁钥之石·其一
+120068:《千夜故事集·一》残页
+120069:《千夜故事集·二》残页
+120070:《千夜故事集·三》残页
+120071:《千夜故事集·四》残页
+120072:《千夜故事集·五》残页
+120073:《千夜故事集·六》残页
+120074:千夜故事集·一
+120075:千夜故事集·二
+120076:千夜故事集·三
+120077:千夜故事集·四
+120078:千夜故事集·五
+120079:千夜故事集·六
+120080:萨梅尔的留言
+120081:萨梅尔的留言
+120082:沙瓦玛的订货单据
+120083:曲清的订货单据
+120084:关垂的订货单据
+120113:？？？
+120114:？？？
+120115:？？？
+120116:？？？
+120117:锁钥之石·其二
+120118:阿扎莱的货款
+120119:拉玛的收货单
+120120:布特罗斯的收货单
+120121:朱特的收货单
+120122:贾汉吉尔的收货单
+120123:？？？
+120125:（test）赛芭的蔷薇
+120127:？？？
+120152:？？？
+120153:？？？
+120154:？？？
+120155:？？？
+120156:？？？
+120157:？？？
+120158:？？？
+120159:？？？
+120160:？？？
+120161:？？？
 130001:「霓裳花」的种子
 130002:「甜甜花」的种子
 130003:「塞西莉亚花」的种子
@@ -2779,6 +2934,12 @@
 141079:旋曜玉帛·其七十九
 141080:旋曜玉帛·其八十
 141081:旋曜玉帛·其八十一
+141082:旋曜玉帛·其八十二
+141083:旋曜玉帛·其八十三
+141084:旋曜玉帛·其八十四
+141085:旋曜玉帛·其八十五
+141086:旋曜玉帛·其八十六
+141087:旋曜玉帛·其八十七
 200001:灯纸纤维
 200002:灯芯绒材
 200003:浮生石片
@@ -2794,6 +2955,7 @@
 200109:明目之油膏
 200110:霞色宝珠
 200111:原海鱼油
+200112:迁风的苍翎
 200201:鹰隼之舞
 200202:铁翼
 200203:风之泉
@@ -2862,6 +3024,11 @@
 200903:鸣川鹈饲
 200904:长绳系月
 200905:盘缘
+207000:非花非雾
+207100:衡断之心	
+207200:沙漠与夜
+207300:万识一偈
+207400:梦里星
 210001:原神·印象
 210002:纪行·捕风
 210003:安柏·兔兔
@@ -2990,6 +3157,16 @@
 210130:须弥·瑶林
 210131:须弥·照览
 210132:须弥·正明
+210133:纪行·归风
+210134:？？？
+210135:？？？
+210136:？？？
+210137:成就·七芒
+210138:须弥·踏沙
+210139:成就·镜梦
+210140:纳西妲·？？？
+210141:莱依拉·？？？
+210142:纪行·蕈原
 220001:风神瞳共鸣石
 220002:岩神瞳共鸣石
 220003:岩之寻宝罗盘
@@ -3049,10 +3226,16 @@
 220061:「寻宝仙灵」
 220062:迷你仙灵·苔绿
 220063:精致的「留影机」
+220064:芭努的智慧
 220065:鱼线稳定器
 220066:老旧的诗琴
+220067:？？？
+220068:(test)赤沙石板
+220069:赤沙石板
 220070:「清冽水沫留影机」
 220071:「苦舍桓」
+220073:「意智宝珠」
+220074:？？？
 221001:说明：风神瞳共鸣石
 221002:说明：岩神瞳共鸣石
 221003:图谱：岩之寻宝罗盘
@@ -3086,6 +3269,7 @@
 221057:说明：草神瞳共鸣石
 221058:图谱：草之寻宝罗盘
 222001:「绘绮之枕印」
+222002:「烟林之真果」
 223001:云山复沓百雨金
 223002:银夜点注满天星
 223003:霁青杳漫染寒英
@@ -3211,6 +3395,7 @@
 381208:垂香木商铺立柜
 381209:枫木书柜-「墨染书心」
 381210:枫木书柜-「千卷柜藏」
+381212:test阿如村室内书柜1
 381301:厚重的图书馆长桌
 381302:骑士团的办公桌
 381303:骑士团的会议桌
@@ -3227,11 +3412,16 @@
 381315:孔雀木「石定」茶桌
 381316:茶室长桌-「座无隙」
 381317:辉木旋台制陶桌
+381318:test阿如村室内桌子1
+381328:test阿如村室内陶罐1
 381401:柔风加护的床榻
 381402:烟霞云梦榻
 381403:梦见木「樱眠」床榻
 381501:松木客栈柜台
 381502:茶室柜台-「十四丸」
+381503:test阿如村室内厨台
+381504:test阿如村室内火炉1
+381505:test阿如村室内木阶梯1
 382101:柔软的会客厅沙发
 382102:「晴空蓝的午后」
 382103:「坚定意志」
@@ -3264,6 +3454,8 @@
 382225:素浄宝瓶-「鞍褐」
 382226:素浄宝瓶-「赭黄」
 382227:素浄宝瓶-「陶棕」
+382229:test阿如村室内陶罐2
+382231:test须弥室内香炉bp用
 382301:蒙德地毯-「明红的热忱」
 382302:蒙德地毯-「不倦的寻索」
 382303:客栈地毯-「宾至如归」
@@ -3271,11 +3463,15 @@
 382305:「青琅般辉煌之纹」
 382306:「阳橙般夺目之纹」
 382307:「椰褐般深沉之纹」
+382308:test阿如村室内地毯1
+382309:test通用室内地毯4
 383101:恒亮不熄的提灯
 383102:琉璃亭却砂木立灯
 383103:天圆灯笼-「明烛兰芳」
 383104:贝壳灯罩硬质台灯
 383106:「澄凝的星光」
+383107:test阿如村室内地灯1
+381108:test阿如村室内柜子1
 383201:花卉瓶栽-「淡蓝的从容」
 383202:绿植盆栽-「澄澈的清风」
 383203:花卉瓶栽-「盛放的曙红」
@@ -3304,6 +3500,9 @@
 383322:「天象寰转」
 383325:「丛茂的片段」
 383326:「放欢的形姿」
+383330:test阿如村室内茶具套装
+383331:test阿如村室内桌面摆件
+383332:test阿如村室内桌面香炉
 384101:风景画-「乡野民居」
 384102:风景画-「远空层云」
 384103:风景画-「无名高崖」
@@ -3325,6 +3524,9 @@
 384209:壁挂式记录板
 384210:壁挂式广告牌
 384211:锦缎布帘
+384213:test须弥盾牌墙面挂饰
+384214:test阿如村室内墙面布帘1
+384215:test阿如村室内墙面装饰1
 384501:「萦绊之刻」
 390101:干草庐屋
 390102:干草货站
@@ -3423,6 +3625,12 @@
 390702:「林居之人的恰切」
 390703:「林居之人的孤念」
 390704:「林居之人的秉意」
+390705:test阿如村建筑1
+390706:test阿如村建筑2
+390707:test阿如村建筑3
+390708:test阿如村建筑4
+390709:test阿如村建筑5
+390710:test阿如村建筑6
 391101:花鸟喷泉
 391102:丘丘螺旋瞭望塔
 391103:丘丘简易草棚
@@ -3439,6 +3647,10 @@
 391118:外景奇石-「飞升腾实」
 391119:岩厂吊车-「移山」
 391120:岩厂吊车-「平丘」
+391122:test阿如村棚子1
+391123:test阿如村棚子2
+391124:test阿如村棚子3
+391125:test阿如村棚子4
 391201:三眼守仙牌
 391202:桦木庭院正门
 391203:雕花庭院墙尾
@@ -3471,6 +3683,9 @@
 391230:温泉门厅-「避凉」
 391235:「渔采的边际之墙」
 391236:「渔采的绝对界线」
+391237:test阿如村楼梯
+391238:test阿如村围墙墙体长
+391239:test阿如村围墙墙体短
 392107:铸石地基-「运开时泰」
 393101:交错放置的杉木货箱
 393102:有序叠放的杉木酒桶
@@ -3672,6 +3887,7 @@
 361105:高大的桦木衣柜
 361106:却砂木金纹衣柜
 361107:辉木白本置物架
+361108:test阿如村室内柜子1
 361201:图书馆双层书架
 361202:萃华木臻品书架
 361203:萃华木经济书架
@@ -3682,6 +3898,7 @@
 361208:垂香木商铺立柜
 361209:枫木书柜-「墨染书心」
 361210:枫木书柜-「千卷柜藏」
+361212:test阿如村室内书柜1
 361301:厚重的图书馆长桌
 361302:骑士团的办公桌
 361303:骑士团的会议桌
@@ -3698,11 +3915,15 @@
 361315:孔雀木「石定」茶桌
 361316:茶室长桌-「座无隙」
 361317:辉木旋台制陶桌
+361318:test阿如村室内桌子1
 361401:柔风加护的床榻
 361402:烟霞云梦榻
 361403:梦见木「樱眠」床榻
 361501:松木客栈柜台
 361502:茶室柜台-「十四丸」
+361503:test阿如村室内厨台
+361504:test阿如村室内火炉1
+361505:test阿如村室内木阶梯1
 362101:柔软的会客厅沙发
 362102:「晴空蓝的午后」
 362103:「坚定意志」
@@ -3737,6 +3958,9 @@
 362225:素浄宝瓶-「鞍褐」
 362226:素浄宝瓶-「赭黄」
 362227:素浄宝瓶-「陶棕」
+362228:test阿如村室内陶罐1
+362229:test阿如村室内陶罐2
+362231:test须弥室内香炉bp用
 362301:蒙德地毯-「明红的热忱」
 362302:蒙德地毯-「不倦的寻索」
 362303:客栈地毯-「宾至如归」
@@ -3744,12 +3968,15 @@
 362305:「青琅般辉煌之纹」
 362306:「阳橙般夺目之纹」
 362307:「椰褐般深沉之纹」
+362308:test阿如村室内地毯1
+362309:test通用室内地毯4
 363101:恒亮不熄的提灯
 363102:琉璃亭却砂木立灯
 363103:天圆灯笼-「明烛兰芳」
 363104:贝壳灯罩硬质台灯
 363105:「辉光灵闪」
 363106:「澄凝的星光」
+363107:test阿如村室内地灯1
 363201:花卉瓶栽-「淡蓝的从容」
 363202:绿植盆栽-「澄澈的清风」
 363203:花卉瓶栽-「盛放的曙红」
@@ -3784,6 +4011,12 @@
 363324:「毗波耶」
 363325:「丛茂的片段」
 363326:「放欢的形姿」
+363327:test沙漠蔷薇标本
+363328:？？？
+363329:？？？
+363330:test阿如村室内茶具套装
+363331:test阿如村室内桌面摆件
+363332:test阿如村室内桌面香炉
 364101:风景画-「乡野民居」
 364102:风景画-「远空层云」
 364103:风景画-「无名高崖」
@@ -3806,6 +4039,9 @@
 364210:壁挂式广告牌
 364211:锦缎布帘
 364212:「创龙点睛奇象」
+364213:test须弥盾牌墙面挂饰
+364214:test阿如村室内墙面布帘1
+364215:test阿如村室内墙面装饰1
 364301:垂香木窗格房门
 364302:骑士团杉木房门
 364303:垣屋枫木房门
@@ -3890,6 +4126,11 @@
 368152:提纳里
 368153:柯莱
 368154:多莉
+368155:妮露
+368156:赛诺
+368157:坎蒂丝
+368158:纳西妲
+368159:莱依拉
 369101:翠目猫
 369102:北地犬
 369103:野林猪
@@ -3953,6 +4194,11 @@
 369161:小蕈猪
 369162:蕈猪
 369163:暝彩鸟
+369164:圣鹮
+369165:面具鼬
+369166:圣金虫
+369167:流沙鳗鳗
+369168:沙狐
 370101:干草庐屋
 370102:干草货站
 370103:璃月民居-「餐松饮涧」
@@ -4051,6 +4297,12 @@
 370702:「林居之人的恰切」
 370703:「林居之人的孤念」
 370704:「林居之人的秉意」
+370705:test阿如村建筑1
+370706:test阿如村建筑2
+370707:test阿如村建筑3
+370708:test阿如村建筑4
+370709:test阿如村建筑5
+370710:test阿如村建筑6
 371101:花鸟喷泉
 371102:丘丘螺旋瞭望塔
 371103:丘丘简易草棚
@@ -4067,6 +4319,10 @@
 371118:外景奇石-「飞升腾实」
 371119:岩厂吊车-「移山」
 371120:岩厂吊车-「平丘」
+371122:test阿如村棚子1
+371123:test阿如村棚子2
+371124:test阿如村棚子3
+371125:test阿如村棚子4
 371201:三眼守仙牌
 371202:桦木庭院正门
 371203:雕花庭院墙尾
@@ -4103,6 +4359,9 @@
 371234:「幻梦的门扉」
 371235:「渔采的边际之墙」
 371236:「渔采的绝对界线」
+371237:test阿如村楼梯
+371238:test阿如村围墙墙体长
+371239:test阿如村围墙墙体短
 372101:外景磐石-「却笠」
 372102:外景磐石-「磈垒」
 372103:外景磐石-「碧峭」
@@ -4110,6 +4369,8 @@
 372105:外景磐石-「天阶」
 372106:外景磐石-「玲珑」
 372107:铸石地基-「运开时泰」
+372108:test须弥沙漠乐高1
+372109:test须弥沙漠乐高2
 372201:伏青石
 372202:齐身石
 372203:帝台石
@@ -4137,6 +4398,8 @@
 372225:寂修石
 372226:涉浪石
 372227:温泉白石-「秘火」
+372228:test须弥沙漠山石1
+372229:test须弥沙漠山石2
 372301:「归风的苍色」
 372302:银钩白椰树
 372303:明沙白椰树
@@ -4223,6 +4486,21 @@
 372451:杏黄枯叶菇
 372452:沙褐穹窿菇
 372453:安淳伞叶
+372454:test须弥沙漠植被1
+372455:test须弥沙漠植被2
+372456:test须弥沙漠植被3
+372457:test须弥沙漠植被4
+372458:test须弥沙漠植被5
+372459:test须弥沙漠植被6
+372460:test须弥沙漠植被6
+372461:test须弥沙漠植被8
+372462:test须弥沙漠植被9
+372463:test须弥沙漠植被10
+372464:test须弥沙漠植被11
+372465:test须弥沙漠植被12
+372466:test须弥沙漠植被13
+372467:test须弥沙漠植被14
+372468:test须弥沙漠植被15
 372501:贵本之道-「玄此玉田」
 372502:贵本之道-「薿此芝田」
 372503:贵本之道-「楚此渚田」
@@ -4525,6 +4803,22 @@
 374503:铸石地基-「倍道兼行」
 374504:绿野碧茵-「饼干石路」
 374505:铸石地基-「鸿图华构」
+374700:test主角摊位
+374701:test顶棚_红
+374702:test顶棚_绿
+374703:test顶棚_蓝
+374704:test侧边景观_1
+374705:test侧边景观_2
+374706:test侧边景观_3
+374707:test挂饰A_1
+374708:test挂饰A_2
+374709:test挂饰A_3
+374710:test挂饰B_1
+374711:test挂饰B_2
+374712:test挂饰B_3
+374713:test店铺前装饰_1
+374714:test店铺前装饰_2
+374715:test店铺前装饰_3
 375101:蒙德宅邸-「向风的庄园」
 375103:稻妻垣屋-「雅练上邸」
 376101:闲趣机关-「冲刺节拍」
@@ -4598,4 +4892,148 @@
 379027:暮云角鲀
 379028:青金斧枪鱼
 379029:翡玉斧枪鱼
-3750102:璃月古宅-「画阁朱楼」
+3750102:璃月古宅-「画阁朱楼」
+350060:摆设套装图纸·test护林员
+350061:摆设套装图纸·test珠宝店
+350062:摆设套装图纸·test烤肉店
+350063:摆设套装图纸·test教令院风格图书馆
+350064:摆设套装图纸·test室内睡房
+350065:摆设套装图纸·test阿如村室内
+350066:摆设套装图纸·test大巴扎
+350067:摆设套装图纸·test林中村落
+350068:摆设套装图纸·test剧场
+350069:摆设套装图纸·test维摩庄
+350070:摆设套装图纸·test阿如村室外
+350071:摆设套装图纸·test佣兵兵营
+350072:摆设套装图纸·test花园
+350073:摆设套装图纸·test须弥植被
+360104:test须弥室内墙
+360204:test须弥室内地板
+360304:test须弥室内天花板
+360422:test须弥城灯具1
+360423:test须弥城灯具2
+360424:test须弥城灯具3
+360504:test须弥室内吊灯
+361109:test须弥室内柜子1
+361110:test须弥室内床头柜
+361211:？？？
+361213:test教令院书架1
+361214:test教令院书架2
+361319:test烤肉店沙拉小桌
+361320:test烤肉店桌子
+361321:test须弥室内桌子
+361404:test须弥室内床1BP
+361405:test须弥卧室床
+361506:test烤肉店吧台
+362109:test须弥室内椅子1
+362110:test须弥室内椅子2
+362111:test烤肉店吧台椅
+362232:test提纳里盆栽
+362233:test提纳里仪器
+362234:test柯莱行囊架
+362235:test柯莱火炉与厨具
+362236:test烤肉店烤肉炉
+362237:test烤肉店烤肉架
+363108:test须弥立灯家具
+363333:？？？
+363334:test「意智宝珠」模型
+363335:test珠宝店首饰盒
+363336:test珠宝店彩饰盘
+363337:test珠宝店酒具与瓶子组合
+364216:test提纳里标本架
+364304:test须弥室内房门
+364404:test须弥室内转角阶梯
+364505:？？？
+370711:test须弥辅建筑其一
+370712:test须弥辅建筑其二
+370713:test须弥辅建筑其三
+370714:test须弥辅建筑其四
+370715:test须弥辅建筑其五
+370716:test须弥辅建筑其六
+370717:test蕈兽活动舞台
+370718:test银行建筑1
+370719:test主城烤肉店
+370720:test主城咖啡馆
+370721:test主城铁匠铺
+370722:test灯塔建筑1 
+370723:test花园亭子
+370724:test寂静院亭子1
+370725:test剧场建筑
+370726:test下城区建筑1
+370727:test下城区建筑2
+370728:test下城区建筑3
+370729:test城市通用建筑
+371126:test剧场小喷泉
+371127:test教令院喷泉
+372335:test须弥森林特殊树1
+372336:test须弥森林特殊树2
+372337:test须弥森林特殊树3
+372338:test须弥通用树1
+372339:test须弥通用树2
+372469:test剧场花卉
+372470:test须弥通用灌木1 
+372471:test须弥通用灌木2 
+372472:test须弥通用灌木3 
+372473:test须弥通用灌木4 
+372474:test须弥通用灌木5 
+372606:test须弥浮空木桥其一 
+372607:test须弥浮空木桥其二 
+373147:？？？
+373209:test剧场花坛
+373210:test寂静院花坛
+373361:test佣兵团旗帜
+375104:须弥穹居-「静虑寓所」
+380104:test须弥室内墙
+380204:test须弥室内地板
+380304:test须弥室内天花板
+380422:test须弥城灯具1
+380423:test须弥城灯具2
+380424:test须弥城灯具3
+380504:test须弥室内吊灯
+381109:test须弥室内柜子1
+381110:test须弥室内床头柜
+381213:test教令院书架1
+381214:test教令院书架2
+381319:test烤肉店沙拉小桌
+381320:test烤肉店桌子
+381321:test须弥室内桌子
+381404:test须弥室内床1BP
+381405:test须弥卧室床
+381506:test烤肉店吧台
+382109:test须弥室内椅子1
+382110:test须弥室内椅子2
+382111:test烤肉店吧台椅
+382232:test提纳里盆栽
+382233:test提纳里仪器
+382234:test柯莱行囊架
+382235:test柯莱火炉与厨具
+382236:test烤肉店烤肉炉
+382237:test烤肉店烤肉架
+383108:test须弥立灯家具
+383335:test珠宝店首饰盒
+383336:test珠宝店彩饰盘
+383337:test珠宝店酒具与瓶子组合
+384216:test提纳里标本架
+390711:test须弥辅建筑其一
+390712:test须弥辅建筑其二
+390713:test须弥辅建筑其三
+390714:test须弥辅建筑其四
+390715:test须弥辅建筑其五
+390716:test须弥辅建筑其六
+390718:test银行建筑1
+390719:test主城烤肉店
+390720:test主城咖啡馆
+390721:test主城铁匠铺
+390722:test灯塔建筑1
+390723:test花园亭子
+390724:test寂静院亭子1
+390725:test剧场建筑
+390726:test下城区建筑1
+390727:test下城区建筑2
+390728:test下城区建筑3
+390729:test城市通用建筑
+391126:test剧场小喷泉
+391127:test教令院喷泉
+393209:test剧场花坛
+393210:test寂静院花坛
+393361:test佣兵团旗帜

Source/GrasscutterTools/Resources/zh-cn/Monster.txt

@@ -51,6 +51,7 @@
 20040401:无相之水
 20040501:无相之冰
 20040601:无相之火
+20040701:无相之草
 20050101:纯水精灵
 20050102:纯水精灵
 20050201:纯水之猪
@@ -338,6 +339,7 @@
 29060201:祸津御建鸣神命
 29060202:祸津御建鸣神命
 29060203:祸津御建鸣神命
+29070101:散兵·正机之神
 20060701:草飘浮灵
 24030201:遗迹龙兽·地巡
 24030101:遗迹龙兽·空巡
@@ -359,4 +361,17 @@
 26090901:陆行水本真蕈
 26120101:有翼草本真蕈
 26120201:有翼冰本真蕈
-26110101:翠翎恐蕈
+26110101:翠翎恐蕈
+24030301:兆载永劫龙兽
+24040101:元能构装体·力场发生器
+24040201:元能构装体·重塑仪
+24040301:元能构装体·勘探机
+24050101:半永恒统辖矩阵
+25410201:镀金旅团·灵风猎手
+25410101:镀金旅团·魔岩役使
+26090301:浮游风蕈兽
+26090601:旋转火蕈兽
+26091001:伸缩雷蕈兽
+26120401:陆行岩本真蕈
+20040701:无相之草
+29070101:?????(散兵·正机之神)