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

Merge branch 'general-devel' into patch-22

Browse source
This commit is contained in:
Chris 2021-05-19 17:43:17 +09:30 • committed by GitHub
commit 6fee39ed68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore) * Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore)
* `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively. * `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively.
* Updated HealOtherPlayer damage check to make more sense by respecting `ignoredamagecap` permission. (@moisterrific) * Updated HealOtherPlayer damage check to make more sense by respecting `ignoredamagecap` permission. (@moisterrific)
* Added preliminary support for Terraria 1.4.2.3 (@moisterrific, @Moneylover3246, @DeathCradle)
## TShock 4.5.2 ## TShock 4.5.2
* Added preliminary support for Terraria 1.4.2.2. (@hakusaro) * Added preliminary support for Terraria 1.4.2.2. (@hakusaro)

5
TShockAPI/DB/GroupManager.cs
View file

@ -77,7 +77,10 @@ namespace TShockAPI.DB
Permissions.whisper, Permissions.whisper,
Permissions.wormhole, Permissions.wormhole,
Permissions.canpaint, Permissions.canpaint,
Permissions.pylon)); Permissions.pylon,
Permissions.tppotion,
Permissions.magicconch,
Permissions.demonconch));
AddDefaultGroup("vip", "default", AddDefaultGroup("vip", "default",
string.Join(",", string.Join(",",

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 96c1bc95fe7526b294f65dc711a1494b5869c9ea Subproject commit e738a271bc12b32811f8acc72cfbb3959ec4be47