From e3fad19e04900ec23db6a4b42a6a3208bd276e4b Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 13 Dec 2021 15:37:33 -0300 Subject: Continue what we started; But preserve more of the hardcoded stuff (Including manaplus.exe - no renaming Windows build I guess) --- CMakeLists.txt.legacy | 6 ++--- INSTALL | 4 +-- Makefile.am | 8 +++--- PKGBUILD.in | 2 +- build/update-creator.sh | 2 +- configure.ac | 2 +- data/help/about.txt | 6 ++--- data/help/download.txt | 2 +- data/help/footer.txt | 2 +- data/help/support.txt | 6 ++--- data/help/team.txt | 2 +- data/help/tips/10.txt | 2 +- data/help/tips/16.txt | 2 +- data/help/tips/8.txt | 2 +- data/icons/CMakeLists.txt | 4 +-- data/icons/Makefile.am | 12 ++++----- data/test/serverlistplus.xml | 6 ++--- data/themes/golden-delicious/CHANGELOG.txt | 4 +-- data/tmw/tmw.manaplus | 4 +-- data/translations/help/ca.po | 12 ++++----- data/translations/help/cs.po | 12 ++++----- data/translations/help/de.po | 12 ++++----- data/translations/help/es.po | 12 ++++----- data/translations/help/fr.po | 12 ++++----- data/translations/help/id.po | 6 ++--- data/translations/help/it.po | 6 ++--- data/translations/help/ja.po | 6 ++--- data/translations/help/nl.po | 6 ++--- data/translations/help/nl_BE.po | 6 ++--- data/translations/help/pl.po | 12 ++++----- data/translations/help/pt_BR.po | 12 ++++----- data/translations/help/ru.po | 12 ++++----- data/translations/help/sr.po | 6 ++--- data/translations/help/sv_SE.po | 6 ++--- data/translations/help/tr.po | 6 ++--- data/translations/help/uk.po | 12 ++++----- data/translations/help/zh_CN.po | 6 ++--- data/translations/help/zh_HK.po | 6 ++--- data/translations/help/zh_TW.po | 6 ++--- docs/FAQ.txt | 4 +-- docs/Makefile.am | 2 +- docs/manaplustest.6 | 2 +- manaplus.appdata.xml | 12 ++++----- manaplus.desktop | 25 ------------------ packaging/debian/control | 2 +- packaging/nacl/ports/manaplus/pkg_info | 2 +- packaging/windows/evol.nsi | 38 +++++++++++++-------------- packaging/windows/setup.nsi | 42 +++++++++++++++--------------- po/CMakeLists.txt | 4 +-- po/ca.po | 6 ++--- po/cs.po | 2 +- po/de.po | 4 +-- po/eo.po | 4 +-- po/es.po | 6 ++--- po/fi.po | 2 +- po/fr.po | 6 ++--- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/manaplus.pot | 2 +- po/nl.po | 2 +- po/nl_BE.po | 2 +- po/pl.po | 4 +-- po/pt.po | 4 +-- po/pt_BR.po | 4 +-- po/ru.po | 4 +-- po/sr.po | 2 +- po/sv.po | 2 +- po/sv_SE.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/zh_CN.po | 2 +- po/zh_HK.po | 2 +- src/CMakeLists.txt | 4 +-- src/Makefile.am | 8 +++--- src/fs/paths.cpp | 4 +-- src/gui/widgets/desktop.cpp | 2 +- src/gui/windows/serverdialog.cpp | 2 +- src/manaplus.rc | 2 +- src/net/ea/loginrecv.cpp | 2 +- src/net/eathena/loginrecv.cpp | 2 +- src/progs/dyecmd/client.cpp | 2 +- src/progs/manaplus/client.cpp | 2 +- src/render/mobileopengl2graphics.cpp | 2 +- src/render/modernopenglgraphics.cpp | 2 +- tools/ci/jobs/mplint.sh | 2 +- tools/ci/scripts/clonesrc.sh | 2 +- 87 files changed, 235 insertions(+), 260 deletions(-) delete mode 100644 manaplus.desktop diff --git a/CMakeLists.txt.legacy b/CMakeLists.txt.legacy index e27809fda..cd62b68dc 100644 --- a/CMakeLists.txt.legacy +++ b/CMakeLists.txt.legacy @@ -54,10 +54,10 @@ IF (GETTEXT_FOUND AND ENABLE_NLS) ENDIF() If(UNIX) - INSTALL(FILES manaverse.desktop DESTINATION share/applications) + INSTALL(FILES manaplus.desktop DESTINATION share/applications) INSTALL(FILES manaversetest.desktop DESTINATION share/applications) - INSTALL(FILES manaverse.appdata.xml DESTINATION share/appdata) + INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata) ENDIF() SET(CPACK_PACKAGE_NAME "manaverse") @@ -73,6 +73,6 @@ IF(WIN32) SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse") 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 "http://manaplus.org") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.germantmw.de") ENDIF() INCLUDE(CPack) diff --git a/INSTALL b/INSTALL index 95fd32da6..938ec6d24 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ How to compile and run ManaVerse on your GNU/Linux Box ================================================= -Homepage: http://manaplus.org/ -IRC: irc.freenode.net / #manaverse +Homepage: http://manaplus.germantmw.de/ +IRC: irc.libera.chat / #manaverse 1) Requirements 2) Compiling And Installing ManaVerse diff --git a/Makefile.am b/Makefile.am index a4fd4097b..d082fe8dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,12 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = manaverse.desktop \ +desktop_DATA = manaplus.desktop \ manaversetest.desktop appdatadir = $(datarootdir)/appdata -appdata_DATA = manaverse.appdata.xml +appdata_DATA = manaplus.appdata.xml # Extra files to include EXTRA_DIST = $(desktop_DATA) \ @@ -19,8 +19,8 @@ EXTRA_DIST = $(desktop_DATA) \ CMake/Modules/FindLibIntl.cmake \ CMake/Modules/FindSDL_gfx.cmake \ Android.mk \ - manaverse.menu \ - manaverse.spec \ + manaplus.menu \ + manaplus.spec \ AUTHORS \ ChangeLog \ INSTALL \ diff --git a/PKGBUILD.in b/PKGBUILD.in index e80e36f9f..34261cb4a 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -5,7 +5,7 @@ pkgver=@PACKAGE_VERSION@ pkgrel=1 pkgdesc="ManaVerse 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.germantmw.de" arch=('i686' 'x86_64') -url="http://manaplus.org" +url="http://manaplus.germantmw.de" depends=('libxml2' 'sdl_image' 'sdl_mixer' 'sdl_net' 'sdl_ttf' 'sdl_gfx') license=('GPL2') diff --git a/build/update-creator.sh b/build/update-creator.sh index 37e8af733..f3fc9e28c 100755 --- a/build/update-creator.sh +++ b/build/update-creator.sh @@ -8,4 +8,4 @@ find -name \*.cpp \ -o -name \*.txt \ -o -name \*.xml \ -o -name \*.manaplus \ - | sort > manaverse.files + | sort > manaplus.files diff --git a/configure.ac b/configure.ac index ef7000ff1..adaa12561 100755 --- a/configure.ac +++ b/configure.ac @@ -888,7 +888,7 @@ AC_CHECK_HEADERS([execinfo.h], AM_CONDITIONAL(HAVE_EXECINFO, test x$have_execinfo = xyes) AC_CONFIG_FILES([ -manaverse.spec +manaplus.spec Makefile PKGBUILD src/Makefile diff --git a/data/help/about.txt b/data/help/about.txt index e2dc51e26..61c39f654 100644 --- a/data/help/about.txt +++ b/data/help/about.txt @@ -1,7 +1,7 @@ <- @@index|<>@@ -##3 === <> === +##3 === <> === <<##2ManaVerse##9 is extended client based on old code from ##2Mana##9 client. Added many features, improved perfomance, stability, security and more.>> @@ -11,9 +11,9 @@ sure this game can't ever run away from you.>> ##9 Copyright (C) 2012-2017 The ManaPlus Developers - -> @@team|<>, http://manaplus.org@@ + -> @@team|<>, http://manaplus.germantmw.de@@ -##9 Copyright (C) 2004-2017 The Mana World Development Team +##9 Copyright (C) 2004-2021 The Mana World Development Team -> @@about-tmw|<>@@ -> @@about-server|<>@@ diff --git a/data/help/download.txt b/data/help/download.txt index 01ad5348b..a1becc936 100644 --- a/data/help/download.txt +++ b/data/help/download.txt @@ -6,6 +6,6 @@ ##2Android: @@http://download.germantmw.de/manaplus/download/manaplus.apk|apk@@, @@http://www.amazon.com/gp/product/B00FINPCWA|Amazon@@, @@https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus|Google Play@@ ##2Chrome: @@https://chrome.google.com/webstore/detail/manaplus/fgdcjlfkdeadkbplfhkbjjccagjepodj|<>@@ ##2MacOSX: @@http://download.germantmw.de/manaplus/macosx/manaplus-lion-1.3.9.15.dmg|Lion@@, @@http://download.germantmw.de/manaplus/macosx/manaplus-snowleopard.dmg|Snow leopard@@ - ##2Windows: @@http://download.germantmw.de/manaplus/download/manaplus-win32.exe|<>@@, @@http://manaplus.org/windowsinstaller|<>@@ + ##2Windows: @@http://download.germantmw.de/manaplus/download/manaplus-win32.exe|<>@@, @@http://manaplus.germantmw.de/windowsinstaller|<>@@ ##2<> @@http://download.germantmw.de/manaplus/download/manaplus.tar.xz|<>@@ ##2<> @@http://download.germantmw.de/manaplus/download/manaplus-linux.tar.bz2|<>@@ diff --git a/data/help/footer.txt b/data/help/footer.txt index be8738115..2762020b1 100644 --- a/data/help/footer.txt +++ b/data/help/footer.txt @@ -1,3 +1,3 @@ -##2 <> +##2 <> diff --git a/data/help/support.txt b/data/help/support.txt index 7823933bf..85ce23f83 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -13,19 +13,19 @@ <> <> -##2 #evolonline ##9@##2 irc.freenode.net +##2 #evolonline ##9@##2 irc.libera.chat <> <> -##2 #manaverse #evolonline ##9@##2 irc.freenode.net +##2 #manaverse #evolonline ##9@##2 irc.libera.chat <> ##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@ <> -##2 #themanaworld ##9@##2 irc.freenode.net +##2 #themanaworld ##9@##2 irc.libera.chat <> diff --git a/data/help/team.txt b/data/help/team.txt index 6e6a7417a..432d3ac6a 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -1,6 +1,6 @@ .<- @@index|<>@@ -@@http://manaplus.org/|<> http://manaplus.org@@ +@@http://manaplus.germantmw.de/|<> http://manaplus.germantmw.de@@ ##3--------------------------- ##3-- <> -- diff --git a/data/help/tips/10.txt b/data/help/tips/10.txt index fdea2e3d1..6888c2aed 100644 --- a/data/help/tips/10.txt +++ b/data/help/tips/10.txt @@ -1,2 +1,2 @@ <> +by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@>> diff --git a/data/help/tips/16.txt b/data/help/tips/16.txt index 0e8c9f681..d3961c694 100644 --- a/data/help/tips/16.txt +++ b/data/help/tips/16.txt @@ -1,3 +1,3 @@ <> -@@http://manaplus.org/|http://manaplus.org/@@ +@@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@ diff --git a/data/help/tips/8.txt b/data/help/tips/8.txt index 9caff898a..58bacb0ed 100644 --- a/data/help/tips/8.txt +++ b/data/help/tips/8.txt @@ -1,2 +1,2 @@ <> +@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@>> diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 0106dc8ef..2d5a0a899 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,7 +1,7 @@ SET(FILES - manaverse.svg + manaplus.svg ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "manaverse.svg" DESTINATION share/icons/hicolor/scalable/apps) +INSTALL(FILES "manaplus.svg" DESTINATION share/icons/hicolor/scalable/apps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index ef55da5dc..37eb702fd 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,12 +1,12 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = manaverse.png \ - manaverse.svg \ - manaverse.icns \ - manaverse.ico \ - manaverse.hqx \ - manaverse.xpm +icons_DATA = manaplus.png \ + manaplus.svg \ + manaplus.icns \ + manaplus.ico \ + manaplus.hqx \ + manaplus.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps diff --git a/data/test/serverlistplus.xml b/data/test/serverlistplus.xml index 1cf0ede0d..064592516 100644 --- a/data/test/serverlistplus.xml +++ b/data/test/serverlistplus.xml @@ -136,10 +136,10 @@ - + DEVELOPMENT - http://manaplus.org/ - http://manaplus.org/ + http://manaplus.germantmw.de/ + http://manaplus.germantmw.de/ http://download.germantmw.de/manaplus/hercules/data Server for testing ManaVerse features. diff --git a/data/themes/golden-delicious/CHANGELOG.txt b/data/themes/golden-delicious/CHANGELOG.txt index 00201303a..fbe09d5b2 100644 --- a/data/themes/golden-delicious/CHANGELOG.txt +++ b/data/themes/golden-delicious/CHANGELOG.txt @@ -48,7 +48,7 @@ Changes: [!] Fixed black-on-black color issue in help window. Thanks to 4144! Caveat: new manaverse haves another idea about this as it has been bug. Anyway, help should be readable on both "old" - and "new" manaverse. + and "new" manaplus. [!] Reduced artefacts caused by window bitmap texture due to tiling. [!] Fixed color of item protection background in shop windows. [!] Fixed keyboard icon coloring. @@ -67,7 +67,7 @@ Changes: [*] Same for chat tabs. [*] Some small changes reducing overall theme contrast a bit. [*] Tweaked padding of shortcuts bar, looks better as 1-column window. - Note: maybe only works well with recent manaverse. + Note: maybe only works well with recent manaplus. [*] Some messing with padding of windows and buttons to make theme a bit more compact overall. [*] Improved cursor selection in items dialog so it no longer overlaps diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus index c4b66237e..a44f49b07 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.manaplus @@ -5,8 +5,8 @@