5.1.1

risk-of-thunder · Sep 10, 2024 · 14e7d25 · 14e7d25
1 parent c909d42
commit 14e7d25
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### '5.1.1'
+
+* General
+ * Updated to use version 1.3.4 of Risk of Rain 2
+ * RoR2EditorKit now loads as long as a version of the game greater than 1.3.1 is loaded, instead of being a strict version rule.
+
+* Core Changes:
+ * Removed the code bits of the EditorSettings pertraining to the ThunderKit integration
+
 ### '5.1.0'
 
 * General Changes:

diff --git a/Editor/Core/Data/R2EKSettings.cs b/Editor/Core/Data/R2EKSettings.cs
@@ -37,12 +37,6 @@ public sealed class R2EKSettings : ScriptableSingleton<R2EKSettings>
  public bool isFirstTimeBoot { get => _isFirstTimeBoot; set => _isFirstTimeBoot = value; }
  [SerializeField] private bool _isFirstTimeBoot = true;
 
- /// <summary>
- /// Checks if the ThunderKit integration system is enabled.
- /// </summary>
- public bool enableThunderkitIntegration => _enableThunderkitIntegration;
- [SerializeField] private bool _enableThunderkitIntegration = false;
-
  /// <summary>
  /// Checks if R2EK should purge <see cref="R2EKEditorProjectSettings"/> of orphaned settings
  /// </summary>

diff --git a/Editor/Core/Data/R2EKSettingsProvider.cs b/Editor/Core/Data/R2EKSettingsProvider.cs
@@ -69,14 +69,6 @@ public override void OnDeactivate()
  base.OnDeactivate();
  serializedObject.ApplyModifiedProperties();
  Save();
- if (settings.enableThunderkitIntegration && !ScriptingSymbolManager.ContainsDefine("R2EK_THUNDERKIT"))
- {
- ScriptingSymbolManager.AddScriptingDefine("R2EK_THUNDERKIT");
- }
- else if (!settings.enableThunderkitIntegration && ScriptingSymbolManager.ContainsDefine("R2EK_THUNDERKIT"))
- {
- ScriptingSymbolManager.RemoveScriptingDefine("R2EK_THUNDERKIT");
- }
  }
 
  private void Save()

diff --git a/Editor/R2APISupport/RoR2.Editor.R2API.asmdef b/Editor/R2APISupport/RoR2.Editor.R2API.asmdef
@@ -29,17 +29,17 @@
  "versionDefines": [
  {
  "name": "riskofrain2",
- "expression": "[1.3.1]",
+ "expression": "1.3.1",
  "define": "R2EK_ROR2_IMPORTED"
  },
  {
- "name" : "riskofthunder-r2api_addressables",
- "expression" : "1.0.3",
+ "name": "riskofthunder-r2api_addressables",
+ "expression": "1.0.3",
  "define": "R2EK_R2API_ADDRESSABLES"
  },
  {
- "name" : "riskofthunder-r2api_core",
- "expression" : "5.1.1",
+ "name": "riskofthunder-r2api_core",
+ "expression": "5.1.1",
  "define": "R2EK_R2API_ENABLE"
  }
  ],

diff --git a/Editor/RoR2/RoR2.Editor.Scripts.asmdef b/Editor/RoR2/RoR2.Editor.Scripts.asmdef
@@ -30,7 +30,7 @@
  "versionDefines": [
  {
  "name": "riskofrain2",
- "expression": "[1.3.1]",
+ "expression": "1.3.1",
  "define": "R2EK_ROR2_IMPORTED"
  }
  ],

diff --git a/Editor/ThunderkitSupport/RoR2.Editor.ThunderKit.asmdef b/Editor/ThunderkitSupport/RoR2.Editor.ThunderKit.asmdef
@@ -30,7 +30,7 @@
  },
  {
  "name": "riskofrain2",
- "expression": "[1.3.1]",
+ "expression": "1.3.1",
  "define": "R2EK_ROR2_IMPORTED"
  }
  ],

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
  "url": ""
  },
  "displayName": "RoR2EditorKit",
- "version": "5.1.0",
+ "version": "5.1.1",
  "unity": "2021.3",
  "description": "The Risk of Rain 2 Editor Kit (Abreviated as ROR2EK) is a Thunderkit Extension designed specifically for helping mod creators create content for Risk of Rain 2.",
  "dependencies": {