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

Merge branch 'general-devel' into moisterrific-patch-1-config-respawntime

Browse source
This commit is contained in:
Lucas Nicodemus 2021-11-19 22:19:52 -08:00 • committed by GitHub
commit b48b1a1eda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* 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
* Updated Linux guide. (@NezbednikSK)
* Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz) * Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz)
* Introduced `SoftcoreOnly` config option to allow only softcore characters to connect. (@drunderscore) * Introduced `SoftcoreOnly` config option to allow only softcore characters to connect. (@drunderscore)
* Fixed some typos that have been in the repository for over a lustrum. (@Killia0) * Fixed some typos that have been in the repository for over a lustrum. (@Killia0)

6
README.md
View file

@ -212,7 +212,7 @@ You need to re-run the patcher any time `OTAPI` updates. You need to rebuild `Te
1. Verify that non-zero modifications ran successfully. Then, build the Terraria Server API executable. 1. Verify that non-zero modifications ran successfully. Then, build the Terraria Server API executable.
$ cd ./../../../ $ cd ../../../../
$ xbuild ./TerrariaServerAPI/TerrariaServerAPI/TerrariaServerAPI.csproj \ $ xbuild ./TerrariaServerAPI/TerrariaServerAPI/TerrariaServerAPI.csproj \
/p:Configuration=$BUILD_MODE /p:Configuration=$BUILD_MODE
@ -220,13 +220,13 @@ You need to re-run the patcher any time `OTAPI` updates. You need to rebuild `Te
##### TShock ##### TShock
1. Perform a NuGet restore in `TShockAPI` folder that contains `TShockAPI.sln`. 1. Perform a NuGet restore in the folder that contains `TShock.sln`.
$ mono ~/bin/nuget.exe restore $ mono ~/bin/nuget.exe restore
1. Build TShock in the `BUILD_MODE` you set earlier. 1. Build TShock in the `BUILD_MODE` you set earlier.
$ xbuild ./TShockAPI.sln /p:Configuration=$BUILD_MODE $ xbuild ./TShock.sln /p:Configuration=$BUILD_MODE
You're done! You're done!