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:
Lucas Nicodemus 2021-05-20 01:52:35 -07:00 • committed by GitHub
commit 7d5901c350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 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
url = https://github.com/NyxStudios/TerrariaAPI-Server.git
ignore = dirty

2
CHANGELOG.md
View file

@ -17,6 +17,8 @@ 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 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)

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>
[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>
[Description("Whether or not the server should output debug level messages related to system operation.")]

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>
private static string LogFormat = LogFormatDefault;
/// <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>
private static string LogPath = LogPathDefault;
/// <summary>LogClear - Determines whether or not the log file should be cleared on initialization.</summary>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit e738a271bc12b32811f8acc72cfbb3959ec4be47
Subproject commit 27b275538bffb1f0fcb8b9c1830bc715373f5da1