Merge branch 'Pryaxis-general-devel' into general-devel

Fix file conflict.

CHANGELOG.md

@@ -18,6 +18,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Added the lanterns night event to the `/worldevent` command. (@0x3fcf1bbd)
 * Marked `TSPlayer.SendTileSquare` as deprecated, and created `TSPlayer.SendTileSquareCentered` that sends a tile square centered around the passed coordinates. (@0x3fcf1bbd)
 * Added coordinates clamping to `TSPlayer.SendTileRect` so as to avoid OOBs. (@0x3fcf1bbd)
+* Removed extraneous space causing build commands in README to fail. (@EtherTyper)
 
 ## TShock 4.5.12
 * Fixed the ability to spawn Zenith projectile with non-original items. (@AgaSpace)

README.md

@@ -207,7 +207,7 @@ You need to re-run the patcher any time `OTAPI` updates. You need to rebuild `Te
 
           $ cd ./TerrariaServerAPI/TShock.Modifications.Bootstrapper/bin/$BUILD_MODE/
           $ mono TShock.Modifications.Bootstrapper.exe -in=OTAPI.dll \
-                -mod=../../../TShock.Modifications.**/bin/$BUILD_MODE/TShock.Modifications.*.dll \ 
+                -mod=../../../TShock.Modifications.**/bin/$BUILD_MODE/TShock.Modifications.*.dll \
                 -o=Output/OTAPI.dll
 
 1. Verify that non-zero modifications ran successfully. Then, build the Terraria Server API executable.