Merge branch 'development' into dev-quests

src/main/resources/languages/en-US.json

@@ -16,6 +16,9 @@
         "no_keystore_error": "[Dispatch] No SSL cert found! Falling back to HTTP server.",
         "default_password": "[Dispatch] The default keystore password was loaded successfully. Please consider setting the password to 123456 in config.json."
       },
+      "authentication": {
+        "default_unable_to_verify": "[Authentication] Something called the verifyUser method which is unavailable in the default authentication handler"
+      },
       "no_commands_error": "Commands are not supported in dispatch only mode.",
       "unhandled_request_error": "[Dispatch] Potential unhandled %s request: %s",
       "account": {
@@ -45,7 +48,8 @@
       "run_mode_error": "Invalid server run mode: %s.",
       "run_mode_help": "Server run mode must be 'HYBRID', 'DISPATCH_ONLY', or 'GAME_ONLY'. Unable to start Grasscutter...",
       "create_resources": "Creating resources folder...",
-      "resources_error": "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder."
+      "resources_error": "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder.",
+      "version": "Grasscutter version: %s-%s"
     }
   },
   "commands": {
@@ -356,5 +360,14 @@
     "resetshop": {
       "description": "reset shop"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }

src/main/resources/languages/pl-PL.json

@@ -45,7 +45,8 @@
       "run_mode_error": "Błędny tryb pracy serwera: %s.",
       "run_mode_help": "Tryb pracy serwera musi być ustawiony na 'HYBRID', 'DISPATCH_ONLY', lub 'GAME_ONLY'. Nie można wystartować Grasscutter...",
       "create_resources": "Tworzenie folderu resources...",
-      "resources_error": "Umieść kopię 'BinOutput' i 'ExcelBinOutput' w folderze resources."
+      "resources_error": "Umieść kopię 'BinOutput' i 'ExcelBinOutput' w folderze resources.",
+      "version": "Grasscutter versión: %s-%s"
     }
   },
   "commands": {
@@ -301,5 +302,14 @@
     "resetshop": {
       "description": "zresetuj sklep"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }

src/main/resources/languages/zh-CN.json

@@ -20,7 +20,7 @@
       "unhandled_request_error": "[Dispatch] 潜在的未处理请求：%s %s",
       "account": {
         "login_attempt": "[Dispatch] 客户端 %s 正在尝试登录",
-        "login_success": "[Dispatch] 客户端 %s 已登录，UID为 %s",
+        "login_success": "[Dispatch] 客户端 %s 已登录，UID 为 %s",
         "login_token_attempt": "[Dispatch] 客户端 %s 正在尝试使用 token 登录",
         "login_token_error": "[Dispatch] 客户端 %s 使用 token 登录失败",
         "login_token_success": "[Dispatch] 客户端 %s 已通过 token 登录，UID 为 %s",
@@ -45,7 +45,8 @@
       "run_mode_error": "无效的服务器运行模式：%s。",
       "run_mode_help": "服务器运行模式必须为 HYBRID、DISPATCH_ONLY 或 GAME_ONLY。Grasscutter 启动失败...",
       "create_resources": "正在创建 resources 目录...",
-      "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。"
+      "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。",
+      "version": "Grasscutter版本: %s-%s"
     }
   },
   "commands": {
@@ -55,7 +56,7 @@
       "permission_error": "哼哼哼！你没有执行此命令的权限！请联系服务器管理员解决！",
       "console_execute_error": "此命令只能在服务器控制台执行呐~",
       "player_execute_error": "此命令只能在游戏内执行哦~",
-      "command_exist_error": "这条命令……好像找不到呢？。",
+      "command_exist_error": "这条命令...好像找不到呢？",
       "no_description_specified": "没有指定说明",
       "invalid": {
         "amount": "无效的数量。",
@@ -96,20 +97,20 @@
       "create": "已创建账号，UID 为 %s。",
       "delete": "账号已删除。",
       "no_account": "账号不存在。",
-      "command_usage": "用法：account <create|delete> <用户名> [uid]",
-      "description": "创建或删除账号。"
+      "command_usage": "用法：account <create|delete> <用户名> [UID]",
+      "description": "创建或删除账号"
     },
     "broadcast": {
       "command_usage": "用法：broadcast <消息>",
       "message_sent": "公告已发送。",
-      "description": "向所有玩家发送公告。"
+      "description": "向所有玩家发送公告"
     },
     "changescene": {
       "usage": "用法：changescene <场景ID>",
       "already_in_scene": "你已经在这个场景中了。",
       "success": "已切换至场景 %s。",
       "exists_error": "此场景不存在。",
-      "description": "切换指定场景。"
+      "description": "切换指定场景"
     },
     "clear": {
       "command_usage": "用法：clear <all|wp|art|mat>\nall: 所有, wp: 武器, art: 圣遗物, mat: 材料",
@@ -120,32 +121,32 @@
       "displays": "已清空 %s 的屏幕。",
       "virtuals": "已清除 %s 的所有货币和经验值。",
       "everything": "已清除 %s 的所有物品。",
-      "description": "从你的背包中删除所有未装备且已解锁的物品，包括稀有物品。"
+      "description": "从你的背包中删除所有未装备且已解锁的物品，包括稀有物品"
     },
     "coop": {
       "usage": "用法：coop <玩家ID> <目标玩家ID>",
-      "success": "已强制传送 %s 到 %s 的世界",
-      "description": "强制传送指定用户到他人的世界。"
+      "success": "已强制传送 %s 到 %s 的世界。",
+      "description": "强制传送指定用户到他人的世界"
     },
     "enter_dungeon": {
       "usage": "用法：enterdungeon <秘境ID>",
-      "changed": "已进入秘境 %s",
+      "changed": "已进入秘境 %s。",
       "not_found_error": "此秘境不存在。",
       "in_dungeon_error": "你已经在秘境中了。",
-      "description": "进入指定秘境。"
+      "description": "进入指定秘境"
     },
     "giveAll": {
       "usage": "用法：giveall [玩家] [数量]",
       "started": "正在给予全部物品...",
       "success": "已给予 %s 全部物品。",
       "invalid_amount_or_playerId": "无效的数量/玩家ID。",
-      "description": "给予所有物品。"
+      "description": "给予所有物品"
     },
     "giveArtifact": {
       "usage": "用法：giveart|gart [玩家] <圣遗物ID> <主词条ID> [<副词条ID>[,<强化次数>]]... [等级]",
       "id_error": "无效的圣遗物ID。",
       "success": "已将 %s 给予 %s。",
-      "description": "给予指定圣遗物。"
+      "description": "给予指定圣遗物"
     },
     "giveChar": {
       "usage": "用法：givechar <玩家> <角色ID|角色名> [数量]",
@@ -153,50 +154,50 @@
       "invalid_avatar_id": "无效的角色ID。",
       "invalid_avatar_level": "无效的角色等级。",
       "invalid_avatar_or_player_id": "无效的角色ID/玩家ID。",
-      "description": "给予指定角色。"
+      "description": "给予指定角色"
     },
     "give": {
       "usage": "用法：give <玩家> <物品ID|物品名> [数量] [等级] [精炼等级]",
       "refinement_only_applicable_weapons": "只有武器可以设置精炼等级。",
       "refinement_must_between_1_and_5": "精炼等级必须在 1 到 5 之间。",
       "given": "已将 %s 个 %s 给予 %s。",
-      "given_with_level_and_refinement": "已将 %s (等级 %s, 精炼 %s) %s 个给予 %s",
-      "given_level": "已将 %s (等级 %s) %s 个给予 %s",
-      "description": "给予指定物品。"
+      "given_with_level_and_refinement": "已将 %s (等级 %s, 精炼 %s) %s 个给予 %s。",
+      "given_level": "已将 %s (等级 %s) %s 个给予 %s。",
+      "description": "给予指定物品"
     },
     "godmode": {
-      "success": "%s 的无敌模式已被设置为 %s。",
-      "description": "防止你受到伤害。"
+      "success": "%s 的上帝模式已被设置为 %s。",
+      "description": "防止你受到伤害"
     },
     "heal": {
       "success": "已经治疗所有角色。",
-      "description": "治疗当前队伍的角色。"
+      "description": "治疗当前队伍的角色"
     },
     "kick": {
-      "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出",
-      "server_kick_player": "正在踢出玩家 [%s:%s]",
-      "description": "从服务器内踢出指定玩家。"
+      "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。",
+      "server_kick_player": "正在踢出玩家 [%s:%s]...",
+      "description": "从服务器内踢出指定玩家"
     },
     "kill": {
       "usage": "用法：killall [玩家UID] [场景ID]",
-      "scene_not_found_in_player_world": "未在玩家世界中找到此场景",
+      "scene_not_found_in_player_world": "未在玩家世界中找到此场景。",
       "kill_monsters_in_scene": "已杀死场景 %s 中的 %s 个怪物。",
-      "description": "杀死所有怪物。"
+      "description": "杀死所有怪物"
     },
     "killCharacter": {
       "usage": "用法：/killcharacter [玩家ID]",
       "success": "已杀死 %s 当前角色。",
-      "description": "杀死当前角色。"
+      "description": "杀死当前角色"
     },
     "language": {
       "current_language": "当前语言是: %s",
       "language_changed": "语言切换至: %s",
       "language_not_found": "目前服务端没有这种语言: %s",
-      "description": "显示或切换当前语言。"
+      "description": "显示或切换当前语言"
     },
     "list": {
       "success": "目前在线人数：%s",
-      "description": "查看所有玩家。"
+      "description": "查看所有玩家"
     },
     "permission": {
       "usage": "用法：permission <add|remove> <用户名> <权限>",
@@ -205,25 +206,25 @@
       "remove": "权限已移除。",
       "not_have_error": "此玩家未拥有权限！",
       "account_error": "账号不存在。",
-      "description": "添加或移除指定玩家的权限。"
+      "description": "添加或移除指定玩家的权限"
     },
     "position": {
       "success": "坐标：%s, %s, %s\n场景ID：%s",
-      "description": "获取所在位置。"
+      "description": "获取所在位置"
     },
     "reload": {
       "reload_start": "正在重载配置文件和数据。",
       "reload_done": "重载完成。",
-      "description": "重载配置文件和数据。"
+      "description": "重载配置文件和数据"
     },
     "resetConst": {
       "reset_all": "重置所有角色的命座。",
       "success": "已重置 %s 的命座，重新登录后生效。",
-      "description": "重置当前角色的命之座，执行命令后需重新登录以生效。"
+      "description": "重置当前角色的命之座，执行命令后需重新登录以生效"
     },
     "resetShopLimit": {
       "usage": "用法：/resetshop <玩家ID>",
-      "description": "重置所选玩家的商店刷新时间。"
+      "description": "重置所选玩家的商店刷新时间"
     },
     "sendMail": {
       "usage": "用法：give [玩家] <物品ID|物品名称> [数量]",
@@ -246,19 +247,19 @@
       "sender": "<发件人>",
       "arguments": "<物品ID|物品名称|finish> [数量] [等级]",
       "error": "错误：无效的编写阶段 %s。需要 StackTrace 请查看服务器控制台。",
-      "description": "向指定用户发送邮件。此命令的用法可根据附加的参数而变化。"
+      "description": "向指定用户发送邮件。此命令的用法可根据附加的参数而变化"
     },
     "sendMessage": {
       "usage": "用法：sendmessage <玩家> <消息>",
       "success": "消息已发送。",
-      "description": "向指定玩家发送消息。"
+      "description": "向指定玩家发送消息"
     },
     "setFetterLevel": {
       "usage": "用法：setfetterlevel <好感度等级>",
       "range_error": "好感度等级必须在 0 到 10 之间。",
-      "success": "好感度已设置为 %s 级",
+      "success": "好感度已设置为 %s 级。",
       "level_error": "无效的好感度等级。",
-      "description": "设置当前角色的好感度等级。"
+      "description": "设置当前角色的好感度等级"
     },
     "setStats": {
       "usage_console": "用法：setstats|stats @<UID> <属性> <数值>",
@@ -270,27 +271,27 @@
       "set_self": "%s 已设为 %s。",
       "set_for_uid": "将 %s (来自 %s) 设置为 %s。",
       "set_max_hp": "最大生命值已设为 %s。",
-      "description": "设置当前角色的属性。"
+      "description": "设置当前角色的属性"
     },
     "setWorldLevel": {
       "usage": "用法：setworldlevel <等级>",
       "value_error": "世界等级必须设置在0-8之间。",
       "success": "已将世界等级设为 %s。",
       "invalid_world_level": "无效的世界等级。",
-      "description": "设置世界等级，执行命令后需重新登录以生效。"
+      "description": "设置世界等级，执行命令后需重新登录以生效"
     },
     "spawn": {
       "usage": "用法：spawn <实体ID> [数量] [等级(仅怪物)]",
       "success": "已生成 %s 个 %s。",
-      "description": "在你附近生成一个生物。"
+      "description": "在你附近生成一个生物"
     },
     "stop": {
       "success": "正在关闭服务器...",
-      "description": "停止服务器。"
+      "description": "停止服务器"
     },
     "talent": {
       "usage_1": "设置天赋等级：/talent set <天赋ID> <数值>",
-      "usage_2": "另一种设置天赋等级的方法：/talent <n (普攻) | e (元素战技) | q (元素爆发)> <数值>",
+      "usage_2": "另一种设置天赋等级的方法：/talent <n (普通攻击) | e (元素战技) | q (元素爆发)> <数值>",
       "usage_3": "获取天赋ID：/talent getid",
       "lower_16": "无效的天赋等级，天赋等级应小于等于15。",
       "set_id": "将天赋等级设为 %s。",
@@ -303,20 +304,20 @@
       "normal_attack_id": "普通攻击的 ID 为 %s。",
       "e_skill_id": "元素战技ID %s。",
       "q_skill_id": "元素爆发ID %s。",
-      "description": "设置当前角色的天赋等级。"
+      "description": "设置当前角色的天赋等级"
     },
     "teleportAll": {
-      "success": "已将所有玩家传送到你的位置",
+      "success": "已将所有玩家传送到你的位置。",
       "error": "你只能在多人游戏状态下执行此命令。",
-      "description": "将你世界中的所有玩家传送到你所在的位置。"
+      "description": "将你世界中的所有玩家传送到你所在的位置"
     },
     "teleport": {
       "usage_server": "用法：/tp @<玩家ID> <x> <y> <z> [场景ID]",
       "usage": "用法：/tp [@<玩家ID>] <x> <y> <z> [场景ID]",
       "specify_player_id": "你必须指定一个玩家ID。",
       "invalid_position": "无效的位置。",
-      "success": "传送 %s 到坐标 %s,%s,%s，场景为 %s",
-      "description": "改变指定玩家的位置。"
+      "success": "传送 %s 到坐标 %s,%s,%s，场景为 %s。",
+      "description": "改变指定玩家的位置"
     },
     "tower": {
       "unlock_done": "深境回廊的所有层已全部解锁。"
@@ -325,28 +326,37 @@
       "usage": "用法：weather <天气ID> [气候ID]",
       "success": "已更改天气为 %s，气候为 %s。",
       "invalid_id": "无效的天气ID。",
-      "description": "更改天气。"
+      "description": "更改天气"
     },
     "drop": {
       "command_usage": "用法：drop <物品ID|物品名称> [数量]",
       "success": "已丢下 %s 个 %s。",
-      "description": "在你附近丢下一个物品。"
+      "description": "在你附近丢下一个物品"
     },
     "help": {
       "usage": "用法：",
       "aliases": "别名：",
       "available_commands": "可用命令：",
-      "description": "发送帮助信息或显示指定命令的信息。"
+      "description": "发送帮助信息或显示指定命令的信息"
     },
     "restart": {
-      "description": "重新启动服务器。"
+      "description": "重新启动服务器"
     },
     "unlocktower": {
       "success": "解锁完成。",
-      "description": "解锁深境螺旋的所有层。"
+      "description": "解锁深境螺旋的所有层"
     },
     "resetshop": {
-      "description": "重置商店刷新时间。"
+      "description": "重置商店刷新时间"
+    }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
     }
   }
 }

src/main/resources/languages/zh-TW.json

@@ -45,7 +45,8 @@
       "run_mode_error": "無效的伺服器運行模式： %s。",
       "run_mode_help": "伺服器運行模式必須為 HYBRID 或者 DISPATCH_ONLY 或者 GAME_ONLY。Grasscutter 啟動失敗...",
       "create_resources": "正在建立 resources 資料夾...",
-      "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。"
+      "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。",
+      "version": "Grasscutter版本: %s-%s"
     }
   },
   "commands": {
@@ -301,5 +302,14 @@
     "resetshop": {
       "description": "重置商店時間"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }