From b3ab76d90d265e219fafa989ba55bbc53bea52f4 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Fri, 29 Mar 2024 02:16:00 +0100 Subject: Revert "Client rebranding: Partly import changes from !28" This reverts commit 775392e472933be8d1d76619894efc0671f0c02d. [skip ci] --- .gitignore | 1 - CMakeLists.txt | 6 +++--- INSTALL | 20 ++++++++++---------- PKGBUILD.in | 6 +++--- README | 18 +++++++++--------- README.md | 18 +++++++++--------- README.txt | 14 +++++++------- data/help/about.txt | 13 +++++-------- data/help/footer.txt | 2 +- data/help/header.txt | 2 +- data/help/idx/about.idx | 6 +++--- data/help/idx/team.idx | 2 +- data/help/index.txt | 2 +- data/help/support.txt | 13 ++++++++++++- data/help/tips/16.txt | 2 +- docs/FAQ.txt | 4 ++-- docs/HACKING.txt | 2 +- docs/packages.txt | 2 +- docs/sounddev.txt | 2 +- packaging/debian/control | 28 +++++++++++++++++----------- packaging/debian/copyright | 3 +-- src/commandline.cpp | 5 ++--- src/commandline.h | 3 +-- src/defaults.cpp | 10 +++++----- src/graphicsmanager.cpp | 5 ++--- src/gui/widgets/desktop.cpp | 5 ++--- src/gui/windows/chatwindow.cpp | 6 +----- src/gui/windows/updaterwindow.cpp | 9 ++++----- src/mumblemanager.cpp | 7 +++---- src/net/ea/loginrecv.cpp | 5 ++--- src/net/eathena/loginrecv.cpp | 5 ++--- tools/update-copyright.sh | 12 ++++-------- 32 files changed, 117 insertions(+), 121 deletions(-) diff --git a/.gitignore b/.gitignore index 475678e7a..f14ecdc02 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,6 @@ po/POTFILES .deps stamp-h1 /manaplus.spec -/manaverse.spec PKGBUILD data/tmw/tmw.desktop data/tmw/tmw diff --git a/CMakeLists.txt b/CMakeLists.txt index c5dd2987d..2231aaaab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ If(UNIX) ENDIF() SET(CPACK_PACKAGE_NAME "manaplus") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaVerse") -SET(CPACK_PACKAGE_VENDOR "ManaVerse Development Team") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus") +SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") @@ -74,6 +74,6 @@ IF(WIN32) SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") - SET(CPACK_NSIS_URL_INFO_ABOUT "https://manaverse.germantmw.de") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org") ENDIF() INCLUDE(CPack) diff --git a/INSTALL b/INSTALL index 486572881..e7fbfe244 100644 --- a/INSTALL +++ b/INSTALL @@ -1,19 +1,19 @@ -How to compile and run ManaVerse on your GNU/Linux Box +How to compile and run ManaPlus on your GNU/Linux Box ================================================= -Homepage: http://manaverse.germantmw.de/ -IRC: irc.libera.chat:6697 (TLS) / #themanaworld-dev +Homepage: http://manaplus.org/ +IRC: irc.freenode.net / #manaplus 1) Requirements -2) Compiling And Installing ManaVerse +2) Compiling And Installing ManaPlus 3) Notes 1. Requirements =============== -You are expected to have either checked out ManaVerse from Git or you have downloaded -a source release. To get ManaVerse to compile, you need a compiler (GCC) +You are expected to have either checked out ManaPlus from Git or you have downloaded +a source release. To get ManaPlus to compile, you need a compiler (GCC) and some libraries. The required libraries are: * SDL http://www.libsdl.org/ @@ -42,7 +42,7 @@ Installing these dependencies is distributions-specific, and we'll leave it to you to figure this out. -2. Compiling And Installing ManaVerse +2. Compiling And Installing ManaPlus ==================================== Building with GNU Autotools @@ -54,12 +54,12 @@ Building with GNU Autotools 4) Run "make" 5) Run "make install" as root -It should have installed ManaVerse on your system now, and you can run it -with "manaverse". By default all files are installed to /usr/local, you can pass +It should have installed ManaPlus on your system now, and you can run it +with "manaplus". By default all files are installed to /usr/local, you can pass a different prefix to configure as usual. - NOTE: It is possible to compile ManaVerse without support for OpenGL rendering. + NOTE: It is possible to compile ManaPlus without support for OpenGL rendering. To do this perform step 3 as follows: ./configure --without-opengl diff --git a/PKGBUILD.in b/PKGBUILD.in index ae165e03e..2de85a80d 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,11 +1,11 @@ # Maintainer: Aline Ferraz -pkgname=manaverse-git +pkgname=manaplus-git pkgver=@PACKAGE_VERSION@ pkgrel=1 -pkgdesc="ManaVerse is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tmwAthena/Evol2)." +pkgdesc="ManaPlus is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tAthena) also for other forks like Evol. More info here: http://manaplus.evolonline.org" arch=('i686' 'x86_64') -url="https://manaverse.germantmw.de" +url="http://manaplus.org" depends=('libxml2' 'sdl_image' 'sdl_mixer' 'sdl_net' 'sdl_ttf' 'sdl_gfx') license=('GPL2') diff --git a/README b/README index 712cbc30c..f082eb629 100644 --- a/README +++ b/README @@ -1,13 +1,13 @@ -THE MANA VERSE CLIENT +THE MANA PLUS CLIENT =============== - Version: 1.0 Date: 2019-03-23 + Version: 1.9.3.23 Date: 2019-03-23 Build status: - ManaVerse CI: https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg - Windows: https://git.themanaworld.org/mana/docker-windows-builder/badges/master/pipeline.svg - AppImg: https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg - deb: https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg + ManaPlus CI: https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg + Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg + AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg + deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg Coverage: https://git.themanaworld.org/mana/plus/badges/master/coverage.svg Doxygen: http://stats.manaplus.org/docs/index.html Coverity: https://scan.coverity.com/projects/manaplus @@ -160,7 +160,7 @@ You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12), bugtracker (https://git.themanaworld.org/mana/plus/issues/) or other project networks such as IRC. -If you have feedback about a specific game that uses the ManaVerse client, be sure +If you have feedback about a specific game that uses the ManaPlus client, be sure to contact the developers of the game instead. 5. Licenses @@ -171,6 +171,6 @@ All code in this repository under GPL 2+ license. Art can be under CC-BY-SA or G Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses. If any of this hostings want to violate GPL or/and CC-BY-SA licenses, they not have any rights to do so. -This hostings have rights to remove ManaVerse repositories if they want violate given licenses. +This hostings have rights to remove ManaPlus repositories if they want violate given licenses. -ManaVerse is a fork of ManaPlus, the main repository of the latter is hosted on https://gitlab.com/manaplus/manaplus/ +ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/ diff --git a/README.md b/README.md index a8bf2f628..ac6c0b3a6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# The Mana Verse Client +# The Mana Plus Client -![ManaVerse logo](data/icons/manaverse.png) +![ManaPlus logo](data/icons/manaplus.png) Version: 1.9.3.23 Date: 2019-03-23 ### Build status - - ManaVerse CI: [![gitlab build status](https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg?key_text=master)](https://git.themanaworld.org/mana/plus/commits/master) + - ManaPlus CI: [![gitlab build status](https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg?key_text=master)](https://git.themanaworld.org/mana/plus/commits/master) - - Downloads: [![gitlab windows build](https://git.themanaworld.org/mana/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/commits/master), - [![gitlab appimg build](https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://git.themanaworld.org/mana/appimg-builder/commits/master), - [![gitlab .deb build](https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://git.themanaworld.org/mana/appimg-builder/commits/master) + - Downloads: [![gitlab windows build](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/commits/master), + [![gitlab appimg build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master), + [![gitlab .deb build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master)