From b754f142a1deea68c622405797f76d2e7acd3453 Mon Sep 17 00:00:00 2001 From: Chris <2648373+QuiCM@users.noreply.github.com> Date: Fri, 14 May 2021 22:08:32 +0930 Subject: [PATCH 1/8] Change logpath to `./tshock/logs` by default --- TShockAPI/Configuration/TShockConfig.cs | 2 +- TShockAPI/TShock.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Configuration/TShockConfig.cs b/TShockAPI/Configuration/TShockConfig.cs index 0f1139e6..ed78bb53 100644 --- a/TShockAPI/Configuration/TShockConfig.cs +++ b/TShockAPI/Configuration/TShockConfig.cs @@ -41,7 +41,7 @@ namespace TShockAPI.Configuration /// The path to the directory where logs should be written to. [Description("The path to the directory where logs should be written to.")] - public string LogPath = "tshock"; + public string LogPath = "tshock/logs"; /// Whether or not the server should output debug level messages related to system operation. [Description("Whether or not the server should output debug level messages related to system operation.")] diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index c60e5961..48c9bfe8 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -68,7 +68,7 @@ namespace TShockAPI /// LogFormat - This is the log format, which is never set again. private static string LogFormat = LogFormatDefault; /// LogPathDefault - The default log path. - private const string LogPathDefault = "tshock"; + private const string LogPathDefault = "tshock/logs"; /// This is the log path, which is initially set to the default log path, and then to the config file log path later. private static string LogPath = LogPathDefault; /// LogClear - Determines whether or not the log file should be cleared on initialization. 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 2/8] 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 3/8] 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 From 154456bbb55f6cfce4a1bbdea68f68da23d208d9 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 19 May 2021 23:51:34 -0700 Subject: [PATCH 4/8] Update submodule for TSAPI to fix #2304 --- CHANGELOG.md | 1 + TerrariaServerAPI | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e2db689..00fb459d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * `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) +* Added celebration mk2 explosive to explosives ItemID set in TSAPI. Solves #2304. (@Quinci135) ## TShock 4.5.2 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index e738a271..27b27553 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit e738a271bc12b32811f8acc72cfbb3959ec4be47 +Subproject commit 27b275538bffb1f0fcb8b9c1830bc715373f5da1 From 619c3d4f75a69a73edc97f683389ad9a47ab5275 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 19 May 2021 23:58:07 -0700 Subject: [PATCH 5/8] Rename TSAPI to TSAPI in git submodule file For the purposes of making it easier to understand, the Terraria Server API is now being called "TShock Scaffold API." This is actually just an elaborate measure so that TSAPI can be called TSAPI but to alleviate some confusion. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index a5435efd..10e01496 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "TerrariaServerAPI"] +[submodule "TShockScaffoldAPI"] path = TerrariaServerAPI url = https://github.com/NyxStudios/TerrariaAPI-Server.git ignore = dirty From 465537b4246cd1a5d61613b37571e7709dde3458 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Thu, 20 May 2021 01:50:28 -0700 Subject: [PATCH 6/8] Update changelog with log changes from @QuiCM --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00fb459d..7c3037af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * 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) * Added celebration mk2 explosive to explosives ItemID set in TSAPI. Solves #2304. (@Quinci135) +* TShock now writes its log files to the `logs` folder inside the `tshock` folder by default, as opposed to just the `tshock` folder. (@QuiCM) ## TShock 4.5.2 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro) From 38c070ad031ef649ea39b1b3b5a0c5bb413c81b9 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Thu, 20 May 2021 01:53:25 -0700 Subject: [PATCH 7/8] Update changelog with upcoming MOTD changes --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c3037af..4267cd24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added preliminary support for Terraria 1.4.2.3 (@moisterrific, @Moneylover3246, @DeathCradle) * Added celebration mk2 explosive to explosives ItemID set in TSAPI. Solves #2304. (@Quinci135) * TShock now writes its log files to the `logs` folder inside the `tshock` folder by default, as opposed to just the `tshock` folder. (@QuiCM) +* The default MOTD is now prettier. (@moisterrific) ## TShock 4.5.2 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro) From e5ffbfde91f53eebf60a066808b1747ee51224d5 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Thu, 20 May 2021 01:54:33 -0700 Subject: [PATCH 8/8] Add command specifier support in motd to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4267cd24..a918504a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added preliminary support for Terraria 1.4.2.3 (@moisterrific, @Moneylover3246, @DeathCradle) * Added celebration mk2 explosive to explosives ItemID set in TSAPI. Solves #2304. (@Quinci135) * TShock now writes its log files to the `logs` folder inside the `tshock` folder by default, as opposed to just the `tshock` folder. (@QuiCM) -* The default MOTD is now prettier. (@moisterrific) +* The default MOTD is now prettier. The MOTD format can now contain `%specifier%` to send the command specifier. (@moisterrific) ## TShock 4.5.2 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro)