Update Version to v1.5.2

Add `gachaTimesLimit` property

Source/GrasscutterTools/Forms/FormMain.Designer.cs

@@ -35,6 +35,7 @@ namespace GrasscutterTools.Forms
             this.GrpCommand = new System.Windows.Forms.GroupBox();
             this.BtnInvokeOpenCommand = new System.Windows.Forms.Button();
             this.TPRemoteCall = new System.Windows.Forms.TabPage();
+            this.LblHostTip = new System.Windows.Forms.Label();
             this.GrpServerStatus = new System.Windows.Forms.GroupBox();
             this.LnkOpenCommandLabel = new System.Windows.Forms.LinkLabel();
             this.LblOpenCommandSupport = new System.Windows.Forms.Label();
@@ -316,15 +317,22 @@ namespace GrasscutterTools.Forms
             // 
             // TPRemoteCall
             // 
+            resources.ApplyResources(this.TPRemoteCall, "TPRemoteCall");
+            this.TPRemoteCall.Controls.Add(this.LblHostTip);
             this.TPRemoteCall.Controls.Add(this.GrpServerStatus);
             this.TPRemoteCall.Controls.Add(this.GrpRemoteCommand);
             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;
             // 
+            // LblHostTip
+            // 
+            resources.ApplyResources(this.LblHostTip, "LblHostTip");
+            this.LblHostTip.ForeColor = System.Drawing.SystemColors.GrayText;
+            this.LblHostTip.Name = "LblHostTip";
+            // 
             // GrpServerStatus
             // 
             resources.ApplyResources(this.GrpServerStatus, "GrpServerStatus");
@@ -378,14 +386,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);
@@ -393,7 +402,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;
             // 
@@ -465,11 +473,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;
             // 
@@ -514,10 +522,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;
             // 
@@ -542,10 +550,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;
             // 
@@ -563,8 +571,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";
@@ -586,8 +594,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";
@@ -685,10 +693,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
@@ -734,6 +742,7 @@ 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);
@@ -748,7 +757,6 @@ 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.Name = "TPScene";
             this.TPScene.UseVisualStyleBackColor = true;
             // 
@@ -883,6 +891,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPItem
             // 
+            resources.ApplyResources(this.TPItem, "TPItem");
             this.TPItem.Controls.Add(this.LblClearGiveItemLogs);
             this.TPItem.Controls.Add(this.BtnSaveGiveItemLog);
             this.TPItem.Controls.Add(this.BtnRemoveGiveItemLog);
@@ -895,7 +904,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;
             // 
@@ -1013,6 +1021,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPWeapon
             // 
+            resources.ApplyResources(this.TPWeapon, "TPWeapon");
             this.TPWeapon.Controls.Add(this.TxtWeaponFilter);
             this.TPWeapon.Controls.Add(this.LblWeaponDescription);
             this.TPWeapon.Controls.Add(this.LblWeaponRefinement);
@@ -1022,7 +1031,6 @@ 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;
             // 
@@ -1119,12 +1127,12 @@ namespace GrasscutterTools.Forms
             // 
             // TPStats
             // 
+            resources.ApplyResources(this.TPStats, "TPStats");
             this.TPStats.Controls.Add(this.LblResetStatsCommand);
             this.TPStats.Controls.Add(this.LblResetStatsTip);
             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;
             // 
@@ -1153,9 +1161,9 @@ namespace GrasscutterTools.Forms
             // 
             // 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
@@ -1181,9 +1189,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);
             // 
@@ -1243,6 +1251,7 @@ 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);
@@ -1252,7 +1261,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;
             // 
@@ -1338,6 +1346,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPSpawn
             // 
+            resources.ApplyResources(this.TPSpawn, "TPSpawn");
             this.TPSpawn.Controls.Add(this.LblClearSpawnLogs);
             this.TPSpawn.Controls.Add(this.BtnSaveSpawnLog);
             this.TPSpawn.Controls.Add(this.BtnRemoveSpawnLog);
@@ -1350,7 +1359,6 @@ 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;
             // 
@@ -1491,13 +1499,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;
             // 
@@ -1569,6 +1577,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);
@@ -1588,7 +1597,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;
             // 
@@ -1754,6 +1762,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);
@@ -1761,7 +1770,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;
             // 
@@ -1825,12 +1833,12 @@ namespace GrasscutterTools.Forms
             // 
             // TPHome
             // 
+            resources.ApplyResources(this.TPHome, "TPHome");
             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;
             // 
@@ -1889,9 +1897,9 @@ namespace GrasscutterTools.Forms
             // 
             // 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);
             // 
@@ -2235,5 +2243,6 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.NumericUpDown NUDAvatarConstellation;
         private System.Windows.Forms.Label LblConstellationTip;
         private System.Windows.Forms.Button BtnGiveAllChar;
+        private System.Windows.Forms.Label LblHostTip;
     }
 }

Source/GrasscutterTools/Forms/FormMain.cs

@@ -67,6 +67,10 @@ namespace GrasscutterTools.Forms
             InitStatList();
             InitPermList();
             InitQuestList();
+
+            ChangeTPArtifact();
+            ChangeBtnGiveAllChar();
+
         }
 
         private void FormMain_FormClosed(object sender, FormClosedEventArgs e)
@@ -163,22 +167,6 @@ namespace GrasscutterTools.Forms
 #endif
         }
 
-        // 新命令给予的圣遗物等级与游戏内对应
-        private void ChangeTPArtifact()
-        {
-            if (ChkNewCommand.Checked)
-            {
-                NUDArtifactLevel.Minimum = 0;
-                NUDArtifactLevel.Maximum = 20;
-            }
-            else
-            {
-                NUDArtifactLevel.Minimum = 1;
-                NUDArtifactLevel.Maximum = 21;
-            }
-            LblArtifactLevelTip.Text = $"[{NUDArtifactLevel.Minimum}-{NUDArtifactLevel.Maximum}]";
-        }
-
         #endregion - 初始化 -
 
         #region - 主页 -
@@ -229,6 +217,7 @@ namespace GrasscutterTools.Forms
         private void ChkNewCommand_CheckedChanged(object sender, EventArgs e)
         {
             ChangeTPArtifact();
+            ChangeBtnGiveAllChar();
         }
 
         #endregion - 主页 -
@@ -555,6 +544,21 @@ namespace GrasscutterTools.Forms
             ArtifactInputChanged(null, EventArgs.Empty);
         }
 
+        private void ChangeTPArtifact()
+        {
+            if (ChkNewCommand.Checked)
+            {
+                NUDArtifactLevel.Minimum = 0;
+                NUDArtifactLevel.Maximum = 20;
+            }
+            else
+            {
+                NUDArtifactLevel.Minimum = 1;
+                NUDArtifactLevel.Maximum = 21;
+            }
+            LblArtifactLevelTip.Text = $"[{NUDArtifactLevel.Minimum}-{NUDArtifactLevel.Maximum}]";
+        }
+
         #endregion - 圣遗物 -
 
         #region - 武器 -
@@ -726,16 +730,22 @@ namespace GrasscutterTools.Forms
         private void AvatarInputChanged()
         {
             if (CmbAvatar.SelectedIndex >= 0)
-                GenAvatar(GameData.Avatars.Ids[CmbAvatar.SelectedIndex], (int)NUDAvatarLevel.Value);
+                GenAvatar((int)NUDAvatarLevel.Value);
         }
 
-        private void GenAvatar(int avatarId, int level)
+        private void GenAvatar(int level)
         {
             if (ChkNewCommand.Checked)
+            {
+                int avatarId = GameData.Avatars.Ids[CmbAvatar.SelectedIndex];
                 SetCommand("/give", $"{avatarId} lv{level}");
+            }
             else
+            {
+                int avatarId = GameData.Avatars.Ids[CmbAvatar.SelectedIndex] - 1000 + 10000000;
                 SetCommand("/givechar", $"{avatarId} {level}");
             }
+        }
 
         private void BtnGiveAllChar_Click(object sender, EventArgs e)
         {
@@ -744,6 +754,14 @@ namespace GrasscutterTools.Forms
             SetCommand("/give avatars", $"lv{level} c{constellation}");
         }
 
+        private void ChangeBtnGiveAllChar()
+        {
+            if (ChkNewCommand.Checked)
+                BtnGiveAllChar.Enabled = true;
+            else
+                BtnGiveAllChar.Enabled = false;
+        }
+
         #endregion - 角色 -
 
         #region - 生成 -
@@ -754,6 +772,20 @@ namespace GrasscutterTools.Forms
             RbEntityMonster.Tag = GameData.Monsters.Lines;
             RbEntityNPC.Tag = GameData.NPCs.Lines;
             RbEntityAnimal.Checked = true;
+            LoadEntityList();
+        }
+        private void LoadEntityList()
+        {
+            var rb = RbEntityAnimal.Checked ? RbEntityAnimal :
+                    RbEntityMonster.Checked ? RbEntityMonster :
+                    RbEntityNPC;
+            if (rb.Checked)
+            {
+                ListEntity.BeginUpdate();
+                ListEntity.Items.Clear();
+                ListEntity.Items.AddRange(rb.Tag as string[]);
+                ListEntity.EndUpdate();
+            }
         }
 
         private void TxtEntityFilter_TextChanged(object sender, EventArgs e)
@@ -763,17 +795,10 @@ namespace GrasscutterTools.Forms
                     RbEntityMonster.Checked ? RbEntityMonster :
                     RbEntityNPC;
             var data = rb.Tag as string[];
-            ListGameItems.BeginUpdate();
+            ListEntity.BeginUpdate();
             ListEntity.Items.Clear();
-            if (string.IsNullOrEmpty(filter))
-            {
-                ListEntity.Items.AddRange(data);
-            }
-            else
-            {
             ListEntity.Items.AddRange(data.Where(n => n.Contains(filter)).ToArray());
-            }
+            ListEntity.EndUpdate();
-            ListGameItems.EndUpdate();
         }
 
         private bool GenSpawnEntityCommand()
@@ -795,14 +820,7 @@ namespace GrasscutterTools.Forms
 
         private void RbEntity_CheckedChanged(object sender, EventArgs e)
         {
-            var rb = sender as RadioButton;
+            LoadEntityList();
-            if (rb.Checked)
-            {
-                ListGameItems.BeginUpdate();
-                ListEntity.Items.Clear();
-                ListEntity.Items.AddRange(rb.Tag as string[]);
-                ListGameItems.EndUpdate();
-            }
         }
 
         #region -- 生成记录 --

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

@@ -127,11 +127,26 @@
   <data name="ChkAutoCopy.Text" xml:space="preserve">
     <value>Auto</value>
   </data>
+  <data name="GrpCommand.Text" xml:space="preserve">
+    <value>Command (Press and hold Ctrl to run automatically)</value>
+  </data>
   <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
     <value>Run(F5)</value>
   </data>
-  <data name="GrpCommand.Text" xml:space="preserve">
+  <data name="TPRemoteCall.Text" xml:space="preserve">
-    <value>Command (Press and hold Ctrl to run automatically)</value>
+    <value>Remote</value>
+  </data>
+  <data name="LblHostTip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>108, 16</value>
+  </data>
+  <data name="LblHostTip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>377, 17</value>
+  </data>
+  <data name="LblHostTip.Text" xml:space="preserve">
+    <value>Please be sure https:// or http:// is included with the IP address</value>
+  </data>
+  <data name="GrpServerStatus.Text" xml:space="preserve">
+    <value>Server status</value>
   </data>
   <data name="LnkOpenCommandLabel.Location" type="System.Drawing.Point, System.Drawing">
     <value>13, 63</value>
@@ -169,8 +184,11 @@
   <data name="LblPlayerCountLabel.Text" xml:space="preserve">
     <value>Player count</value>
   </data>
-  <data name="GrpServerStatus.Text" xml:space="preserve">
+  <data name="GrpRemoteCommand.Text" xml:space="preserve">
-    <value>Server status</value>
+    <value>Remote Cell</value>
+  </data>
+  <data name="TPPlayerCheck.Text" xml:space="preserve">
+    <value>Player</value>
   </data>
   <data name="LnkRCHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>35, 17</value>
@@ -190,8 +208,8 @@
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>Send Code</value>
   </data>
-  <data name="TPPlayerCheck.Text" xml:space="preserve">
+  <data name="TPConsoleCheck.Text" xml:space="preserve">
-    <value>Player</value>
+    <value>Console</value>
   </data>
   <data name="BtnConsoleConnect.Text" xml:space="preserve">
     <value>Connect</value>
@@ -199,17 +217,11 @@
   <data name="LblConsoleTip.Text" xml:space="preserve">
     <value>Note that normal commands in the console state must specify the target (set include UID)</value>
   </data>
-  <data name="TPConsoleCheck.Text" xml:space="preserve">
-    <value>Console</value>
-  </data>
-  <data name="GrpRemoteCommand.Text" xml:space="preserve">
-    <value>Remote Cell</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>175, 23</value>
   </data>
   <data name="BtnQueryServerStatus.Location" type="System.Drawing.Point, System.Drawing">
     <value>292, 36</value>
@@ -221,13 +233,13 @@
     <value>Query</value>
   </data>
   <data name="LblHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>35, 17</value>
+    <value>60, 17</value>
   </data>
   <data name="LblHost.Text" xml:space="preserve">
-    <value>Host</value>
+    <value>Server IP</value>
   </data>
-  <data name="TPRemoteCall.Text" xml:space="preserve">
+  <data name="TPAbout.Text" xml:space="preserve">
-    <value>Remote</value>
+    <value>About</value>
   </data>
   <data name="LblSupportDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>110, 17</value>
@@ -235,8 +247,11 @@
   <data name="LblSupportDescription.Text" xml:space="preserve">
     <value>Grasscutter Tools</value>
   </data>
-  <data name="TPAbout.Text" xml:space="preserve">
+  <data name="TPManage.Text" xml:space="preserve">
-    <value>About</value>
+    <value>Manage</value>
+  </data>
+  <data name="GrpBanPlayer.Text" xml:space="preserve">
+    <value>Ban</value>
   </data>
   <data name="BtnUnban.Text" xml:space="preserve">
     <value>Unban</value>
@@ -256,8 +271,8 @@
   <data name="LblBanUID.Text" xml:space="preserve">
     <value>UID</value>
   </data>
-  <data name="GrpBanPlayer.Text" xml:space="preserve">
+  <data name="GrpAccount.Text" xml:space="preserve">
-    <value>Ban Management</value>
+    <value>Account</value>
   </data>
   <data name="ChkAccountSetUid.Size" type="System.Drawing.Size, System.Drawing">
     <value>49, 21</value>
@@ -292,8 +307,14 @@
   <data name="TxtAccountUserName.Size" type="System.Drawing.Size, System.Drawing">
     <value>127, 23</value>
   </data>
-  <data name="GrpAccount.Text" xml:space="preserve">
+  <data name="GrpPermission.Text" xml:space="preserve">
-    <value>Account Management</value>
+    <value>Permissions</value>
+  </data>
+  <data name="CmbPerm.Location" type="System.Drawing.Point, System.Drawing">
+    <value>262, 21</value>
+  </data>
+  <data name="CmbPerm.Size" type="System.Drawing.Size, System.Drawing">
+    <value>138, 25</value>
   </data>
   <data name="BtmPermRemove.Text" xml:space="preserve">
     <value>Delete</value>
@@ -302,10 +323,10 @@
     <value>Add</value>
   </data>
   <data name="LblPerm.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 17</value>
+    <value>44, 17</value>
   </data>
   <data name="LblPerm.Text" xml:space="preserve">
-    <value>Perm</value>
+    <value>Perms</value>
   </data>
   <data name="LblPermUID.Location" type="System.Drawing.Point, System.Drawing">
     <value>30, 25</value>
@@ -316,11 +337,8 @@
   <data name="LblPermUID.Text" xml:space="preserve">
     <value>UID</value>
   </data>
-  <data name="GrpPermission.Text" xml:space="preserve">
+  <data name="TPScene.Text" xml:space="preserve">
-    <value>Permission Management</value>
+    <value>Scene</value>
-  </data>
-  <data name="TPManage.Text" xml:space="preserve">
-    <value>Manage</value>
   </data>
   <data name="ChkIncludeSceneId.Location" type="System.Drawing.Point, System.Drawing">
     <value>91, 213</value>
@@ -343,7 +361,7 @@
   </data>
   <data name="LblTp.Text" xml:space="preserve">
     <value>Teleporting
-Tip: You can quickly teleport through the 'fishing hook' mark on the minimap in the game
+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">
@@ -392,8 +410,8 @@ In the command, you can use ~ to indicate the current position, and ~100 to indi
     <value>Scene control
 Tip: Most of the scenes have no effect and cannot be entered.</value>
   </data>
-  <data name="TPScene.Text" xml:space="preserve">
+  <data name="TPItem.Text" xml:space="preserve">
-    <value>Scene</value>
+    <value>Items</value>
   </data>
   <data name="LblClearGiveItemLogs.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 17</value>
@@ -446,14 +464,14 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="LblGiveCommandDescription.Text" xml:space="preserve">
     <value>Give item to player</value>
   </data>
-  <data name="TPItem.Text" xml:space="preserve">
+  <data name="TPWeapon.Text" xml:space="preserve">
-    <value>Items</value>
+    <value>Weapons</value>
   </data>
   <data name="LblWeaponDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>93, 17</value>
+    <value>86, 17</value>
   </data>
   <data name="LblWeaponDescription.Text" xml:space="preserve">
-    <value>Geive Weapon</value>
+    <value>Give Weapon</value>
   </data>
   <data name="LblWeaponRefinement.Location" type="System.Drawing.Point, System.Drawing">
     <value>203, 218</value>
@@ -488,8 +506,8 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="NUDWeaponLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>147, 216</value>
   </data>
-  <data name="TPWeapon.Text" xml:space="preserve">
+  <data name="TPStats.Text" xml:space="preserve">
-    <value>Weapon</value>
+    <value>Stats</value>
   </data>
   <data name="LblResetStatsCommand.Location" type="System.Drawing.Point, System.Drawing">
     <value>126, 135</value>
@@ -509,11 +527,14 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <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="LblStatTip.Text" xml:space="preserve">
     <value>Tip</value>
   </data>
-  <data name="GrpSetStats.Text" xml:space="preserve">
+  <data name="GrpTalentLevel.Text" xml:space="preserve">
-    <value>Stats</value>
+    <value>Talent Level</value>
   </data>
   <data name="LnkTalentE.Location" type="System.Drawing.Point, System.Drawing">
     <value>283, 24</value>
@@ -545,17 +566,14 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="NUDTalentLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>128, 23</value>
   </data>
-  <data name="GrpTalentLevel.Text" xml:space="preserve">
-    <value>Talent Level</value>
-  </data>
   <data name="LblStatsDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>179, 17</value>
   </data>
   <data name="LblStatsDescription.Text" xml:space="preserve">
     <value>Set current active Avatar data</value>
   </data>
-  <data name="TPStats.Text" xml:space="preserve">
+  <data name="TPAvatar.Text" xml:space="preserve">
-    <value>Stats</value>
+    <value>Avatar</value>
   </data>
   <data name="BtnGiveAllChar.Text" xml:space="preserve">
     <value>Give All Char</value>
@@ -569,17 +587,26 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <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>
   <data name="LblAvatarConstellation.Text" xml:space="preserve">
     <value>Const.</value>
   </data>
+  <data name="LblAvatar.Size" type="System.Drawing.Size, System.Drawing">
+    <value>45, 17</value>
+  </data>
   <data name="LblAvatar.Text" xml:space="preserve">
     <value>Avatar</value>
   </data>
+  <data name="LblAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>37, 17</value>
+  </data>
   <data name="LblAvatarLevel.Text" xml:space="preserve">
     <value>Level</value>
   </data>
-  <data name="TPAvatar.Text" xml:space="preserve">
+  <data name="TPSpawn.Text" xml:space="preserve">
-    <value>Avatar</value>
+    <value>Spawn</value>
   </data>
   <data name="LblClearSpawnLogs.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 17</value>
@@ -596,6 +623,9 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="GrpSpawnRecord.Text" xml:space="preserve">
     <value>Records</value>
   </data>
+  <data name="GrpEntityType.Text" xml:space="preserve">
+    <value>Class</value>
+  </data>
   <data name="RbEntityAnimal.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 21</value>
   </data>
@@ -608,9 +638,6 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="RbEntityMonster.Text" xml:space="preserve">
     <value>Monster</value>
   </data>
-  <data name="GrpEntityType.Text" xml:space="preserve">
-    <value>Class</value>
-  </data>
   <data name="LblSpawnDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
   </data>
@@ -638,8 +665,11 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="NUDEntityLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>146, 216</value>
   </data>
-  <data name="TPSpawn.Text" xml:space="preserve">
+  <data name="TPQuest.Text" xml:space="preserve">
-    <value>Spawn</value>
+    <value>Quest</value>
+  </data>
+  <data name="GrpQuestFilters.Text" xml:space="preserve">
+    <value>List Filter</value>
   </data>
   <data name="ChkQuestFilterTEST.Size" type="System.Drawing.Size, System.Drawing">
     <value>51, 21</value>
@@ -659,9 +689,6 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
     <value>Hidden</value>
   </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>List Filter</value>
-  </data>
   <data name="BtnFinishQuest.Text" xml:space="preserve">
     <value>Finish</value>
   </data>
@@ -671,10 +698,10 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="LblQuestDescription.Text" xml:space="preserve">
     <value>Add or Finish Quest
 Tip: Many quest require server-side scripting support
-Therefore, the quest can be add and finish, but not necessarily can be work</value>
+Therefore, the quest can be added and finished, but not necessarily work.</value>
   </data>
-  <data name="TPQuest.Text" xml:space="preserve">
+  <data name="TPArtifact.Text" xml:space="preserve">
-    <value>Quest</value>
+    <value>Artifacts</value>
   </data>
   <data name="BtnAddSubAttr.Text" xml:space="preserve">
     <value>+ Add</value>
@@ -733,8 +760,8 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
   <data name="LblArtifactStars.Text" xml:space="preserve">
     <value>Stars</value>
   </data>
-  <data name="TPArtifact.Text" xml:space="preserve">
+  <data name="TPCustom.Text" xml:space="preserve">
-    <value>Artifact</value>
+    <value>Custom</value>
   </data>
   <data name="BtnExportCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
     <value>533, 216</value>
@@ -760,6 +787,9 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
   <data name="LblCustomName.Text" xml:space="preserve">
     <value>Tag</value>
   </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>List</value>
+  </data>
   <data name="LnkResetCustomCommands.Location" type="System.Drawing.Point, System.Drawing">
     <value>531, -1</value>
   </data>
@@ -769,9 +799,6 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
   <data name="LnkResetCustomCommands.Text" xml:space="preserve">
     <value>Restore</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>List</value>
-  </data>
   <data name="BtnRemoveCustomCommand.Location" type="System.Drawing.Point, System.Drawing">
     <value>393, 216</value>
   </data>
@@ -793,8 +820,8 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
   <data name="TxtCustomName.Size" type="System.Drawing.Size, System.Drawing">
     <value>267, 23</value>
   </data>
-  <data name="TPCustom.Text" xml:space="preserve">
+  <data name="TPHome.Text" xml:space="preserve">
-    <value>Custom</value>
+    <value>Home</value>
   </data>
   <data name="LblAbout.Location" type="System.Drawing.Point, System.Drawing">
     <value>74, 38</value>
@@ -812,13 +839,16 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
     <value>TextMapBrowser</value>
   </data>
   <data name="BtnOpenGachaBannerEditor.Text" xml:space="preserve">
-    <value>Banner editor</value>
+    <value>Banner Editor</value>
+  </data>
+  <data name="GrpSettings.Text" xml:space="preserve">
+    <value>Settings</value>
   </data>
   <data name="ChkTopMost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 21</value>
+    <value>109, 21</value>
   </data>
   <data name="ChkTopMost.Text" xml:space="preserve">
-    <value>Top most</value>
+    <value>Always on top</value>
   </data>
   <data name="ChkIncludeUID.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 21</value>
@@ -826,10 +856,4 @@ Therefore, the quest can be add and finish, but not necessarily can be work</val
   <data name="ChkIncludeUID.Text" xml:space="preserve">
     <value>Include UID</value>
   </data>
-  <data name="GrpSettings.Text" xml:space="preserve">
-    <value>Settings</value>
-  </data>
-  <data name="TPHome.Text" xml:space="preserve">
-    <value>Home</value>
-  </data>
 </root>

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

@@ -139,6 +139,15 @@
   <data name="TPRemoteCall.Text" xml:space="preserve">
     <value>Подключение к БД</value>
   </data>
+  <data name="LblHostTip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>83, 16</value>
+  </data>
+  <data name="LblHostTip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>346, 17</value>
+  </data>
+  <data name="LblHostTip.Text" xml:space="preserve">
+    <value>Убедитесь, что https:// или http:// включены в IP-адрес.</value>
+  </data>
   <data name="GrpServerStatus.Text" xml:space="preserve">
     <value>Состояние сервера</value>
   </data>
@@ -636,38 +645,47 @@
   <data name="LblAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
     <value>373, 139</value>
   </data>
+  <data name="LblAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>72, 17</value>
+  </data>
   <data name="LblAvatarConstellation.Text" xml:space="preserve">
     <value>Созвездия</value>
   </data>
+  <data name="NUDAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
+    <value>448, 136</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>
   </data>
+  <data name="LblAvatar.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 17</value>
+  </data>
   <data name="LblAvatar.Text" xml:space="preserve">
     <value>Персонаж</value>
   </data>
   <data name="LblAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>373, 92</value>
   </data>
+  <data name="LblAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 17</value>
+  </data>
   <data name="LblAvatarLevel.Text" xml:space="preserve">
     <value>Уровень</value>
   </data>
-  <data name="CmbAvatar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 42</value>
-  </data>
   <data name="NUDAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>448, 89</value>
   </data>
-  <data name="NUDAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 136</value>
-  </data>
-  <data name="CmbAvatar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>115, 25</value>
-  </data>
   <data name="NUDAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 23</value>
   </data>
-  <data name="NUDAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="CmbAvatar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>115, 23</value>
+    <value>448, 42</value>
+  </data>
+  <data name="CmbAvatar.Size" type="System.Drawing.Size, System.Drawing">
+    <value>115, 25</value>
   </data>
   <data name="TPSpawn.Text" xml:space="preserve">
     <value>Спавн</value>

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

@@ -123,11 +123,18 @@
   <data name="ChkAutoCopy.Text" xml:space="preserve">
     <value>自動</value>
   </data>
+  <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
+    <value>執行(F5)</value>
+  </data>
   <data name="GrpCommand.Text" xml:space="preserve">
     <value>命令（按住 Ctrl 自動執行）</value>
   </data>
-  <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <value>執行(F5)</value>
+  <data name="LblHostTip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 17</value>
+  </data>
+  <data name="LblHostTip.Text" xml:space="preserve">
+    <value>請確保地址中包含 http:// 或 https://</value>
   </data>
   <data name="LnkOpenCommandLabel.Text" xml:space="preserve">
     <value>遠程執行插件</value>
@@ -192,9 +199,6 @@
   <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>
@@ -204,8 +208,8 @@
   <data name="LblAccountUserName.Text" xml:space="preserve">
     <value>用戶名</value>
   </data>
-  <data name="GrpPermission.Text" xml:space="preserve">
+  <data name="GrpAccount.Text" xml:space="preserve">
-    <value>權限管理</value>
+    <value>賬號管理</value>
   </data>
   <data name="LblPerm.Text" xml:space="preserve">
     <value>權限</value>
@@ -213,8 +217,8 @@
   <data name="LblPermUID.Text" xml:space="preserve">
     <value>目標UID</value>
   </data>
-  <data name="TPScene.Text" xml:space="preserve">
+  <data name="GrpPermission.Text" xml:space="preserve">
-    <value>場景</value>
+    <value>權限管理</value>
   </data>
   <data name="ChkIncludeSceneId.Text" xml:space="preserve">
     <value>含場景ID</value>
@@ -235,6 +239,9 @@
 
 提示：大部分場景沒有作用，無法進入。</value>
   </data>
+  <data name="TPScene.Text" xml:space="preserve">
+    <value>場景</value>
+  </data>
   <data name="BtnSaveGiveItemLog.Text" xml:space="preserve">
     <value>√ 記錄</value>
   </data>
@@ -274,9 +281,6 @@
   <data name="LblWeaponLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
-  <data name="TPStats.Text" xml:space="preserve">
-    <value>數據</value>
-  </data>
   <data name="LblResetStatsCommand.Text" xml:space="preserve">
     <value>獲得角色經驗時</value>
   </data>
@@ -286,21 +290,21 @@
   <data name="GrpSetStats.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="GrpTalentLevel.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="LblNewCommandTip.Text" xml:space="preserve">
-    <value>※僅給予所有角色時生效</value>
-  </data>
   <data name="LblAvatarLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
@@ -313,15 +317,15 @@
   <data name="GrpSpawnRecord.Text" xml:space="preserve">
     <value>生成記錄本</value>
   </data>
-  <data name="GrpEntityType.Text" xml:space="preserve">
-    <value>列表分類</value>
-  </data>
   <data name="RbEntityAnimal.Text" xml:space="preserve">
     <value>生物誌</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>
@@ -331,12 +335,6 @@
   <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>
@@ -346,6 +344,9 @@
   <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>
@@ -357,8 +358,8 @@
 提示：許多任務需要服務端腳本支持
 囙此任務可以接，可以完成，但是不一定可以做</value>
   </data>
-  <data name="TPArtifact.Text" xml:space="preserve">
+  <data name="TPQuest.Text" xml:space="preserve">
-    <value>聖遺物</value>
+    <value>任務</value>
   </data>
   <data name="LblArtifactSet.Text" xml:space="preserve">
     <value>套裝</value>
@@ -375,8 +376,8 @@
   <data name="LblArtifactStars.Text" xml:space="preserve">
     <value>星級</value>
   </data>
-  <data name="TPCustom.Text" xml:space="preserve">
+  <data name="TPArtifact.Text" xml:space="preserve">
-    <value>自定義</value>
+    <value>聖遺物</value>
   </data>
   <data name="BtnExportCustomCommands.Text" xml:space="preserve">
     <value>導出</value>
@@ -390,8 +391,8 @@
   <data name="BtnRemoveCustomCommand.Text" xml:space="preserve">
     <value>× 刪除</value>
   </data>
-  <data name="TPHome.Text" xml:space="preserve">
+  <data name="TPCustom.Text" xml:space="preserve">
-    <value>主頁</value>
+    <value>自定義</value>
   </data>
   <data name="BtnOpenTextMap.Text" xml:space="preserve">
     <value>文本瀏覽器</value>
@@ -402,4 +403,7 @@
   <data name="ChkTopMost.Text" xml:space="preserve">
     <value>置頂</value>
   </data>
+  <data name="TPHome.Text" xml:space="preserve">
+    <value>主頁</value>
+  </data>
 </root>

Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx

@@ -134,7 +134,7 @@
     <value>80, 21</value>
   </data>
   <data name="ChkTopMost.Text" xml:space="preserve">
-    <value>TopMost</value>
+    <value>Always on top</value>
   </data>
   <data name="LblResourcesPath.Size" type="System.Drawing.Size, System.Drawing">
     <value>294, 17</value>

Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs

@@ -86,6 +86,12 @@ namespace GrasscutterTools.Game.Gacha
         [JsonProperty("sortId")]
         public int SortId { get; set; } = 1000;
 
+        /// <summary>
+        /// 抽卡次数限制
+        /// </summary>
+        [JsonProperty("gachaTimesLimit")]
+        public int GachaTimesLimit { get; set; } = int.MaxValue;
+
         /// <summary>
         /// 4星的up角色或物品
         /// </summary>

Source/GrasscutterTools/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyVersion("1.5.2")]
 [assembly: AssemblyFileVersion("1.0.0")]

Source/GrasscutterTools/Resources/Permissions.txt

@@ -4,33 +4,53 @@ player.**
 server.*
 server.**
 player.changescene
-player.clearinv
+player.clear
 player.enterdungeon
+player.enterdungeon.others
 player.give
-player.giveall
+player.give.others
-player.giveart
-player.givechar
 player.godmode
 player.heal
+player.heal.others
 player.killcharacter
+player.killcharacter.others
+player.quest
+player.quest.others
 player.resetconstellation
+player.resetconstellation.others
 player.setfetterlevel
+player.setfetterlevel.others
+player.setprop
+player.setprop.others
 player.setstats
+player.setstats.others
 player.settalent
+player.settalent.others
 player.setworldlevel
+player.team
+player.team.others
 player.teleport
+player.teleport.others
 player.tpall
+player.tpall.others
 player.weather
+player.weather.others
+server.announce
 server.broadcast
 server.coop
+server.coop.others
 server.drop
 server.kick
 server.killall
+server.killall.others
 server.reload
 server.resetshop
+server.resetshop.others
 server.sendmail
 server.sendmessage
+server.sendmessage.others
 server.spawn
+server.spawn.others
 server.stop
 mea.notice
 mea.mail

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

@@ -30,18 +30,18 @@ Give me ALL!
 /give 224 x10000
 100k Primogem
 /give 201 x100000
-100k Mora
+100Mill Mora
-/give 202 x100000
+/give 202 x100000000
 Reload config
 /reload
 Re-login
 /kick
 Clear Backpack(ALL)
-/clear all
+/clear all lv90 r5 5*
 Clear Weapons
-/clear wp
+/clear wp lv90 r5 5*
 Clear Artifacts
-/clear art
+/clear art lv20 r5 5*
 Clear Materials
 /clear mat
 Reset Current Constellation(Need Re-login)
@@ -60,3 +60,5 @@ Broadcast
 /say Hello everyone~
 Server Announcement
 /a Welcome to grasscutter PS!
+Close Server
+/stop

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

@@ -37,11 +37,11 @@
 Повторно войти
 /kick
 Очистить рюкзак(ВСЁ)
-/clear all
+/clear all lv90 r5 5*
 Очистить Оружия
-/clear wp
+/clear wp lv90 r5 5*
 Очистить Артефакты
-/clear art
+/clear art lv20 r5 5*
 Очистить Материалы
 /clear mat
 Сброс текущего Созвездия (Требуется повторный вход в систему)

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

@@ -41,11 +41,11 @@
 清空全部角色命之座(需重登)
 /resetconst all
 清空背包
-/clear all
+/clear all lv90 r5 5*
 清空武器
-/clear wp
+/clear wp lv90 r5 5*
 清空圣遗物
-/clear art
+/clear art lv20 r5 5*
 清空材料
 /clear mat
 清场

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

@@ -41,11 +41,11 @@
 清空全部角色命之座(需重登)
 /resetconst all
 清空背包
-/clear all
+/clear all lv90 r5 5*
 清空武器
-/clear wp
+/clear wp lv90 r5 5*
 清空聖遺物
-/clear art
+/clear art lv20 r5 5*
 清空材料
 /clear mat
 清場