From 3fe7fb62acc3b1dff296602304d20a15a10db00d Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Mon, 19 Jan 2026 02:58:12 +0100
Subject: [PATCH] Added configuration options for form type collisions and
 force-loading plugins

---
 SKSE/Plugins/EnderalSE.ini             |  2 ++
 SKSE/Plugins/EnderalVersion.ini        |  2 +-
 source/Enderal DLL/cmake/version.rc.in |  4 ++--
 source/Enderal DLL/src/Main.cpp        | 12 ++++++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/SKSE/Plugins/EnderalSE.ini b/SKSE/Plugins/EnderalSE.ini
index d68f5fbc4..2fcab40e8 100644
--- a/SKSE/Plugins/EnderalSE.ini
+++ b/SKSE/Plugins/EnderalSE.ini
@@ -1,3 +1,4 @@
+ForceLoadEnderalPlugins = true
 FlatMapMarkers = true
 StayAtSystemPage = true
 MapMarkerPlacementFixes = true
@@ -6,3 +7,4 @@ VideoInterruptPatch = true
 ForceBorderless = true
 AttachLightHitEffectCrashFix = true
 AutoScaleHeroMenu = true
+WarnFormTypeCollisions = true
diff --git a/SKSE/Plugins/EnderalVersion.ini b/SKSE/Plugins/EnderalVersion.ini
index e423fd86b..86095c33f 100644
--- a/SKSE/Plugins/EnderalVersion.ini
+++ b/SKSE/Plugins/EnderalVersion.ini
@@ -1 +1 @@
-version = 2.1.4
+version = 2.1.4.1
diff --git a/source/Enderal DLL/cmake/version.rc.in b/source/Enderal DLL/cmake/version.rc.in
index b1d91ed93..775f8176a 100644
--- a/source/Enderal DLL/cmake/version.rc.in	
+++ b/source/Enderal DLL/cmake/version.rc.in	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4329f800ad76e7ec3d7178d3d429230d1258284bf9b26f5b8ffdc97475f41280
-size 933
+oid sha256:f3f8d8b4de30101444236e0ff255c2504e734454596f273e0b496aff080b5abd
+size 931
diff --git a/source/Enderal DLL/src/Main.cpp b/source/Enderal DLL/src/Main.cpp
index 5fdd20c68..53d58af3c 100644
--- a/source/Enderal DLL/src/Main.cpp	
+++ b/source/Enderal DLL/src/Main.cpp	
@@ -19,6 +19,8 @@
 using namespace SKSE;
 
 static std::map<std::string, bool> g_settings{
+	{ "ForceLoadEnderalPlugins", true },
+	{ "WarnFormTypeCollisions", true },
 	{ "FlatMapMarkers", true },
 	{ "StayAtSystemPage", true },
 	{ "MapMarkerPlacementFixes", true },
@@ -190,8 +192,14 @@ SKSEPluginLoad(const LoadInterface* skse) {
 
     Init(skse);
 	InitializeMessaging();
-	FormTypeCollisionDetector::Install();
-	PluginsTxtPatch::Install();
+
+	if (g_settings.at("WarnFormTypeCollisions")) {
+		FormTypeCollisionDetector::Install();
+	}
+
+	if (g_settings.at("ForceLoadEnderalPlugins")) {
+		PluginsTxtPatch::Install();
+	}
 
 	RE::INISettingCollection::GetSingleton()->GetSetting("sIntroSequence:General")->data.s = nullptr;