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

76
docs/changelog.md
View file

@ -3,6 +3,69 @@
This is the rolling changelog for TShock for Terraria. Changes listed under "upcoming changes" are only available in experimental builds.
<!-- ## How to add a changelog entry
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
ATTENTION MORTALS
PLEASE READ ALL OF THE INSTRUCTIONS HERE
IT IS SUPER ANNOYING TO HAVE TO FIX THE CHANGELOG EVERY SINGLE TIME BECAUSE NOBODY READS THESE
Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
* Put your entry in terms of what you changed in the past mood. For example: "Changed the world by adding new grommets."
@ -18,6 +81,19 @@ Use past tense when adding new entries; sign your name off when you add or chang
* 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)
* Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready)
* Excluded GeoIP.dat from release bundle. (@SignatureBeef)
* Added `TownSlimeRed` to `FishableNpcIDs` list, allowing it to be fished up. (@drunderscore)
* Bump to Terraria 1.4.4.8 via OTAPI 3.1.18. (@hakusaro, @SignatureBeef)
* In this version of Terraria, `Main.maxBuffTypes` and other `maxWhateverTypes` fields have been removed. Their replacements are in `Terraria.ID.whateverID.Count`. TShock calls to these fields have been swapped in order to bring forward compatibility with Terraria 1.4.4.8.
* In OTAPI 3.1.17, allowed Crystal Shard to grow. (@sgkoishi, @cc004, SignatureBeef/Open-Terraria-API#96)
* Added permission for summoning Mechdusa, Deerclops and slime pet. (@sgkoishi, #2808)
* Changed login to only restrict CC'd players during login whilst SSC is enabled. (@drunderscore)
* This change allows the config option `RequireLogin` to function usefully again when SSC is not enabled.
* 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`.
* Allowed Torch God's Favor to place different types of torches and campfires. (@sgkoishi, #2811)
## TShock 5.0.0
* Reduced load/save console spam. (@SignatureBeef, @YehnBeep)

6
docs/docker.md
View file

@ -15,14 +15,14 @@ Open ports can also be passed through using `-p <host_port>:<container_port>`.
For Example:
```bash
# Building the image
docker build -t tshock:linux-x64 --build-arg TARGETPLATFORM=linux-x64 .
docker build -t tshock:linux-amd64 --build-arg TARGETPLATFORM=linux/amd64 .
# Running the image
docker run -p 7777:7777 -p 7878:7878 \
-v /home/cider/tshock/:/tshock \
-v /home/cider/.local/share/Terraria/Worlds:/worlds \
-v /home/cider/tshock/plugins:/plugins \
--rm -it tshock:linux-x64 \
--rm -it tshock:linux-amd64 \
-world /worlds/backflip.wld -motd "OMFG DOCKER"
```
@ -42,4 +42,4 @@ docker run -p 7777:7777 -p 7878:7878 \
-v /home/cider/tshock/plugins:/plugins \
--rm -it tshock:linux-arm64 \
-world /worlds/backflip.wld -motd "ARM64 ftw"
```
```