X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmods.h;h=dedcc98978ff1ceb241dba2af5f32c9e22f75af3;hb=4e1f50035e860a00636ca5d804c267119df99601;hp=e10d49324bbf8a603af9f54f4d29f4576466c5ac;hpb=6228d634fb31d1ce925d1fdc2dac022629a007ef;p=dragonfireclient.git diff --git a/src/mods.h b/src/mods.h index e10d49324..dedcc9897 100644 --- a/src/mods.h +++ b/src/mods.h @@ -21,14 +21,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MODS_HEADER #include "irrlichttypes.h" -#include #include #include #include #include #include #include -#include #include "json/json.h" #include "config.h" @@ -152,10 +150,9 @@ class ModConfiguration // exists. A name conflict happens when two or more mods // at the same level have the same name but different paths. // Levels (mods in higher levels override mods in lower levels): - // 1. common mod in modpack; 2. common mod; - // 3. game mod in modpack; 4. game mod; - // 5. world mod in modpack; 6. world mod; - // 7. addon mod in modpack; 8. addon mod. + // 1. game mod in modpack; 2. game mod; + // 3. world mod in modpack; 4. world mod; + // 5. addon mod in modpack; 6. addon mod. std::set m_name_conflicts; };