User:Nearox/SRLE Explorers Conflict Resolution: Difference between revisions

Revision as of 19:36, October 4, 2015

SRLE - Explorer's Edition
Conflict Resolution Subguide
Last Update: 19:36:24 4 October 2015 (UTC)

- Add Cutting Room Floor.esp as master = Add 3DNPC.esp as a master

Conflicts and Fixes

Armor

Cell

Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn>

Conflict Resolution: Use record from ELE_Legendary_Fs_Wt_Lite.esp.
Problem Resolved: Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of subrecord 00064110.

Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110

Conflict Resolution: Use record from Immersive Citizens - AI Overhaul Merged.esp then move the Record flags from 3DNPC.esp.
Problem Resolved: Changes from Interesting NPCs and Immersive Citizens needed to be merged.

Block 1 \ Sub-Block 3 \ 0001677F <WindhelmNewGnisisCornerclub> \ Temporary \ 000D26CA

Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX.

Block 1 \ Sub-Block 6 \ 000681DD <BoulderfallCave01> \ Temporary \ 000D3C70

Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX

Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C94C3

Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX

Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C951B

Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX

Block 2 \ Sub-Block 7 \ 0001522C <PurewaterRun01> \ Persistent \ 000C9AA9

Conflict Resolution: Use record from Skyrim Immersive Creatures.esp then move the Record flags from 3DNPC.esp.
Problem Resolved: Changes from Skyrim Immersive Creatures and Interesting NPCs needed to be merged.

Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman> \ Persistent \ 000E1BA9 <HirelingJenassaREF>

Conflict Resolution: Use record from 3DNPC.esp then move the Linked References from Cutting Room Floor.esp.
Problem Resolved: Changes from Cutting Room Floor and Interesting NPCs needed to be merged.

Block 6 \ Sub-Block 0 \ 0001605E <WhiterunBanneredMare> \ Persistent \ 00092A30

Conflict Resolution: Use record from Immersive Citizens - AI Overhaul.esp then move the Record Flags from 3DNPC.esp.
Problem Resolved: Changes from Immersive Citizens and Interesting NPCs needed to be merged.

Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Persistent \ 000C1D02

Conflict Resolution: Use record from EnhancedLightsandFX.esp..
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX

Template

Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.

Template

Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.

Template

Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.

@@ Line 25: / Line 25: @@
 ===== Block 1 \ Sub-Block 3 \ 0001677F <WindhelmNewGnisisCornerclub> \ Temporary \ 000D26CA =====
 '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br>
-'''Problem Resolved:''' Carry over lighting changes of''Enhanced Lights and FX''.
+'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''.
 ===== Block 1 \ Sub-Block 6 \ 000681DD <BoulderfallCave01> \ Temporary \ 000D3C70 =====
 '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br>
-'''Problem Resolved:''' Carry over lighting changes of''Enhanced Lights and FX''
+'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''
 ===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C94C3 =====
 '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br>
-'''Problem Resolved:''' Carry over lighting changes of''Enhanced Lights and FX''
+'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''
 ===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C951B =====
 '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br>
-'''Problem Resolved:''' Carry over lighting changes of''Enhanced Lights and FX''
+'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''
 ===== Block 2 \ Sub-Block 7 \ 0001522C <PurewaterRun01> \ Persistent \ 000C9AA9 =====
@@ Line 47: / Line 47: @@
 '''Problem Resolved:''' Changes from ''Cutting Room Floor'' and ''Interesting NPCs'' needed to be merged.
-===== Template =====
+===== Block 6 \ Sub-Block 0 \ 0001605E <WhiterunBanneredMare> \ Persistent \ 00092A30 =====
-'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br>
+'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul.esp'' then move the Record Flags from ''3DNPC.esp''.<br>
-'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
+'''Problem Resolved:''' Changes from ''Immersive Citizens'' and ''Interesting NPCs'' needed to be merged.
-===== Template =====
+===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Persistent \ 000C1D02 =====
-'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br>
+'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''..<br>
-'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
+'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''
 ===== Template =====