ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/java/installer2/doc/conflict-resolving.txt
Revision: 722
Committed: Thu Mar 21 11:41:22 2013 UTC (12 years, 6 months ago) by alloc
Content type: text/plain
File size: 551 byte(s)
Log Message:
Moved AEI2 to java folder

File Contents

# Content
1 Multi-.Oni: No conflict, priority based resolution
2
3 BSL:
4 1. Mods containing different BSL-files for the same level (addon=no):
5 "light" warning window
6
7 2. Mods containing (partially) same BSL-files for the same level (addon=no):
8 Conflict warning, if accepted take only files of higher priority mod
9
10 3. Mods containing (partially) same BSL-files for the same level (addon=yes):
11 no conflict, overwrite base files with addon-files
12
13 4. As 3 with Addon on Addon:
14 ("Light" warning?) conflicting files are resolved by higher priority addon taking precedence
15