diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
deleted file mode 100644
index e8e4b463..00000000
--- a/.github/workflows/danger.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Danger
-on:
- workflow_dispatch:
- pull_request:
- types: [synchronize, edited, opened, reopened]
-jobs:
- build:
- name: Run changelog check
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: 'recursive'
- - name: Changelog check
- uses: Zomzog/changelog-checker@564f4aa7a062e7498bd253f616569f02fb024c06
- with:
- fileName: CHANGELOG.md
- noChangelogLabel: Blocked
- checkNotification: Simple
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
diff --git a/.gitmodules b/.gitmodules
index a5435efd..f3c700b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,4 @@
path = TerrariaServerAPI
url = https://github.com/NyxStudios/TerrariaAPI-Server.git
ignore = dirty
+ branch = general-devel
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32592e19..094e7a58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Added preliminary support for Terraria 1.4.4.4. (@SignatureBeef)
* GrassSpreadEventArgs Color property has been changed from a Byte to a TileColorCache type. (@SignatureBeef)
* SetDefaultsEventArgs now includes a nullable ItemVariant instance. (@SignatureBeef)
+* Use a string interpolation and escape single quotes when escaping tables (@drunderscore)
+* Removed obsolete resource files `TShockAPI/Resources.resx` and `TShockAPI/Resources.Designer.cs`. (@Arthri)
* Fixed painting wall/tile being rejected from hand of creation. (@Rozen4334)
## TShock 4.5.18
diff --git a/TShockAPI/DB/IQueryBuilder.cs b/TShockAPI/DB/IQueryBuilder.cs
index 19af36a9..03f67202 100644
--- a/TShockAPI/DB/IQueryBuilder.cs
+++ b/TShockAPI/DB/IQueryBuilder.cs
@@ -172,7 +172,7 @@ namespace TShockAPI.DB
///
protected override string EscapeTableName(string table)
{
- return table.SFormat("'{0}'", table);
+ return $"\'{table}\'";
}
}
diff --git a/TShockAPI/Resources.Designer.cs b/TShockAPI/Resources.Designer.cs
deleted file mode 100644
index 49c1d908..00000000
--- a/TShockAPI/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.34209
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace TShockAPI {
- using System;
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TShockAPI.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/TShockAPI/Resources.resx b/TShockAPI/Resources.resx
deleted file mode 100644
index 2f96abec..00000000
--- a/TShockAPI/Resources.resx
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
\ No newline at end of file
diff --git a/TShockLauncher/TShockLauncher.csproj b/TShockLauncher/TShockLauncher.csproj
index 6ac080fc..9128b93c 100644
--- a/TShockLauncher/TShockLauncher.csproj
+++ b/TShockLauncher/TShockLauncher.csproj
@@ -23,10 +23,10 @@
-
+
-
+
PreserveNewest
true
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index ada18322..36bcd959 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit ada183220947c1e44887161431e1ad520eb0e931
+Subproject commit 36bcd9594cc0406d34393dac5e7e806c2c4ea66e
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..159ec1e2
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,17 @@
+{
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+ "extends": [
+ "config:base"
+ ],
+ "git-submodules": {
+ "enabled": true
+ },
+ "packageRules": [
+ {
+ "matchPackageNames": ["OTAPI.Upcoming", "ModFramework", "TerrariaServerAPI"],
+ "ignoreUnstable": "false",
+ "bumpVersion": "prerelease",
+ "groupName": "OTAPI things"
+ }
+ ]
+}