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

Merge branch 'general-devel' into patch-3

Browse source
This commit is contained in:
Stargazing Koishi 2022-10-25 01:06:21 -07:00 • committed by GitHub
commit 23c44793e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockLauncher/TShockLauncher.csproj
View file

@ -31,10 +31,10 @@
<PackageReference Include="MySql.Data" Version="8.0.31" /> <PackageReference Include="MySql.Data" Version="8.0.31" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.10" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.10" />
<PackageReference Include="ModFramework" Version="1.1.6" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. --> <PackageReference Include="ModFramework" Version="1.1.6" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. -->
<PackageReference Include="GetText.NET" Version="1.6.6" /> <!-- only used to extract out to ./bin. --> <PackageReference Include="GetText.NET" Version="1.7.14" /> <!-- only used to extract out to ./bin. -->
<!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually --> <!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually -->
<PackageReference Include="OTAPI.Upcoming" Version="3.1.15" ExcludeAssets="all" GeneratePathProperty="true" /> <PackageReference Include="OTAPI.Upcoming" Version="3.1.16" ExcludeAssets="all" GeneratePathProperty="true" />
<None Include="$(PkgOTAPI_Upcoming)\lib\net6.0\OTAPI.dll"> <None Include="$(PkgOTAPI_Upcoming)\lib\net6.0\OTAPI.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit c6b0fd879e0d68c5125776ecde89ff3d3f730023 Subproject commit e87215aa183dfce43458341f975647cdee5d1710

8
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: 2022-10-24 07:29:23+0000\n" "POT-Creation-Date: 2022-10-25 07:37:44+0000\n"
"PO-Revision-Date: 2022-10-24 07:29:24+0000\n" "PO-Revision-Date: 2022-10-25 07:37:45+0000\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -668,7 +668,7 @@ msgstr ""
#: ../../TShockAPI/DB/BanManager.cs:636 #: ../../TShockAPI/DB/BanManager.cs:636
#, csharp-format #, csharp-format
msgid "An identifier for an IP Address in octet format. e.g., '{0}'.127.0.0.1" msgid "An identifier for an IP Address in octet format. e.g., '{0}'."
msgstr "" msgstr ""
#: ../../TShockAPI/Commands.cs:2035 #: ../../TShockAPI/Commands.cs:2035
@ -791,7 +791,7 @@ msgstr ""
#: ../../TShockAPI/Rest/RestManager.cs:904 #: ../../TShockAPI/Rest/RestManager.cs:904
#, csharp-format #, csharp-format
msgid "Bloodmoon state: {0}EnabledDisabled" msgid "Bloodmoon state: {0}"
msgstr "" msgstr ""
#: ../../TShockAPI/Bouncer.cs:1447 #: ../../TShockAPI/Bouncer.cs:1447