Fix merge conflict
This commit is contained in:
parent
8f5a81014f
commit
61a81bb4ff
1 changed files with 4 additions and 0 deletions
|
|
@ -130,6 +130,10 @@ Use past tense when adding new entries; sign your name off when you add or chang
|
||||||
* Allowed multiple test cases to be in TShock's test suite. (@drunderscore)
|
* Allowed multiple test cases to be in TShock's test suite. (@drunderscore)
|
||||||
* Fixed unable to use Purification/Evil Powder in jungle. (@sgkoishi)
|
* Fixed unable to use Purification/Evil Powder in jungle. (@sgkoishi)
|
||||||
* Set the `GetDataHandledEventArgs.Player` property for the `SyncTilePicking` data handler. (@drunderscore)
|
* Set the `GetDataHandledEventArgs.Player` property for the `SyncTilePicking` data handler. (@drunderscore)
|
||||||
|
* 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
|
## TShock 5.1.3
|
||||||
* Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef)
|
* Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue