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

Merge branch 'general-devel' into patch-21

Browse source
This commit is contained in:
Lucas Nicodemus 2021-05-20 01:57:39 -07:00 • committed by GitHub
commit 94939bc050
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "TerrariaServerAPI"] [submodule "TShockScaffoldAPI"]
path = TerrariaServerAPI path = TerrariaServerAPI
url = https://github.com/NyxStudios/TerrariaAPI-Server.git url = https://github.com/NyxStudios/TerrariaAPI-Server.git
ignore = dirty ignore = dirty

4
CHANGELOG.md
View file

@ -16,6 +16,10 @@ 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)
* 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. The MOTD format can now contain `%specifier%` to send the command specifier. (@moisterrific)
## 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)

2
TShockAPI/Configuration/TShockConfig.cs
View file

@ -41,7 +41,7 @@ namespace TShockAPI.Configuration
/// <summary>The path to the directory where logs should be written to.</summary> /// <summary>The path to the directory where logs should be written to.</summary>
[Description("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";
/// <summary>Whether or not the server should output debug level messages related to system operation.</summary> /// <summary>Whether or not the server should output debug level messages related to system operation.</summary>
[Description("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.")]

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
TShockAPI/TShock.cs
View file

@ -68,7 +68,7 @@ namespace TShockAPI
/// <summary>LogFormat - This is the log format, which is never set again.</summary> /// <summary>LogFormat - This is the log format, which is never set again.</summary>
private static string LogFormat = LogFormatDefault; private static string LogFormat = LogFormatDefault;
/// <summary>LogPathDefault - The default log path.</summary> /// <summary>LogPathDefault - The default log path.</summary>
private const string LogPathDefault = "tshock"; private const string LogPathDefault = "tshock/logs";
/// <summary>This is the log path, which is initially set to the default log path, and then to the config file log path later.</summary> /// <summary>This is the log path, which is initially set to the default log path, and then to the config file log path later.</summary>
private static string LogPath = LogPathDefault; private static string LogPath = LogPathDefault;
/// <summary>LogClear - Determines whether or not the log file should be cleared on initialization.</summary> /// <summary>LogClear - Determines whether or not the log file should be cleared on initialization.</summary>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 96c1bc95fe7526b294f65dc711a1494b5869c9ea Subproject commit 27b275538bffb1f0fcb8b9c1830bc715373f5da1