Merge branch 'general-devel' into general-devel

docs/changelog.md

@@ -79,8 +79,16 @@ Use past tense when adding new entries; sign your name off when you add or chang
 
 ## Upcoming changes
 * Fixed `/dump-reference-data` mutate the command names. (#2943, @sgkoishi)
-* You know the drill
+* Added `ParryDamageBuff` (Striking Moment with Brand of the Inferno and shield) for player, updated `CursedInferno` buff for NPC (@sgkoishi, #3005)
+* Changed the use of `Player.active` to `TSPlayer.Active` for consistency. (@sgkoishi, #2939)
 * Fix typo in config for IP bans. (@redchess64)
+* Updated `TShockAPI.NetItem` (@AgaSpace):
+  * Added constructor overload with parameter `Terraria.Item`.
+  * Added the `ToItem` method to get a copy of `Terraria.Item`.
+  * In the constructor `stack` and `prefix` are now optional parameters.
+* Fixed unable to transfer long response body for REST API. (@sgkoishi, #2925)
+* Fixed the `/wind` command not being very helpful. (@punchready)
+* Fixed /help, /me, and /p commands can't work in non-English languages. (@ACaiCat)
 
 ## TShock 5.2.1
 * Updated `TSPlayer.GodMode`. (@AgaSpace)
@@ -98,7 +106,6 @@ Use past tense when adding new entries; sign your name off when you add or chang
 * Rewrote the `.dockerignore` file into a denylist. (@timschumi)
 * Added CI for Docker images. (@timschumi)
 * Fixed Cursed Flares kicking players for invalid buff. (@Arthri)
-* Fixed /help, /me, and /p commands can't work in non-English languages. (@ACaiCat)
 
 ## TShock 5.2
 * An additional option `pvpwithnoteam` is added at `PvPMode` to enable PVP with no team. (@CelestialAnarchy, #2617, @ATFGK)
@@ -132,7 +139,6 @@ Use past tense when adding new entries; sign your name off when you add or chang
 * Relaxed custom death message restrictions to allow Inferno potions in PvP. (@drunderscore)
 * Allowed Flower Boots to place Ash Flowers on Ash Grass blocks. (@punchready)
 * Removed unnecessary range check that artifically shortened quick stack reach. (@boddyn, #2885, @bcat)
-* Re-wrote tile rect handling from scratch, fixing a certain exploitable flaw in the old code and significantly reducing the potential exploit surface, potentially even down to zero. (@punchready)
 
 ## TShock 5.1.3
 * Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef)

docs/docker.md

@@ -14,32 +14,27 @@ Open ports can also be passed through using `-p <host_port>:<container_port>`.
 
 For Example:
 ```bash
-# Building the image using buildx and loading it into docker
-docker buildx build -t tshock:latest --load .
-
-# 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:latest \
+           --rm -it ghcr.io/pryaxis/tshock:latest \
            -world /worlds/backflip.wld -motd "OMFG DOCKER"
 ```
 
-## Building for Other Platforms
+## Building custom images
 
-Using `docker buildx`, you could build [multi-platform images](https://docs.docker.com/build/building/multi-platform/) for TShock.
+Occasionally, it may be necessary to adjust TShock with customizations that are not included in the upstream project.
+Therefore, these changes are also not available in the officially provided Docker images.
+
+To build and load a Docker image from your local checkout, use the following `buildx` command:
 
-For Example:
 ```bash
-# Building the image using buildx and loading it into docker
-docker buildx build -t tshock:linux-arm64 --platform linux/arm64 --load .
-
-# 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-arm64 \
-           -world /worlds/backflip.wld -motd "ARM64 ftw"
+docker buildx build -t tshock:latest --load .
+```
+
+It is also possible to build [multi-platform images](https://docs.docker.com/build/building/multi-platform/) for TShock (e.g. an image targeting `arm64`, on a host that is not `arm64`):
+
+```bash
+docker buildx build -t tshock:linux-arm64 --platform linux/arm64 --load .
 ```

docs/index.html

@@ -11,12 +11,7 @@
 <body>
   <div id="app"></div>
   <script>
-    window.$docsify = {
-      name: 'TShock for Terraria',
-      repo: 'pryaxis/tshock',
-      loadSidebar: true,
-      subMaxLevel: 9
-    }
+    window.location.replace("https://github.com/Pryaxis/TShock/wiki");
   </script>
   <!-- Docsify v4 -->
   <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>