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

Merge branch 'general-devel' into boncer-buff-fix

Browse source
This commit is contained in:
Lucas Nicodemus 2020-05-18 17:48:27 -07:00
commit 36e920c335
No known key found for this signature in database
GPG key ID: A07BD9023D1664DB
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/ISSUE_TEMPLATE/defect-report.md vendored
View file

@ -27,6 +27,12 @@ PUT SUPER LONG ERROR MESSAGES IN THE TICK MARKS
#### Any screenshots? #### Any screenshots?
#### Any log messages from files that end in `.log`? <!-- Please add context. Even if you don't have an error message, please show a screenshot of the server console at least. -->
<!-- If providing screenshots of client, send before and after pressing F8 to show network debug -->
#### Any log messages from files that end in `.log` or `.txt`?
<!-- Please add context. Even if you don't have an error message, please show recent server logs at least. -->
#### What plugins and what versions of those plugins are you running? #### What plugins and what versions of those plugins are you running?

2
.github/workflows/build.yml vendored
View file

@ -1,6 +1,6 @@
name: Build Server name: Build Server
on: [push] on: [push, pull_request]
jobs: jobs:
build: build:

4
CHANGELOG.md
View file

@ -2,6 +2,10 @@
This is the rolling changelog for TShock for Terraria. 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. This is the rolling changelog for TShock for Terraria. 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.
## Upcoming changes
* Fixed NPC buff anticheat issue conflicting with Terraria gameplay changes (whips) (@Patrikkk)
## TShock 4.4.0 (Pre-release 1) ## TShock 4.4.0 (Pre-release 1)
* Added confused debuff to Bouncer for confusion applied from Brain of Confusion * Added confused debuff to Bouncer for confusion applied from Brain of Confusion
* API: Added return in OnNameCollision if hook has been handled. (@Patrikkk) * API: Added return in OnNameCollision if hook has been handled. (@Patrikkk)

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit bf54cd2eb1d4b7961b861e0c755e4e45331ba71a Subproject commit e39f6fe7526ddb6e67fe6c428e3614bae38d0c04