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

Merge branch 'general-devel' into patch-buffnpc-i18nconsistency

Browse source
This commit is contained in:
Stargazing Koishi 2022-11-10 00:13:35 -08:00 • committed by GitHub
commit 1db4e5e20b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TShock.cs
View file

@ -59,7 +59,7 @@ namespace TShockAPI
/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary> /// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
/// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary> /// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary>
public static readonly string VersionCodename = "Alnilam"; public static readonly string VersionCodename = "ζ Ori";
/// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary> /// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary>
public static string SavePath = "tshock"; public static string SavePath = "tshock";

2
TShockAPI/TShockAPI.csproj
View file

@ -18,7 +18,7 @@
Also, be sure to release on github with the exact assembly version tag as below Also, be sure to release on github with the exact assembly version tag as below
so that the update manager works correctly (via the Github releases api and mimic) so that the update manager works correctly (via the Github releases api and mimic)
--> -->
<Version>5.0.0</Version> <Version>5.1.0</Version>
<AssemblyTitle>TShock for Terraria</AssemblyTitle> <AssemblyTitle>TShock for Terraria</AssemblyTitle>
<Company>Pryaxis &amp; TShock Contributors</Company> <Company>Pryaxis &amp; TShock Contributors</Company>
<Product>TShockAPI</Product> <Product>TShockAPI</Product>

34
docs/changelog.md
View file

@ -78,9 +78,9 @@ Use past tense when adding new entries; sign your name off when you add or chang
* If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change. --> * If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change. -->
## Upcoming changes ## Upcoming changes
* Fixed item giving potentially dropping too many items (@PotatoCider, @punchready)
* Excluded GeoIP.dat from release bundle (@SignatureBeef)
* Updated the Utils.FindByIdOrName to follow same logic. Now fuzzy match fallback to `StartsWith` and then `Contains`. (@sgkoishi) * Updated the Utils.FindByIdOrName to follow same logic. Now fuzzy match fallback to `StartsWith` and then `Contains`. (@sgkoishi)
## TShock 5.1.0
* Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready) * Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready)
* Excluded GeoIP.dat from release bundle. (@SignatureBeef) * Excluded GeoIP.dat from release bundle. (@SignatureBeef)
* Added `TownSlimeRed` to `FishableNpcIDs` list, allowing it to be fished up. (@drunderscore) * Added `TownSlimeRed` to `FishableNpcIDs` list, allowing it to be fished up. (@drunderscore)
@ -93,7 +93,37 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Changed `PlayerData.RestoreCharacter` to remove all buffs. (@drunderscore) * Changed `PlayerData.RestoreCharacter` to remove all buffs. (@drunderscore)
* Before this change, it was theoretically possible to smuggle buffs onto servers with SSC enabled, by using buff indexes past `22`. * Before this change, it was theoretically possible to smuggle buffs onto servers with SSC enabled, by using buff indexes past `22`.
* Allowed Torch God's Favor to place different types of torches and campfires. (@sgkoishi, #2811) * Allowed Torch God's Favor to place different types of torches and campfires. (@sgkoishi, #2811)
* Updated translations! Currently, the major projects are at the following completion rates:
* Chinese (93%)
* Portuguese, Brazilian (89%)
* Indonesian (89%)
* Russian (56%)
* Spanish (24%)
* toki pona (10%)
* Turkish (8%)
* For complete credits, see the table below.
### Translation credits
The following translators contributed changes from November 1, 2022 to November 9, 2022 (from TShock 5.0.0 to 5.1.0).
|Contributor | Language | Translated words|
|-----|-----|-----|
|Shiva Goddess (ShivaGoddess) | Portuguese, Brazilian | 6979|
|Ricko (Rickojp) | Portuguese, Brazilian | 3154|
|RidnRaven (ridwankun2) | Indonesian | 2329|
|Janet Blackquill (pontaoski) | toki pona | 1216|
|SGKoishi | Chinese Simplified | 640|
|Cristofer GamerTVH (cristoferherame) | Spanish | 622|
|HDSeventh (hdseventh) | Indonesian | 315|
|EMRE ÇELİK (emre0447) | Turkish | 312|
|PHPoenX | Russian | 297|
|./lemon.sh (lemon-sh) | Polish | 206|
|Сергей Червяков (chsergeyg) | Russian | 182|
|okaythisisepic | Russian | 80|
|KomashiOFC | Portuguese, Brazilian | 76|
|Runesicle | toki pona | 22|
|Marotheit | Pirate English | 7|
|ATFGK | Chinese Simplified | 4|
## TShock 5.0.0 ## TShock 5.0.0
* Reduced load/save console spam. (@SignatureBeef, @YehnBeep) * Reduced load/save console spam. (@SignatureBeef, @YehnBeep)