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

Merge upstream

Browse source
This commit is contained in:
SGKoishi 2022-11-10 00:09:40 -08:00
commit fb96d8b0c8
No known key found for this signature in database
GPG key ID: 8FFC399070653828
30 changed files with 9232 additions and 1697 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Localization/EnglishLanguage.cs
View file

@ -50,12 +50,12 @@ namespace TShockAPI.Localization
LanguageManager.Instance.SetLanguage(GameCulture.FromCultureName(GameCulture.CultureName.English));
}
for (var i = -48; i < Main.maxItemTypes; i++)
for (var i = -48; i < Terraria.ID.ItemID.Count; i++)
{
ItemNames.Add(i, Lang.GetItemNameValue(i));
}
for (var i = -17; i < Main.maxNPCTypes; i++)
for (var i = -17; i < Terraria.ID.NPCID.Count; i++)
{
NpcNames.Add(i, Lang.GetNPCNameValue(i));
}