Merge branch 'main' of https://github.com/DanaePlays/mlox-rules

mlox_user.txt

@@ -1021,6 +1021,14 @@ CalderaGovernorsManor.esp
 Beautiful cities of Morrowind.esp
 Odai River Upper Overhaul.esp
 
+[Order]
+BCOM_pathgrid_reset.esp
+BCoM_WaterWorks.esp
+
+[Order]
+BCOM_pathgrid_reset.esp
+BCoM_Concept_Art_Husk_Urshilaku.esp
+
 ;; BCOM Conflicts
 
 [Conflict]
@@ -8267,7 +8275,7 @@ Wanderers of Solstheim-TOTSP.esp
 Wanderers of Solstheim-TOTSP - Script Fix.esp
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; @Wares, @Friends and Foes, @F&F [Danae]
+;; @Wares, @Friends and Foes, @F&F @Ffrens @Ffoes [Danae]
 
 [Order]
 Wares-base.esm
@@ -8276,6 +8284,8 @@ Solstheim Tomb of The Snow Prince.esm
 [Order] ; Dependency (Pharis)
 Wares-base.esm
 F&F_base.esm
+Friends & Frens - base.esm
+Westly Prim & Proper Core.esm
 
 [Note]
 	!! You are using an old and unsupported version of 'Wares-base.esm' (that may have been bundled with another mod), this will cause issues with the new "Wares" plugins.
@@ -8284,6 +8294,7 @@ F&F_base.esm
 [Order]
 Wares*.esp
 F&F_*.esp
+Friends & Frens*.esp
 
 [Order]
 Wares_TR_npcs.esp
@@ -8293,10 +8304,14 @@ TR_Travels*.esp
 Animated_Morrowind - merged*.esp
 F&F_TR.esp
 
+[Note]
+	F&F - Companion is obsolete, use Friends & Frens instead 
+	[New version]( https://www.nexusmods.com/morrowind/mods/52763 )
+F&F_companions.esp
+
 [Order]
 Animated_Morrowind - merged*.esp
-F&F_companions.esp
-Friends and Frens.esp
+Friends and Frens*.esp
 
 [Order]
 Animated_Morrowind - merged*.esp
@@ -8328,15 +8343,13 @@ F&F_no_city_interiors.ESP
 F&F_No_Sitters.esp
 
 [Order]
-F&F_companions.esp
-Friends and Frens.esp
-Ahead of the Classes.esp
-Ahead of the Classes-FF addon.esp
+Friends & Frens - Vvardenfell.ESP
+Friends & Frens - TR.ESP
+Friends & Frens - Prim & Proper.ESP
 
 [Order]
 A Bard's Life.esp
-F&F_companions.esp
-Friends and Frens.esp
+Friends and Frens*.esp
 
 [Order]
 Hold_it*.esp
@@ -8351,11 +8364,6 @@ F&F_*.esp
 Beautiful cities of Morrowind.esp
 BCoM_for_Wares.esp
 
-[Order]
-Liar yes Idiot no.esp
-F&F_companions.esp
-Friends and Frens.esp
-
 [Order] ; ( Ref: https://www.nexusmods.com/morrowind/mods/51657) (Pharis)
 Wares*.esp
 Dankes Armors Wares.esp
@@ -8381,13 +8389,6 @@ ST_Books_Wares_rotate.esp
 F&F_scarce.esp
 F&F_MOAR.esp
 
-[Conflict]
-	Use only one of these plugins:
-		'F&F_heads_vanilla.esp' -  If you have "F&F_TR" but don't want npcs to use TR heads.
-		'F&F_heads_Westly.esp' - NPCs will use heads from "Westly's Master Head Pack", download it here ( https://www.nexusmods.com/morrowind/mods/47605 ).
-F&F_heads_vanilla.esp
-F&F_heads_Westly.esp
-
 [Conflict]
 	Choose only one plugin:
 		'Wares-MOAR.esp' - Traders have double the amount of "Wares" items.
@@ -8404,6 +8405,12 @@ F&F_base.esm
 		Starfires*.esp
 		MCA*.esp]
 
+[Conflict] ; (Ref: https://www.nexusmods.com/morrowind/mods/49251? )
+	"Friends and Frens" includes and expands on companions from "CM_Partners""MCA".
+Friends & Frens - base.esm
+[ANY	CM_Partners_*.esp
+		MCA*.esp]
+
 [Conflict]
 	Use only one of these plugins:
 		'Wares_TR_npcs.esp'- NPC use Wares lists including Wares-Aware mods.
@@ -8442,7 +8449,7 @@ Wares_lists_OAAB.esp
 [Conflict]
 	Use only one of these plugins:
 		'F&F_companions.esp'- old and unsupported, use Friends and Frens.esp.
-		'Friends and Frens.esp' - latest version.
+		'Friends & Frens - base.esm' - latest version.
 F&F_companions.esp
 Friends and Frens.esp