From 7cc463d886bdadf4fe5ba59236e8630a416512ea Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Fri, 10 Jul 2015 01:07:14 -0600 Subject: [PATCH 1/2] Update max projectile damage to 1,175. --- CHANGELOG.md | 1 + TShockAPI/ConfigFile.cs | 4 ++-- scripts/deploy_release.py | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 874a97d3..f30631a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Fixed disappearing NPCs (@WhiteXZ) * Added much more performant code, SendQ, to server module. Reduces downstream network overhead by at least 40% (@tylerjwatson) * API: Updated TSPlayer.Disable to use new buffs (@Enerdy) +* Updated default max damage & projectile damage to 1,175 (based on 625 people) ## TShock 4.3.1 diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index adcea438..7851dca7 100755 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -290,10 +290,10 @@ namespace TShockAPI public bool AllowLoginAnyUsername = true; [Description("The maximum damage a player/npc can inflict.")] - public int MaxDamage = 175; + public int MaxDamage = 1175; [Description("The maximum damage a projectile can inflict.")] - public int MaxProjDamage = 175; + public int MaxProjDamage = 1175; [Description("Kicks a user if set to true, if they inflict more damage then the max damage.")] public bool KickOnDamageThresholdBroken = false; diff --git a/scripts/deploy_release.py b/scripts/deploy_release.py index a9194eba..5e2a90e1 100644 --- a/scripts/deploy_release.py +++ b/scripts/deploy_release.py @@ -99,7 +99,7 @@ upload_headers = {'Authorization': 'token ' + token, 'Content-Type':'application #upload the binary, resulting in a complete binary r = requests.post(upload_url, data=open(release_name, 'rb'), headers = upload_headers, verify=False) -read_and_update_config_on_confluence(config_desc_page, "ConfigDescriptions.txt") -read_and_update_config_on_confluence(ssc_desc_page, "ServerSideConfigDescriptions.txt") -read_and_update_config_on_confluence(permissions_desc_page, "PermissionsDescriptions.txt") -read_and_update_config_on_confluence(rest_desc_page, "RestDescriptions.txt") \ No newline at end of file +# read_and_update_config_on_confluence(config_desc_page, "ConfigDescriptions.txt") +# read_and_update_config_on_confluence(ssc_desc_page, "ServerSideConfigDescriptions.txt") +# read_and_update_config_on_confluence(permissions_desc_page, "PermissionsDescriptions.txt") +# read_and_update_config_on_confluence(rest_desc_page, "RestDescriptions.txt") \ No newline at end of file From 4f895649afa0b95a0a4afcbb695b36b0b92b13cf Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Fri, 10 Jul 2015 01:32:28 -0600 Subject: [PATCH 2/2] Version tick: 4.3.2 --- CHANGELOG.md | 3 ++- TShockAPI/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f30631a6..30980b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. -## TShock 4.3.2 (Unreleased) +## TShock 4.3.2 * Fixed the issue where using the Super Absorbent Sponge would disable users (@WhiteXZ) * Fixed an issue in NetGetData where e.Length - 1 would be -1 (@WhiteXZ) @@ -21,6 +21,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added much more performant code, SendQ, to server module. Reduces downstream network overhead by at least 40% (@tylerjwatson) * API: Updated TSPlayer.Disable to use new buffs (@Enerdy) * Updated default max damage & projectile damage to 1,175 (based on 625 people) +* Fixed support for SSC (@WhiteXZ) ## TShock 4.3.1 diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 297c0ca0..ebe37c8a 100755 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -53,5 +53,5 @@ using System.Runtime.InteropServices; // Also, be sure to release on github with the exact assembly version tag as below // so that the update manager works correctly (via the Github releases api and mimic) -[assembly: AssemblyVersion("4.3.1")] -[assembly: AssemblyFileVersion("4.3.1")] +[assembly: AssemblyVersion("4.3.2")] +[assembly: AssemblyFileVersion("4.3.2")]