[WIP] renamed the client to ManaVerse

removed evol, since its not developed anymore... only leads to confusing players
removed that anoying 'broken nick detected' message (regulare player don't care what crap the server sends)
updated copyright -2020 for manaplus

* Updated in 2024-02-08 with conflicts by Jesusalva

17 files changed, 142 insertions, 659 deletions

diff --git a/packaging/debian/control b/packaging/debian/control
index 406256830..6f13a0e6d 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,8 +1,8 @@
-Source: manaplus
+Source: manaverse
 Section: games
 Priority: optional
-Homepage: http://manaplus.org/
-Maintainer: Andrei Karas <akaras@inbox.ru>
+Homepage: https://manaverse.germantmw.de/
+Maintainer: Mike Wollmann <jak1@themanaworld.org>
 Uploaders: Patrick Matthäi <pmatthaei@debian.org>
 Standards-Version: 3.9.7
 Build-Depends: debhelper (>= 9),
@@ -21,52 +21,46 @@ Build-Depends: debhelper (>= 9),
  dh-autoreconf,
  autopoint
 
-Package: manaplus
+Package: manaverse
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- manaplus-data (= ${source:Version}),
+ manaverse-data (= ${source:Version}),
  xsel,
  x11-utils,
  xdg-utils
 Suggests: mumble
-Description: Extended client for Evol Online and The Mana World
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
  serious effort to create an innovative free and open source MMORPG.
  TMW uses 2D graphics and aims to create a large and diverse interactive world.
 
-Package: manaplus-dbg
+Package: manaverse-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends},
- manaplus (= ${binary:Version})
-Description: Extended client for Evol Online and The Mana World (debugging symbols)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+ manaverse (= ${binary:Version})
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
  serious effort to create an innovative free and open source MMORPG.
  TMW uses 2D graphics and aims to create a large and diverse interactive world.
  .
- This package provides debugging symbols for the manaplus package.
+ This package provides debugging symbols for the manaverse package.
 
-Package: manaplus-data
+Package: manaverse-data
 Architecture: all
 Depends: ${misc:Depends},
  ttf-dejavu-core,
  fonts-liberation
-Recommends: manaplus,
+Recommends: manaverse,
  fonts-mplus,
  fonts-wqy-microhei
-Description: Extended client for Evol Online and The Mana World (data files)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
  serious effort to create an innovative free and open source MMORPG.
  TMW uses 2D graphics and aims to create a large and diverse interactive world.
  .
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 846ea7e19..1b849b349 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,11 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: manaplus
-Source: http://download.evolonline.org/manaplus/download/
+Upstream-Name: manaverse
+Source: https://manaverse.germantmw.de/
 
 Files: *
 Copyright: 2004-2009  The Mana World Development Team
            2009-2010  The Mana Developers
-           2011-2014  The ManaPlus Developers
+           2011-2020  The ManaPlus Developers
+           2020-2023  The ManaVerse Developers
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -26,7 +27,7 @@ License: GPL-2
 
 Files: src/debug/*
 Copyright: 2004-2008 Wu Yongwei <adah at users dot sourceforge dot net>
-           2012-2014  The ManaPlus Developers
+           2012-2014  The ManaVerse Developers
 License: zlib
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@@ -47,11 +48,11 @@ License: zlib
  This file is part of Stones of Nvwa:
       http://sourceforge.net/projects/nvwa
  .
- original version changed for ManaPlus
+ original version changed for ManaVerse
 
 Files: src/sdl2gfx/*
 Copyright: 2001-2012  Andreas Schiffler
-           2013-2014  The ManaPlus Developers
+           2013-2014  The ManaVerse Developers
 License: zlib
  This software is provided 'as-is', without any express or implied
  warranty. In no event will the authors be held liable for any damages
@@ -91,7 +92,7 @@ Files: src/particle/animationparticle.cpp
  src/particle/textparticle.h
 Copyright: 2006-2009  The Mana World Development Team
            2009-2010  The Mana Developers
-           2011-2014  The ManaPlus Developers
+           2011-2014  The ManaVerse Developers
 License: GPL-2
 
 Files: src/being/beingflag.h
@@ -233,7 +234,7 @@ Files: src/being/beingflag.h
  src/utils/chatutils.h
  src/utils/gettexthelper.cpp
  src/utils/gettexthelper.h
-Copyright: 2011-2014  The ManaPlus Developers
+Copyright: 2011-2014  The ManaVerse Developers
 License: GPL-2
 
 Files: src/events/actionevent.h
@@ -264,7 +265,7 @@ Files: src/events/actionevent.h
  src/listeners/selectionlistener.h
  src/listeners/widgetlistener.h
  src/utils/sdlpixel.h
-Copyright: 2011-2014  The ManaPlus Developers
+Copyright: 2011-2014  The ManaVerse Developers
            2004-2008 Olof Naessén and Per Larsson
 License: GPL-2
 
@@ -289,7 +290,7 @@ Files: src/gui/models/sortlistmodelinv.h
  src/resources/ambientlayer.cpp
  src/resources/ambientlayer.h
 Copyright: 2009-2010  The Mana Developers
-           2011-2014  The ManaPlus Developers
+           2011-2014  The ManaVerse Developers
 License: GPL-2
 
 Files: src/utils/base64.cpp
@@ -380,7 +381,7 @@ License: GPL-2+ or PHP
 
 Files: src/net/beinghandler.h
 Copyright: 2004  The Mana World Development Team
-           2012-2014  The ManaPlus Developers
+           2012-2014  The ManaVerse Developers
 License: GPL-2
 
 Files: src/gui/windows/outfitwindow.cpp
@@ -403,7 +404,7 @@ Files: src/gui/windows/outfitwindow.cpp
  src/vector.h
 Copyright: 2007-2009 The Mana World Development Team
            2009-2010 The Mana Developers
-           2011-2014 The ManaPlus Developers
+           2011-2014 The ManaVerse Developers
 License: GPL-2
 
 Files: src/gui/models/iconsmodel.h
@@ -426,7 +427,7 @@ Files: src/gui/models/iconsmodel.h
  src/textcommand.h
 Copyright: 2009 The Mana World Development Team
            2009-2010 Andrei Karas
-           2011-2014 The ManaPlus Developers
+           2011-2014 The ManaVerse Developers
 License: GPL-2
 
 Files: data/perserver/*
@@ -459,20 +460,20 @@ Files: data/perserver/*
  src/utils/process.h
  src/utils/timer.cpp
  src/utils/timer.h
-Copyright: 2011-2014 The ManaPlus Developers
+Copyright: 2011-2014 The ManaVerse Developers
 License: GPL-2
 
 Files: src/utils/copynpaste.cpp
  src/utils/copynpaste.h
 Copyright: 2001-2010 Wormux Team
-           2011-2014 The ManaPlus Developers
+           2011-2014 The ManaVerse Developers
 License: GPL-2
 
 Files: src/gui/sdlinput.cpp
  src/gui/sdlinput.h
 Copyright: 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
            2007-2010  The Mana World Development Team
-           2011-2014  The ManaPlus Developers
+           2011-2014  The ManaVerse Developers
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -500,7 +501,7 @@ License: BSD-3-clause
 
 Files: src/mumblemanager.h src/mumblemanager.cpp
 Copyright: Mumble Wiki editors
-           The ManaPlus Developers
+           The ManaVerse Developers
 License: public-domain
  Based on code from http://mumble.sourceforge.net/Link
  Example for mumble integration.
@@ -512,28 +513,28 @@ License: public-domain
 Files: src/utils/physfsrwops.cpp
  src/utils/physfsrwops.h
 Copyright: Ryan C. Gordon
-           2012-2014 The ManaPlus Developers
+           2012-2014 The ManaVerse Developers
 License: public-domain
 
 Files: data/themes/golden-delicious/*
 Copyright: 2012-2013 Francesco Miglietta
            2013 t3st3r
-           2012-2014 ManaPlus developers
+           2012-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/jewelry/*
 Copyright: 2012-2013 Francesco Miglietta
-           2012-2014 ManaPlus developers
+           2012-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/pink/*
 Copyright: 2011 Aline Ferraz de Souza
-           2011-2014 ManaPlus developers
+           2011-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/unity/*
 Copyright: 2011 Aline Ferraz de Souza
-           2011-2014 ManaPlus developers
+           2011-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/graphics/gui/target-cursor-in-range-l.xml
@@ -544,12 +545,12 @@ Files: data/graphics/gui/target-cursor-in-range-l.xml
  data/graphics/gui/target-cursor-normal-s.xml
 Copyright: 2013 Alige
            2013 Evol Online
-           2013-2014  The ManaPlus Developers
+           2013-2014  The ManaVerse Developers
 License: CC-BY-SA-3.0
 
 Files: data/graphics/flags/*
 Copyright: 2012-2013 Alige
-           2012-2014  The ManaPlus Developers
+           2012-2014  The ManaVerse Developers
 License: CC-BY-SA-3.0
 
 Files: data/graphics/sprites/arrow_down.png
@@ -557,7 +558,7 @@ Files: data/graphics/sprites/arrow_down.png
  data/graphics/sprites/arrow_right.png
  data/graphics/sprites/arrow_up.png
  data/graphics/gui/buttonplay.png
-Copyright: 2011-2014  The ManaPlus Developers
+Copyright: 2011-2014  The ManaVerse Developers
 License: CC-BY-SA-3.0
 
 Files: data/sfx/system/attention.ogg
diff --git a/packaging/debian/manaplus-data.install b/packaging/debian/manaplus-data.install
index 186b1cf5a..88e9ad428 100644
--- a/packaging/debian/manaplus-data.install
+++ b/packaging/debian/manaplus-data.install
@@ -1,9 +1,9 @@
 usr/share/locale
-usr/share/manaplus/data/graphics
-usr/share/manaplus/data/help
-usr/share/manaplus/data/icons
-usr/share/manaplus/data/themes
-usr/share/manaplus/data/sfx
-usr/share/manaplus/data/sfx/system
-usr/share/manaplus/data/perserver
-usr/share/manaplus/data/translations
+usr/share/manaverse/data/graphics
+usr/share/manaverse/data/help
+usr/share/manaverse/data/icons
+usr/share/manaverse/data/themes
+usr/share/manaverse/data/sfx
+usr/share/manaverse/data/sfx/system
+usr/share/manaverse/data/perserver
+usr/share/manaverse/data/translations
diff --git a/packaging/debian/manaplus-data.links b/packaging/debian/manaplus-data.links
index 0754ce07d..c6b3d78cb 100644
--- a/packaging/debian/manaplus-data.links
+++ b/packaging/debian/manaplus-data.links
@@ -1,11 +1,11 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/manaplus/data/fonts/dejavusans.ttf
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/manaplus/data/fonts/dejavusans-bold.ttf
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/manaplus/data/fonts/dejavusansmono.ttf
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf usr/share/manaplus/data/fonts/dejavusansmono-bold.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf usr/share/manaplus/data/fonts/liberationsans-bold.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/manaplus/data/fonts/liberationsans.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-Bold.ttf usr/share/manaplus/data/fonts/liberationsansmono-bold.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/manaplus/data/fonts/liberationsansmono.ttf
-usr/share/fonts/truetype/mplus/mplus-1p-bold.ttf usr/share/manaplus/data/fonts/mplus-1p-bold.ttf
-usr/share/fonts/truetype/mplus/mplus-1p-regular.ttf usr/share/manaplus/data/fonts/mplus-1p-regular.ttf
-usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/manaplus/data/fonts/wqy-microhei.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/manaverse/data/fonts/dejavusans.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/manaverse/data/fonts/dejavusans-bold.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/manaverse/data/fonts/dejavusansmono.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf usr/share/manaverse/data/fonts/dejavusansmono-bold.ttf
+usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf usr/share/manaverse/data/fonts/liberationsans-bold.ttf
+usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/manaverse/data/fonts/liberationsans.ttf
+usr/share/fonts/truetype/liberation/LiberationMono-Bold.ttf usr/share/manaverse/data/fonts/liberationsansmono-bold.ttf
+usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/manaverse/data/fonts/liberationsansmono.ttf
+usr/share/fonts/truetype/mplus/mplus-1p-bold.ttf usr/share/manaverse/data/fonts/mplus-1p-bold.ttf
+usr/share/fonts/truetype/mplus/mplus-1p-regular.ttf usr/share/manaverse/data/fonts/mplus-1p-regular.ttf
+usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/manaverse/data/fonts/wqy-microhei.ttf
diff --git a/packaging/debian/manaplus.install b/packaging/debian/manaplus.install
index b6f7c99b6..0f040b1b5 100644
--- a/packaging/debian/manaplus.install
+++ b/packaging/debian/manaplus.install
@@ -1,4 +1,4 @@
-usr/share/applications/manaplus.desktop
-usr/share/manaplus/data/icons/manaplus.png usr/share/pixmaps
-usr/games/manaplus
-data/icons/manaplus.xpm usr/share/pixmaps
+usr/share/applications/manaverse.desktop
+usr/share/manaverse/data/icons/manaverse.png usr/share/pixmaps
+usr/games/manaverse
+data/icons/manaverse.xpm usr/share/pixmaps
diff --git a/packaging/debian/manaplus.lintian-overrides b/packaging/debian/manaplus.lintian-overrides
index fb8da9244..e3f477b45 100644
--- a/packaging/debian/manaplus.lintian-overrides
+++ b/packaging/debian/manaplus.lintian-overrides
@@ -1,3 +1,3 @@
-manaplus: spelling-error-in-binary usr/games/manaplus dont don't
-manaplus: spelling-error-in-binary usr/games/manaplus standart standard
-manaplus: spelling-error-in-binary usr/games/manaplus spaw spawn
+manaverse: spelling-error-in-binary usr/games/manaverse dont don't
+manaverse: spelling-error-in-binary usr/games/manaverse standart standard
+manaverse: spelling-error-in-binary usr/games/manaverse spaw spawn
diff --git a/packaging/debian/manaplus.manpages b/packaging/debian/manaplus.manpages
index dfa31fe89..23781ac33 100644
--- a/packaging/debian/manaplus.manpages
+++ b/packaging/debian/manaplus.manpages
@@ -1,2 +1,2 @@
-docs/manaplus.6
-docs/manaplustest.6
+docs/manaverse.6
+docs/manaversetest.6
diff --git a/packaging/debian/manaplus.menu b/packaging/debian/manaplus.menu
index df633b0e9..2af68d5df 100644
--- a/packaging/debian/manaplus.menu
+++ b/packaging/debian/manaplus.menu
@@ -1,5 +1,5 @@
-?package(manaplus):needs="X11" section="Games/Adventure" \
- title="ManaPlus" \
- longtitle="ManaPlus is a 2D MMORPG client." \
- command="/usr/games/manaplus" \
- icon="/usr/share/pixmaps/manaplus.xpm"
+?package(manaverse):needs="X11" section="Games/Adventure" \
+ title="ManaVerse" \
+ longtitle="ManaVerse is a 2D MMORPG client." \
+ command="/usr/games/manaverse" \
+ icon="/usr/share/pixmaps/manaverse.xpm"
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 7533b4c82..65c9caafe 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -9,12 +9,12 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
 override_dh_strip:
-	dh_strip -a --dbg-package=manaplus-dbg
+	dh_strip -a --dbg-package=manaverse-dbg
 
 override_dh_install:
 	dh_install
-	rm -f $(CURDIR)/debian/manaplus-data/usr/share/manaplus/data/themes/jewelry/LICENSE.txt
-	rm -f $(CURDIR)/debian/manaplus-data/usr/share/manaplus/data/themes/golden-delicious/LICENSE.txt
+	rm -f $(CURDIR)/debian/manaverse-data/usr/share/manaverse/data/themes/jewelry/LICENSE.txt
+	rm -f $(CURDIR)/debian/manaverse-data/usr/share/manaverse/data/themes/golden-delicious/LICENSE.txt
 
 %:
 	dh $@ --parallel --with autoreconf
diff --git a/packaging/debian/source.lintian-overrides b/packaging/debian/source.lintian-overrides
index 615c5ddde..86de4d849 100644
--- a/packaging/debian/source.lintian-overrides
+++ b/packaging/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
-manaplus source: dep5-copyright-license-name-not-unique
-manaplus source: missing-license-paragraph-in-dep5-copyright gpl-2
+manaverse source: dep5-copyright-license-name-not-unique
+manaverse source: missing-license-paragraph-in-dep5-copyright gpl-2
diff --git a/packaging/nacl/ports/manaplus/build.sh b/packaging/nacl/ports/manaplus/build.sh
index 19f97cabd..08d9b0a73 100755
--- a/packaging/nacl/ports/manaplus/build.sh
+++ b/packaging/nacl/ports/manaplus/build.sh
@@ -16,12 +16,12 @@ ConfigureStep() {
   SDL_CFLAGS=`$SDL_CONFIG --cflags`
   SDL_LIBS="-lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lSDL_net -lfreetype -ljpeg -lpng16 -lwebp -lvorbisfile -lvorbis -logg -lmikmod -lz -lbz2 -ltiff"
   export LIBS="-L${NACLPORTS_LIBDIR} ${SDL_LIBS} -lnacl_io -lpthread -lRegal -lm"
-  export MANAPLUSDIR="${START_DIR}/src"
+  export MANAVERSEDIR="${START_DIR}/src"
 
 #  autoreconf -i ${SRC_DIR}
-  autoreconf -i ${MANAPLUSDIR}
+  autoreconf -i ${MANAVERSEDIR}
 #  ${SRC_DIR}/configure
-  ${MANAPLUSDIR}/configure \
+  ${MANAVERSEDIR}/configure \
     --enable-naclbuild \
     --disable-nls \
     --with-opengl \
diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info
index 314dfb0b7..ed9fd19bd 100644
--- a/packaging/nacl/ports/manaplus/pkg_info
+++ b/packaging/nacl/ports/manaplus/pkg_info
@@ -1,6 +1,6 @@
-NAME=manaplus
+NAME=manaverse
 VERSION=1
-#URL=https://gitlab.com/manaplus/manaplus.git@master
+#URL=https://git.themanaworld.org/mana/plus
 LICENSE=GPL
 DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net curl libxml2 libwebp zlib)
 SHA1=4178d0c709b34b811d1781fc6dc183ea4979c2b5
diff --git a/packaging/openSUSE Build Service/manaplus.spec b/packaging/openSUSE Build Service/manaplus.spec
index 852f6422c..b624c5cf2 100644
--- a/packaging/openSUSE Build Service/manaplus.spec
+++ b/packaging/openSUSE Build Service/manaplus.spec
@@ -1,11 +1,11 @@
-Name:		manaplus
+Name:		manaverse
 Version:	1.1.6.26
 Release:	1
-Summary:	A client for Evol Online and The Mana World: 2D MMORPG
+Summary:	A client for The Mana World: 2D MMORPG
 Group:		Games/Other
 License:	GPLv2+
-Url:		http://manaplus.evolonline.org/
-Source0:	http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2
+Url:		https://manaverse.germantmw.de/
+Source0:	https://git.themanaworld.org/mana/plus/-/tree/v%{version}/
 BuildRoot:	%{_topdir}/%{name}-%{version}-root
 
 BuildRequires:	gcc-c++
@@ -21,15 +21,11 @@ BuildRequires:	libxml2-devel
 BuildRequires:	libpng-devel
 BuildRequires:	gettext-devel
 
-Provides:	evolonline-client = %{version}-%{release}
 Provides:	manaworld-client = %{version}-%{release}
 
 %description
-ManaPlus is extended client for Evol Online, The Mana World and similar
+ManaVerse is extended client for The Mana World and similar
 servers based on eAthena fork.
-As a 2D style game, Evol Online aims to create a friendly environment where 
-people can escape reality and interact with others while enjoying themselves 
-through a fantasy style game.
 The Mana World (TMW) is a serious effort to create an innovative free and 
 open source MMORPG. TMW uses 2D graphics and aims to create a large and 
 diverse interactive world.
diff --git a/packaging/switch/CMakeLists.txt.switch b/packaging/switch/CMakeLists.txt.switch
index 3895c9b0f..5bb35c166 100644
--- a/packaging/switch/CMakeLists.txt.switch
+++ b/packaging/switch/CMakeLists.txt.switch
@@ -25,11 +25,11 @@ elseif (PLATFORM_SWITCH)
     set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available")
 endif ()
 
-project(ManaPlus)
+project(ManaVerse)
 
 file(GLOB SOURCES src/*.cpp)
 set(SOURCES_DIRS src/being src/enums/being src/fs src/gui src/input
-        src/listeners src/net src/particle src/progs/manaplus src/render
+        src/listeners src/net src/particle src/progs/manaverse src/render
         src/resources src/sdl2gfx src/test src/utils)
 
 foreach (DIR ${SOURCES_DIRS})
@@ -39,9 +39,9 @@ endforeach (DIR)
 
 set(INCLUDES src src/sdl2gfx)
 
-set(FLAGS -DPACKAGE_NAME=\"ManaPlus\" -DPACKAGE_TARNAME=\"manaplus\" -DPACKAGE_VERSION=\"1.9.3.23\"
-        -DPACKAGE_STRING=\"ManaPlus\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"akaras@inbox.ru\" -DPACKAGE_URL=\"\"
-        -DPACKAGE=\"manaplus\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1
+set(FLAGS -DPACKAGE_NAME=\"ManaVerse\" -DPACKAGE_TARNAME=\"manaverse\" -DPACKAGE_VERSION=\"1.9.3.23\"
+        -DPACKAGE_STRING=\"ManaVerse\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"akaras@inbox.ru\" -DPACKAGE_URL=\"\"
+        -DPACKAGE=\"manaverse\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1
         -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
         -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1
         -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \\*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \\*\)
@@ -108,5 +108,5 @@ if (PLATFORM_SWITCH)
     add_custom_target(${PROJECT_NAME}.nro
             DEPENDS ${PROJECT_NAME}
             COMMAND ${DEVKITPRO}/tools/bin/nacptool --create "${PROJECT_NAME}" "cpasjuste" "1.9.3.23" ${PROJECT_NAME}.nacp
-            COMMAND ${DEVKITPRO}/tools/bin/elf2nro ${PROJECT_NAME} ${PROJECT_NAME}.nro --icon=${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus-switch.jpeg --nacp=${PROJECT_NAME}.nacp)
+            COMMAND ${DEVKITPRO}/tools/bin/elf2nro ${PROJECT_NAME} ${PROJECT_NAME}.nro --icon=${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaverse-switch.jpeg --nacp=${PROJECT_NAME}.nacp)
 endif ()
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
deleted file mode 100644
index 1aa27088a..000000000
--- a/packaging/windows/evol.nsi
+++ /dev/null
@@ -1,488 +0,0 @@
-; This script allows the following parameters being overwritten from
-; command line. When called without any parameters it behaves exactly
-; like the old install script.
-;
-; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaplus.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
-; PRODUCT_VERSION - software version
-; UPX - upx binary name
-;
-; For a cmake build on UNIX the following should give you a working installer:
-; makensis -DDLLDIR=/path/to/dlls \
-;    -DPRODUCT_VERSION=0.1.`date +%Y%m%d`
-;    -DUPX=upx
-;    -DEXESUFFIX=/src
-
-CRCCheck on
-SetCompress off
-SetCompressor /SOLID lzma
-
-RequestExecutionLevel admin
-
-!define SRCDIR "..\.."
-!ifndef UPX
-  !define "UPX upx\upx.exe"
-!endif
-
-!ifdef EXESUFFIX
-  !define EXEDIR ${SRCDIR}/${EXESUFFIX}
-!endif
-
-!ifndef EXEDIR
-  !define EXEDIR ${SRCDIR}
-!endif
-
-!ifndef DLLDIR
-  !define DLLDIR ${SRCDIR}/dll
-!endif
-
-!ifndef BITS
-  !define BITS 32
-!endif
-
-!ifndef SEHDLL
-  !define SEHDLL "libgcc_s_sjlj-1.dll"
-!endif
-
-;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
-
-!define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_EXECUTIONLEVEL "admin"
-!include "MultiUser.nsh"
-
-; HM NIS Edit helper defines
-!define PRODUCT_NAME "EvolClient"
-!ifndef PRODUCT_VERSION
-  !define PRODUCT_VERSION "1.1"
-!endif
-!define PRODUCT_PUBLISHER "Evol Online Delopment Team"
-!define PRODUCT_WEB_SITE "http://www.evolonline.org/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "SHCTX"
-
-!include "FileAssociation.nsh"
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\evol\icons\evol-client.ico"
-;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\evol\icons\evol-client.ico"
-
-;Language Selection Dialog Settings
-;Remember the installer language
-!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
-!define MUI_LANGDLL_REGISTRY_KEY "Software\EvolOnline"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-!define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
-
-; Welcome page
-
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "${SRCDIR}\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Components page
-!insertmacro MUI_PAGE_COMPONENTS
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION RunEvol
-!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
-!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
-!define MUI_FINISHPAGE_LINK "Visit EvolOnline website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.evolonline.org/"
-!insertmacro MUI_PAGE_FINISH
-
-Function RunEvol
-SetOutPath $INSTDIR
-Exec "$INSTDIR\manaplus.exe $INSTDIR\evol.manaplus"
-FunctionEnd
-
-Function changeFinishImage
-!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\setup_finish.bmp"
-FunctionEnd
-
-; Uninstaller pages
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!define MUI_FINISHPAGE_TITLE_3LINES
-!insertmacro MUI_UNPAGE_FINISH
-
-;Languages
-!insertmacro MUI_LANGUAGE "English" # first language is the default language
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!insertmacro MUI_LANGUAGE "TradChinese"
-!insertmacro MUI_LANGUAGE "Japanese"
-!insertmacro MUI_LANGUAGE "Korean"
-!insertmacro MUI_LANGUAGE "Italian"
-!insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Danish"
-!insertmacro MUI_LANGUAGE "Swedish"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "Greek"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "Ukrainian"
-!insertmacro MUI_LANGUAGE "Czech"
-!insertmacro MUI_LANGUAGE "Slovak"
-!insertmacro MUI_LANGUAGE "Croatian"
-!insertmacro MUI_LANGUAGE "Bulgarian"
-!insertmacro MUI_LANGUAGE "Hungarian"
-!insertmacro MUI_LANGUAGE "Thai"
-!insertmacro MUI_LANGUAGE "Romanian"
-!insertmacro MUI_LANGUAGE "Latvian"
-!insertmacro MUI_LANGUAGE "Macedonian"
-!insertmacro MUI_LANGUAGE "Estonian"
-!insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "Lithuanian"
-!insertmacro MUI_LANGUAGE "Catalan"
-!insertmacro MUI_LANGUAGE "Slovenian"
-!insertmacro MUI_LANGUAGE "Serbian"
-!insertmacro MUI_LANGUAGE "SerbianLatin"
-!insertmacro MUI_LANGUAGE "Arabic"
-!insertmacro MUI_LANGUAGE "Farsi"
-!insertmacro MUI_LANGUAGE "Hebrew"
-!insertmacro MUI_LANGUAGE "Indonesian"
-!insertmacro MUI_LANGUAGE "Mongolian"
-!insertmacro MUI_LANGUAGE "Luxembourgish"
-!insertmacro MUI_LANGUAGE "Albanian"
-!insertmacro MUI_LANGUAGE "Breton"
-!insertmacro MUI_LANGUAGE "Belarusian"
-!insertmacro MUI_LANGUAGE "Icelandic"
-!insertmacro MUI_LANGUAGE "Malay"
-!insertmacro MUI_LANGUAGE "Bosnian"
-!insertmacro MUI_LANGUAGE "Kurdish"
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-ReserveFile "setup_finish.bmp"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "evol-${PRODUCT_VERSION}-win${BITS}.exe"
-InstallDir "$PROGRAMFILES\EvolOnline"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-RequestExecutionLevel admin
-
-Function .onInit
-  !insertmacro MULTIUSER_INIT
-  !insertmacro MUI_LANGDLL_DISPLAY
-  InitPluginsDir
-  File /oname=$PLUGINSDIR\setup_finish.bmp "setup_finish.bmp"
-
-  ReadRegStr $R0 SHCTX \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `YES` (recomended) to remove the \
-  previous version or `NO` to install new version over old version." \
-  IDNO done
-
-;Run the uninstaller
-uninst:
-  ClearErrors
-  ExecWait '$R0' ;Do not copy the uninstaller to a temp file
-
-  IfErrors no_remove_uninstaller done
-    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
-    ;here to remove the uninstaller. Use a registry key to check
-    ;whether the user has chosen to uninstall. If you are using an uninstaller
-    ;components page, make sure all sections are uninstalled.
-  no_remove_uninstaller:
-
-done:
-
-FunctionEnd
-
-
-Section "Core files (required)" SecCore
-  SectionIn RO
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-  CreateDirectory "$INSTDIR\data"
-  CreateDirectory "$INSTDIR\data\evol"
-  CreateDirectory "$INSTDIR\data\evol\icons"
-  CreateDirectory "$INSTDIR\data\evol\images"
-  CreateDirectory "$INSTDIR\data\fonts"
-  CreateDirectory "$INSTDIR\data\graphics"
-  CreateDirectory "$INSTDIR\data\help"
-  CreateDirectory "$INSTDIR\data\help\idx"
-  CreateDirectory "$INSTDIR\data\help\tips"
-  CreateDirectory "$INSTDIR\data\icons"
-  CreateDirectory "$INSTDIR\data\music"
-  CreateDirectory "$INSTDIR\data\perserver"
-  CreateDirectory "$INSTDIR\data\perserver\default"
-  CreateDirectory "$INSTDIR\data\graphics\badges"
-  CreateDirectory "$INSTDIR\data\graphics\gui"
-  CreateDirectory "$INSTDIR\data\graphics\flags"
-  CreateDirectory "$INSTDIR\data\graphics\images"
-  CreateDirectory "$INSTDIR\data\graphics\shaders"
-  CreateDirectory "$INSTDIR\data\graphics\sprites"
-  CreateDirectory "$INSTDIR\data\sfx"
-  CreateDirectory "$INSTDIR\data\sfx\system"
-  CreateDirectory "$INSTDIR\data\themes"
-  CreateDirectory "$INSTDIR\data\themes\blacknblack"
-  CreateDirectory "$INSTDIR\data\themes\blackwood"
-  CreateDirectory "$INSTDIR\data\themes\classic"
-  CreateDirectory "$INSTDIR\data\themes\enchilado"
-  CreateDirectory "$INSTDIR\data\themes\golden-delicious"
-  CreateDirectory "$INSTDIR\data\themes\jewelry"
-  CreateDirectory "$INSTDIR\data\themes\mana"
-  CreateDirectory "$INSTDIR\data\themes\pink"
-  CreateDirectory "$INSTDIR\data\themes\unity"
-  CreateDirectory "$INSTDIR\data\themes\wood"
-  CreateDirectory "$INSTDIR\data\translations"
-  CreateDirectory "$INSTDIR\data\translations\help"
-  CreateDirectory "$INSTDIR\docs"
-
-  SetOverwrite ifnewer
-  SetOutPath "$INSTDIR"
-
-  File "${EXEDIR}\manaplus.exe"
-  File "${DLLDIR}\SDL.dll"
-  File "${DLLDIR}\SDL_image.dll"
-;  File "${DLLDIR}\SDL_mixer.dll"
-  File "${DLLDIR}\SDL_net.dll"
-  File "${DLLDIR}\SDL_ttf.dll"
-  File "${DLLDIR}\libSDL_gfx-15.dll"
-  File "${DLLDIR}\libcurl-4.dll"
-  File "${DLLDIR}\libfreetype-6.dll"
-  File "${DLLDIR}\${SEHDLL}"
-  File "${DLLDIR}\libiconv-2.dll"
-  File "${DLLDIR}\libintl-8.dll"
-  File "${DLLDIR}\libjpeg-9.dll"
-  File "${DLLDIR}\libogg-0.dll"
-  File "${DLLDIR}\libpng16-16.dll"
-  File "${DLLDIR}\libstdc++-6.dll"
-  File "${DLLDIR}\libvorbis-0.dll"
-  File "${DLLDIR}\libvorbisfile-3.dll"
-  File "${DLLDIR}\libxml2-2.dll"
-  File "${DLLDIR}\libwinpthread-1.dll"
-  File "${DLLDIR}\zlib1.dll"
-  File "${SRCDIR}\AUTHORS"
-  File "${SRCDIR}\COPYING"
-  File "${SRCDIR}\NEWS"
-  File "${SRCDIR}\README.txt"
-  SetOutPath "$INSTDIR\data\fonts"
-  File "${SRCDIR}\data\fonts\*.ttf"
-  SetOutPath "$INSTDIR\data\graphics\badges"
-  File "${SRCDIR}\data\graphics\badges\*.png"
-  File "${SRCDIR}\data\graphics\badges\*.xml"
-  SetOutPath "$INSTDIR\data\graphics\flags"
-  File "${SRCDIR}\data\graphics\flags\*.png"
-  SetOutPath "$INSTDIR\data\graphics\gui"
-  File "${SRCDIR}\data\graphics\gui\*.png"
-  File "${SRCDIR}\data\graphics\gui\*.xml"
-  SetOutPath "$INSTDIR\data\graphics\images"
-  File /x minimap_*.png ${SRCDIR}\data\graphics\images\*.png
-  File "${SRCDIR}\data\graphics\images\error.png"
-  SetOutPath "$INSTDIR\data\graphics\shaders"
-  File "${SRCDIR}\data\graphics\shaders\*.glsl"
-  SetOutPath "$INSTDIR\data\graphics\sprites"
-  File "${SRCDIR}\data\graphics\sprites\*.png"
-  File "${SRCDIR}\data\graphics\sprites\*.xml"
-  SetOutPath "$INSTDIR\data\sfx\system"
-  File "${SRCDIR}\data\sfx\system\*.ogg"
-  SetOutPath "$INSTDIR\data\themes\blacknblack"
-  File "${SRCDIR}\data\themes\blacknblack\*.png"
-  File "${SRCDIR}\data\themes\blacknblack\*.xml"
-  SetOutPath "$INSTDIR\data\themes\blackwood"
-  File "${SRCDIR}\data\themes\blackwood\*.png"
-  File "${SRCDIR}\data\themes\blackwood\*.xml"
-  SetOutPath "$INSTDIR\data\themes\mana"
-  File "${SRCDIR}\data\themes\mana\*.png"
-  File "${SRCDIR}\data\themes\mana\*.xml"
-  SetOutPath "$INSTDIR\data\themes\enchilado"
-  File "${SRCDIR}\data\themes\enchilado\*.png"
-  File "${SRCDIR}\data\themes\enchilado\*.xml"
-  SetOutPath "$INSTDIR\data\themes\golden-delicious"
-  File "${SRCDIR}\data\themes\golden-delicious\*.png"
-  File "${SRCDIR}\data\themes\golden-delicious\*.xml"
-  SetOutPath "$INSTDIR\data\themes\jewelry"
-  File "${SRCDIR}\data\themes\jewelry\*.png"
-  File "${SRCDIR}\data\themes\jewelry\*.xml"
-  SetOutPath "$INSTDIR\data\themes\pink"
-  File "${SRCDIR}\data\themes\pink\*.png"
-  File "${SRCDIR}\data\themes\pink\*.xml"
-  SetOutPath "$INSTDIR\data\themes\unity"
-  File "${SRCDIR}\data\themes\unity\*.png"
-  File "${SRCDIR}\data\themes\unity\*.xml"
-  SetOutPath "$INSTDIR\data\themes\wood"
-  File "${SRCDIR}\data\themes\wood\*.png"
-  File "${SRCDIR}\data\themes\wood\*.xml"
-  SetOutPath "$INSTDIR\data\translations\help"
-  File "${SRCDIR}\data\translations\help\*.po"
-  SetOutPath "$INSTDIR\data\help"
-  File "${SRCDIR}\data\help\*.txt"
-  SetOutPath "$INSTDIR\data\help\tips"
-  File "${SRCDIR}\data\help\tips\*.txt"
-  File "${SRCDIR}\data\help\tips\*.jpg"
-  SetOutPath "$INSTDIR\data\help\idx"
-  File "${SRCDIR}\data\help\idx\*.idx"
-  SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaplus.ico"
-  SetOutPath "$INSTDIR\data\music\"
-  File "${SRCDIR}\data\music\*.ogg"
-  SetOutPath "$INSTDIR\data\perserver\default\"
-  File "${SRCDIR}\data\perserver\default\*.txt"
-  File "${SRCDIR}\data\perserver\default\*.xml"
-  SetOutPath "$INSTDIR\docs"
-  File "${SRCDIR}\docs\FAQ.txt"
-  SetOutPath "$INSTDIR"
-  File "${SRCDIR}\data\evol\evol.manaplus"
-  SetOutPath "$INSTDIR\data\evol\images"
-  File "${SRCDIR}\data\evol\images\*.png"
-  SetOutPath "$INSTDIR\data\evol\icons"
-  File "${SRCDIR}\data\evol\icons\*.ico"
-SectionEnd
-
-Section "Create Shortcuts" SecShortcuts
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-  CreateDirectory "$SMPROGRAMS\EvolOnline"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaplus.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaplus.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-
-  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings"
-SectionEnd
-
-Section /o "Portable" SecPortable
-  SetOutPath "$INSTDIR"
-  File "portable.xml"
-SectionEnd
-
-Section /o "Debugger" SecDebug
-  SetOutPath "$INSTDIR"
-  File "${DLLDIR}\gdb.exe"
-  File "${DLLDIR}\libdl.dll"
-  File "${DLLDIR}\libexpat-1.dll"
-  File "${DLLDIR}\libreadline6.dll"
-  File "${DLLDIR}\libtermcap.dll"
-  File "${EXEDIR}\manaplusd.exe"
-  ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1
-    CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1
-  ${EndIf}
-SectionEnd
-
-Section /o "Profiler" SecProfiler
-  SetOutPath "$INSTDIR"
-  File "${EXEDIR}\manaplusp.exe"
-
-  ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-    CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  ${EndIf}
-SectionEnd
-
-; Section "Tools" SecTools
-;   SetOutPath "$INSTDIR"
-;   File "${EXEDIR}\dyecmd.exe"
-; SectionEnd
-
-Section "Translations" SecTrans
-  SetOutPath "$INSTDIR"
-  File /nonfatal /r "${SRCDIR}\translations"
-SectionEnd
-
-;Package descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues."
-;   !insertmacro MUI_DESCRIPTION_TEXT ${SecTools} "Install tools like dyecmd."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-
-Section -AdditionalIcons
-  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  WriteIniStr "$INSTDIR\ManaPlus.url" "InternetShortcut" "URL" "http://manaplus.evolonline.org/"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\Readme.lnk" "notepad.exe" "$INSTDIR\README.txt"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-SectionEnd
-
-Function un.onInit
-  !insertmacro MUI_UNGETLANGUAGE
-  !insertmacro MULTIUSER_UNINIT
-FunctionEnd
-
-Section Uninstall
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\EvolOnline"
-
-  Delete "$INSTDIR\*.*"
-
-  Delete "$SMPROGRAMS\EvolOnline\Uninstall.lnk"
-  Delete "$DESKTOP\EvolOnline.lnk"
-  Delete "$DESKTOP\EvolOnline (debug).lnk"
-  Delete "$DESKTOP\EvolOnline (profiler).lnk"
-  Delete "$DESKTOP\EvolOnline (tests).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline.lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk"
-  Delete "$SMPROGRAMS\EvolOnline\Website.lnk"
-  Delete "$SMPROGRAMS\EvolOnline\Readme.lnk"
-  Delete "$SMPROGRAMS\EvolOnline\FAQ.lnk"
-  Delete "$SMPROGRAMS\EvolOnline\EvolOnline.lnk"
-  Delete "$DESKTOP\EvolOnline.lnk"
-
-  RMDir "$SMPROGRAMS\EvolOnline"
-
-  RMDir /r "$INSTDIR\data"
-  RMDir /r "$INSTDIR\docs"
-  RMDir /r "$INSTDIR\translations"
-  RMDir /r "$INSTDIR\updates"
-  RMDir "$INSTDIR"
-
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
-  SetAutoClose true
-SectionEnd
diff --git a/packaging/windows/make-translations.sh b/packaging/windows/make-translations.sh
index 1d4132397..de8fff283 100755
--- a/packaging/windows/make-translations.sh
+++ b/packaging/windows/make-translations.sh
@@ -2,5 +2,5 @@
 
 for i in `grep -v ^# ../../po/LINGUAS`; do
     mkdir -p ../../translations/$i/LC_MESSAGES
-    msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaplus.mo ../../po/$i.po
+    msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaverse.mo ../../po/$i.po
 done
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 1c159c7cd..c7c09e1fa 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaplus.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
+; EXEDIR - directory containing manaverse.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -46,20 +46,20 @@ RequestExecutionLevel admin
 !endif
 
 ;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
 
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL "admin"
 !include "MultiUser.nsh"
 
 ; HM NIS Edit helper defines
-!define PRODUCT_NAME "ManaPlus"
+!define PRODUCT_NAME "ManaVerse"
 !ifndef PRODUCT_VERSION
   !define PRODUCT_VERSION "1.1"
 !endif
-!define PRODUCT_PUBLISHER "ManaPlus Development Team"
-!define PRODUCT_WEB_SITE "http://manaplus.evolonline.org/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
+!define PRODUCT_PUBLISHER "ManaVerse Development Team"
+!define PRODUCT_WEB_SITE "http://manaverse.germantmw.de"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "SHCTX"
 
@@ -71,9 +71,9 @@ RequestExecutionLevel admin
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\icons\manaplus.ico"
+!define MUI_ICON "${SRCDIR}\data\icons\manaverse.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\icons\manaplus.ico"
+!define MUI_UNICON "${SRCDIR}\data\icons\manaverse.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
@@ -101,13 +101,13 @@ RequestExecutionLevel admin
 !define MUI_FINISHPAGE_RUN_FUNCTION RunMana
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
 !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
-!define MUI_FINISHPAGE_LINK "Visit ManaPlus website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://manaplus.evolonline.org/"
+!define MUI_FINISHPAGE_LINK "Visit ManaVerse website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://manaverse.germantmw.de/"
 !insertmacro MUI_PAGE_FINISH
 
 Function RunMana
 SetOutPath $INSTDIR
-Exec "$INSTDIR\manaplus.exe"
+Exec "$INSTDIR\manaverse.exe"
 FunctionEnd
 
 Function changeFinishImage
@@ -179,7 +179,7 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "manaplus-${PRODUCT_VERSION}-win${BITS}.exe"
+OutFile "manaverse-${PRODUCT_VERSION}-win${BITS}.exe"
 InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -259,7 +259,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\manaplus.exe"
+  File "${EXEDIR}\manaverse.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
 ;  File "${DLLDIR}\SDL_mixer.dll"
@@ -341,7 +341,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help\idx"
   File "${SRCDIR}\data\help\idx\*.idx"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaplus.ico"
+  File "${SRCDIR}\data\icons\manaverse.ico"
   SetOutPath "$INSTDIR\data\music"
   File "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\data\perserver\default\"
@@ -355,14 +355,14 @@ Section "Create Shortcuts" SecShortcuts
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\Mana"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests
-  CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe"
-  CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests
-
-  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaverse.exe" --no-opengl
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaverse.exe" --safemode
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
+  CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
+  CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
+
+  ${registerExtension} "$INSTDIR\manaverse.exe" ".manaverse" "ManaVerse brandings"
 SectionEnd
 
 Section /o "Portable" SecPortable
@@ -377,19 +377,19 @@ Section /o "Debugger" SecDebug
   File "${DLLDIR}\libexpat-1.dll"
   File "${DLLDIR}\libreadline6.dll"
   File "${DLLDIR}\libtermcap.dll"
-  File "${EXEDIR}\manaplusd.exe"
+  File "${EXEDIR}\manaversed.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe"
-    CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe"
+    CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe"
+    CreateShortCut "$DESKTOP\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe"
   ${EndIf}
 SectionEnd
 
 Section /o "Profiler" SecProfiler
   SetOutPath "$INSTDIR"
-  File "${EXEDIR}\manaplusp.exe"
+  File "${EXEDIR}\manaversep.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe"
-    CreateShortCut "$DESKTOP\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe"
+    CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe"
+    CreateShortCut "$DESKTOP\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe"
   ${EndIf}
 SectionEnd
 
@@ -398,23 +398,6 @@ SectionEnd
 ;   File "${EXEDIR}\dyecmd.exe"
 ; SectionEnd
 
-Section "Evol Online shortcuts" SecEvol
-  SetOutPath "$INSTDIR"
-  CreateDirectory "$INSTDIR\data\evol"
-  CreateDirectory "$INSTDIR\data\evol\icons"
-  CreateDirectory "$INSTDIR\data\evol\images"
-
-  SetOutPath "$INSTDIR"
-  File "${SRCDIR}\data\evol\evol.manaplus"
-  SetOutPath "$INSTDIR\data\evol\images"
-  File "${SRCDIR}\data\evol\images\*.png"
-  SetOutPath "$INSTDIR\data\evol\icons"
-  File "${SRCDIR}\data\evol\icons\*.ico"
-
-  CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-SectionEnd
-
 Section "Translations" SecTrans
   SetOutPath "$INSTDIR"
   File /nonfatal /r "${SRCDIR}\translations"
@@ -425,7 +408,6 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues."
@@ -443,10 +425,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -463,21 +445,19 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
 
   Delete "$SMPROGRAMS\Mana\Uninstall.lnk"
-  Delete "$DESKTOP\ManaPlus.lnk"
-  Delete "$DESKTOP\ManaPlus (debug).lnk"
-  Delete "$DESKTOP\ManaPlus (profiler).lnk"
-  Delete "$DESKTOP\ManaPlus (tests).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus.lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk"
+  Delete "$DESKTOP\ManaVerse.lnk"
+  Delete "$DESKTOP\ManaVerse (debug).lnk"
+  Delete "$DESKTOP\ManaVerse (profiler).lnk"
+  Delete "$DESKTOP\ManaVerse (tests).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse.lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (debug).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (tests).lnk"
   Delete "$SMPROGRAMS\Mana\Website.lnk"
   Delete "$SMPROGRAMS\Mana\Readme.lnk"
   Delete "$SMPROGRAMS\Mana\FAQ.lnk"
-  Delete "$SMPROGRAMS\Mana\EvolOnline.lnk"
-  Delete "$DESKTOP\EvolOnline.lnk"
 
   RMDir "$SMPROGRAMS\Mana"
 
@@ -489,6 +469,6 @@ Section Uninstall
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
+  ${unregisterExtension} ".manaverse" "ManaVerse brandings"
   SetAutoClose true
 SectionEnd