aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2013-05-21 14:56:43 +0200
committerKahrl <kahrl@gmx.net>2013-05-21 14:56:43 +0200
commit4a9fe1a1d5d19565bca67c0dcb3dbf43bd06f278 (patch)
tree5b6f1856c6cfea726c3b3fe11b66eaa4dcf85394 /src
parente57dc4ef1899fd172b94dc67c3a70be49803145e (diff)
downloadminetest-4a9fe1a1d5d19565bca67c0dcb3dbf43bd06f278.tar.gz
minetest-4a9fe1a1d5d19565bca67c0dcb3dbf43bd06f278.tar.bz2
minetest-4a9fe1a1d5d19565bca67c0dcb3dbf43bd06f278.zip
Log non-fatal mod name conflict to actionstream instead of errorstream
Diffstat (limited to 'src')
-rw-r--r--src/mods.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mods.cpp b/src/mods.cpp
index 9097f5708..9bcf73aa7 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -309,7 +309,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
// BAD CASE: name conflict in different levels.
u32 oldindex = existing_mods[mod.name];
const ModSpec &oldmod = m_unsatisfied_mods[oldindex];
- errorstream<<"WARNING: Mod name conflict detected: \""
+ actionstream<<"WARNING: Mod name conflict detected: \""
<<mod.name<<"\""<<std::endl
<<"Will not load: "<<oldmod.path<<std::endl
<<"Overridden by: "<<mod.path<<std::endl;