From 62d15cf445364ca36437c476fa8bec1bd9d7aef2 Mon Sep 17 00:00:00 2001 From: stacey <57187883+moisterrific@users.noreply.github.com> Date: Sun, 16 May 2021 20:57:26 -0400 Subject: [PATCH 1/2] Add tele potion and conch perms to default --- TShockAPI/DB/GroupManager.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index e8610421..3bc66adb 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -77,7 +77,10 @@ namespace TShockAPI.DB Permissions.whisper, Permissions.wormhole, Permissions.canpaint, - Permissions.pylon)); + Permissions.pylon, + Permissions.tppotion, + Permissions.magicconch, + Permissions.demonconch)); AddDefaultGroup("vip", "default", string.Join(",", From d82db22e5d2e53c30078898e6333fdadcc2de78b Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sun, 16 May 2021 19:17:51 -0700 Subject: [PATCH 2/2] Tick submodule for 1.4.2.3 --- CHANGELOG.md | 1 + TerrariaServerAPI | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 580245a2..9e2db689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) * `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively. * 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 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index 96c1bc95..e738a271 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit 96c1bc95fe7526b294f65dc711a1494b5869c9ea +Subproject commit e738a271bc12b32811f8acc72cfbb3959ec4be47