themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' into fix-voidbag-sprayer

Browse source
This commit is contained in:
Cai 2025-09-01 18:19:15 +08:00 • committed by GitHub
commit a4450d7132
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/GroupManager.cs
View file

@ -565,7 +565,7 @@ namespace TShockAPI.DB
permissions.ForEach(p => group.AddPermission(p)); permissions.ForEach(p => group.AddPermission(p));
if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1)
return "Group " + name + " has been modified successfully."; return GetString($"Group {name} has been modified successfully.");
// Restore old permissions so DB and internal object are in a consistent state // Restore old permissions so DB and internal object are in a consistent state
group.Permissions = oldperms; group.Permissions = oldperms;
@ -588,7 +588,7 @@ namespace TShockAPI.DB
permissions.ForEach(p => group.RemovePermission(p)); permissions.ForEach(p => group.RemovePermission(p));
if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1)
return "Group " + name + " has been modified successfully."; return GetString($"Group {name} has been modified successfully.");
// Restore old permissions so DB and internal object are in a consistent state // Restore old permissions so DB and internal object are in a consistent state
group.Permissions = oldperms; group.Permissions = oldperms;

20
i18n/template.pot
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: TShock\n" "Project-Id-Version: TShock\n"
"POT-Creation-Date: 2025-06-15 18:04:23+0000\n" "POT-Creation-Date: 2025-08-25 16:50:33+0000\n"
"PO-Revision-Date: 2025-06-15 18:04:24+0000\n" "PO-Revision-Date: 2025-08-25 16:50:34+0000\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1476,9 +1476,9 @@ msgid ""
"Arguments: send [player] [warp name], hide [warp name] [Enable(true/false)]." "Arguments: send [player] [warp name], hide [warp name] [Enable(true/false)]."
msgstr "" msgstr ""
#: ../../TShockAPI/Commands.cs:913
#: ../../TShockAPI/GetDataHandlers.cs:2673 #: ../../TShockAPI/GetDataHandlers.cs:2673
#: ../../TShockAPI/GetDataHandlers.cs:3288 #: ../../TShockAPI/GetDataHandlers.cs:3288
#: ../../TShockAPI/Commands.cs:913
#, csharp-format #, csharp-format
msgid "Authenticated as {0} successfully." msgid "Authenticated as {0} successfully."
msgstr "" msgstr ""
@ -3793,6 +3793,12 @@ msgstr ""
msgid "Group {0} has been deleted successfully." msgid "Group {0} has been deleted successfully."
msgstr "" msgstr ""
#: ../../TShockAPI/DB/GroupManager.cs:568
#: ../../TShockAPI/DB/GroupManager.cs:591
#, csharp-format
msgid "Group {0} has been modified successfully."
msgstr ""
#: ../../TShockAPI/DB/GroupManager.cs:501 #: ../../TShockAPI/DB/GroupManager.cs:501
#, csharp-format #, csharp-format
msgid "Group {0} has been renamed to {1}." msgid "Group {0} has been renamed to {1}."
@ -4034,8 +4040,8 @@ msgstr ""
msgid "Incorrect setup code. This incident has been logged." msgid "Incorrect setup code. This incident has been logged."
msgstr "" msgstr ""
#: ../../TShockAPI/DB/ProjectileManager.cs:210
#: ../../TShockAPI/DB/TileManager.cs:220 #: ../../TShockAPI/DB/TileManager.cs:220
#: ../../TShockAPI/DB/ProjectileManager.cs:210
#, csharp-format #, csharp-format
msgid "Infinite group parenting ({0})" msgid "Infinite group parenting ({0})"
msgstr "" msgstr ""
@ -5102,9 +5108,9 @@ msgid ""
"token was not valid." "token was not valid."
msgstr "" msgstr ""
#: ../../TShockAPI/Rest/SecureRest.cs:180
#: ../../TShockAPI/Rest/RestCommand.cs:95 #: ../../TShockAPI/Rest/RestCommand.cs:95
#: ../../TShockAPI/Rest/RestCommand.cs:101 #: ../../TShockAPI/Rest/RestCommand.cs:101
#: ../../TShockAPI/Rest/SecureRest.cs:180
msgid "Not authorized. The specified API endpoint requires a token." msgid "Not authorized. The specified API endpoint requires a token."
msgstr "" msgstr ""
@ -5440,8 +5446,8 @@ msgstr ""
msgid "Reached projectile threshold" msgid "Reached projectile threshold"
msgstr "" msgstr ""
#: ../../TShockAPI/Bouncer.cs:946
#: ../../TShockAPI/TShock.cs:1114 #: ../../TShockAPI/TShock.cs:1114
#: ../../TShockAPI/Bouncer.cs:946
msgid "Reached TileKill threshold." msgid "Reached TileKill threshold."
msgstr "" msgstr ""
@ -7372,8 +7378,8 @@ msgstr ""
msgid "You do not have permission to modify a Hat Rack in a protected area!" msgid "You do not have permission to modify a Hat Rack in a protected area!"
msgstr "" msgstr ""
#: ../../TShockAPI/Handlers/DisplayDollItemSyncHandler.cs:21
#: ../../TShockAPI/Handlers/RequestTileEntityInteractionHandler.cs:28 #: ../../TShockAPI/Handlers/RequestTileEntityInteractionHandler.cs:28
#: ../../TShockAPI/Handlers/DisplayDollItemSyncHandler.cs:21
msgid "You do not have permission to modify a Mannequin in a protected area!" msgid "You do not have permission to modify a Mannequin in a protected area!"
msgstr "" msgstr ""