16 files changed, 106 insertions, 113 deletions
diff --git a/packaging/debian/control b/packaging/debian/control
index 8cfc37f86..6f13a0e6d 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,4 +1,4 @@
-Source: manaplus
+Source: manaverse
 Section: games
 Priority: optional
 Homepage: https://manaverse.germantmw.de/
@@ -21,11 +21,11 @@ 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
@@ -36,26 +36,26 @@ Description: Extended client for The Mana World
  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})
+ 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 The Mana World
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 9ba604638..c9348f49b 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,6 +1,6 @@
 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
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..b9d3a690f 100644
--- a/packaging/debian/manaplus.manpages
+++ b/packaging/debian/manaplus.manpages
@@ -1,2 +1,2 @@
-docs/manaplus.6
+docs/manaverse.6
 docs/manaplustest.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..99c4b7863 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.0\"
+        -DPACKAGE_STRING=\"ManaVerse\ 1.0\" -DPACKAGE_BUGREPORT=\"jak1@themanaworld.org\" -DPACKAGE_URL=\"\"
+        -DPACKAGE=\"manaverse\" -DVERSION=\"1.0\" -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/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 f5ca57644..f7bf573ba 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" ".mana" "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
 
@@ -408,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."
@@ -426,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}"
@@ -446,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"
 
@@ -472,6 +469,6 @@ Section Uninstall
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
+  ${unregisterExtension} ".mana" "ManaVerse brandings"
   SetAutoClose true
 SectionEnd