From 1e233d15e72c1441029a59574e8da7dc708dae0d Mon Sep 17 00:00:00 2001 From: quake1337 <3310937+bartico6@users.noreply.github.com> Date: Mon, 11 Dec 2017 15:33:53 +0100 Subject: [PATCH 1/4] Update submodule --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index e76b7d18..faa3b956 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit e76b7d18175163cc9375361494ca6283113c4389 +Subproject commit faa3b95697bbf675503b2823c5f59593cf825bb3 From c1c57160068b5569aac9dc7fa801b41134198383 Mon Sep 17 00:00:00 2001 From: Ryozuki Date: Mon, 11 Dec 2017 16:26:19 +0100 Subject: [PATCH 2/4] update assembly company to Pryaxis --- TShockAPI/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index c5fc1426..9ebbdb5f 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("TShock for Terraria")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Nyx Studios & TShock Contributors")] +[assembly: AssemblyCompany("Pryaxis & TShock Contributors")] [assembly: AssemblyProduct("TShockAPI")] [assembly: AssemblyCopyright("Copyright © Nyx Studios 2011-2017")] [assembly: AssemblyTrademark("")] From bbabec6003bb17d5c140c470c20db9d2f8f7edc1 Mon Sep 17 00:00:00 2001 From: Ryozuki Date: Mon, 11 Dec 2017 16:29:37 +0100 Subject: [PATCH 3/4] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4eafb1d..d3ce77d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Fixed DumpItems() from trying to dump older versions of certain items (negative item IDs). (@Zaicon) * Added the `/dump-reference-data` command, which when run, runs Utils.Dump() and outputs Terraria reference data to the server folder. (@hakusaro) * Fixed builds to not require a specific version of OTAPI and to not fail when in Release mode (@bartico6) +* Update Assembly Company to Pryaxis (@Ryozuki) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) From b3928905519abaccfdbe9cd735ee13ed2fe0ba30 Mon Sep 17 00:00:00 2001 From: Ryozuki Date: Mon, 11 Dec 2017 23:09:07 +0100 Subject: [PATCH 4/4] update copyright notice --- TShockAPI/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 9ebbdb5f..f4030480 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Pryaxis & TShock Contributors")] [assembly: AssemblyProduct("TShockAPI")] -[assembly: AssemblyCopyright("Copyright © Nyx Studios 2011-2017")] +[assembly: AssemblyCopyright("Copyright © Pryaxis & TShock Contributors 2011-2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]