diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/evol/Makefile.am | 20 | ||||
| -rw-r--r-- | data/evol/evol.desktop.in | 25 | ||||
| -rwxr-xr-x | data/evol/evol.in | 2 | ||||
| -rw-r--r-- | data/evol/evol.manaplus | 19 | ||||
| -rw-r--r-- | data/evol/icons/evol-client.ico | bin | 533366 -> 0 bytes | |||
| -rw-r--r-- | data/evol/icons/evol-client.png | bin | 7366 -> 0 bytes | |||
| -rw-r--r-- | data/evol/icons/evol-client.xpm | 45 | ||||
| -rw-r--r-- | data/evol/images/loginwallpaper_800x600.png | bin | 1481772 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/sprites/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/graphics/sprites/Makefile.am | 6 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotes.xml | 36 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emote.xml (renamed from data/graphics/sprites/manaplus_emote.xml) | 2 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emotes.xml | 36 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emotions.png (renamed from data/graphics/sprites/manaplus_emotions.png) | bin | 38357 -> 38357 bytes | |||
| -rw-r--r-- | data/graphics/sprites/test.xml | 2 | ||||
| -rw-r--r-- | data/help/about.txt | 13 | ||||
| -rw-r--r-- | data/help/footer.txt | 2 | ||||
| -rw-r--r-- | data/help/header.txt | 2 | ||||
| -rw-r--r-- | data/help/idx/about.idx | 6 | ||||
| -rw-r--r-- | data/help/idx/team.idx | 2 | ||||
| -rw-r--r-- | data/help/index.txt | 2 | ||||
| -rw-r--r-- | data/help/support.txt | 12 | ||||
| -rw-r--r-- | data/help/tips/16.txt | 2 | ||||
| -rw-r--r-- | data/icons/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 16 | ||||
| -rw-r--r-- | data/icons/manaverse.hqx (renamed from data/icons/manaplus.hqx) | 0 | ||||
| -rw-r--r-- | data/icons/manaverse.icns (renamed from data/icons/manaplus.icns) | bin | 27744 -> 27744 bytes | |||
| -rw-r--r-- | data/icons/manaverse.ico (renamed from data/icons/manaplus.ico) | bin | 533366 -> 533366 bytes | |||
| -rw-r--r-- | data/icons/manaverse.png (renamed from data/icons/manaplus.png) | bin | 4544 -> 4544 bytes | |||
| -rw-r--r-- | data/icons/manaverse.svg (renamed from data/icons/manaplus.svg) | 0 | ||||
| -rw-r--r-- | data/icons/manaverse.xpm (renamed from data/icons/manaplus.xpm) | 2 | ||||
| -rw-r--r-- | data/test/serverlistplus.xml | 74 | ||||
| -rw-r--r-- | data/tmw/Makefile.am | 4 | ||||
| -rw-r--r-- | data/tmw/tmw.desktop.in | 2 | ||||
| -rwxr-xr-x | data/tmw/tmw.in | 2 | ||||
| -rw-r--r-- | data/tmw/tmw.manaverse (renamed from data/tmw/tmw.manaplus) | 0 |
37 files changed, 79 insertions, 267 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 794e67b8f..794c71a18 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = evol fonts graphics help icons music perserver sfx test themes tmw translations +SUBDIRS = fonts graphics help icons music perserver sfx test themes tmw translations EXTRA_DIST = CMakeLists.txt items.xsd diff --git a/data/evol/Makefile.am b/data/evol/Makefile.am deleted file mode 100644 index 5ad7b74cf..000000000 --- a/data/evol/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ - -desktopdir = $(datarootdir)/applications - -branding: - mkdir -p "$(DESTDIR)$(pkgdatadir)/data/evol/icons" - mkdir -p "$(DESTDIR)$(datarootdir)/icons" - mkdir -p "$(DESTDIR)$(desktopdir)" - cp evol.desktop "$(DESTDIR)$(desktopdir)" - cp evol.manaplus "$(DESTDIR)$(pkgdatadir)/data/evol" - cp icons/evol-client.png "$(DESTDIR)$(pkgdatadir)/data/evol/icons" - cp icons/evol-client.png "$(DESTDIR)$(datarootdir)/icons" - cp -r images "$(DESTDIR)$(pkgdatadir)/data/evol" - -EXTRA_DIST = evol.desktop.in \ - evol.in \ - evol.manaplus \ - icons/evol-client.ico \ - icons/evol-client.png \ - icons/evol-client.xpm \ - images/loginwallpaper_800x600.png diff --git a/data/evol/evol.desktop.in b/data/evol/evol.desktop.in deleted file mode 100644 index 8ab97e773..000000000 --- a/data/evol/evol.desktop.in +++ /dev/null @@ -1,25 +0,0 @@ - -[Desktop Entry] -Version=1.0 -Name=EvolOnline -Comment=A 2D MMORPG client -Exec=manaplus @datadir@/manaplus/data/evol/evol.manaplus -StartupNotify=false -Terminal=false -Type=Application -Icon=evol-client -Categories=Game;AdventureGame; - - -# Translations -Comment[vls]=Nen 2D MMORPG client -Comment[ru]=Клиент к 2D MMORPG игре -Comment[it]=Un gioco fantasy online -Comment[ja]=2DのMMORPGクライアント -Comment[cs]=2D MMORPG klient -Comment[nl_BE]=Een 2D MMORPG client -Comment[de]=ein 2D MMORG Client -Comment[sv_SE]=Ett fantasyrollspel online -Comment[es]=Un cliente MMORPG 2D -Comment[fr]=Un jeu en ligne dans un univers fantastique -Comment[nl]=Een online role playing game diff --git a/data/evol/evol.in b/data/evol/evol.in deleted file mode 100755 index 2b010dc80..000000000 --- a/data/evol/evol.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec manaplus @datadir@/manaplus/data/evol/evol.manaplus "$@" diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus deleted file mode 100644 index 969fe06f0..000000000 --- a/data/evol/evol.manaplus +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <option name="appName" value="Evol Online"/> - <option name="appShort" value="mana"/> - <option name="appIcon" value="evol/icons/evol-client"/> - <option name="screenshots" value="EvolOnline"/> - <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/> - <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/> - <option name="onlineServerList2" value="http://evolonline.org/serverlist.xml"/> - <option name="onlineServerFile" value="evol.xml"/> - <option name="defaultServer" value="world.evolonline.org"/> - <option name="defaultPort" value="6901"/> - <option name="defaultServerType" value="evol2"/> - <option name="font" value="fonts/dejavusans.ttf" /> - <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> - <option name="theme" value="jewelry" /> - <option name="wallpapersPath" value="evol/images/" /> - <option name="wallpaperFile" value="loginwallpaper_800x600.png" /> -</configuration> diff --git a/data/evol/icons/evol-client.ico b/data/evol/icons/evol-client.ico Binary files differdeleted file mode 100644 index 17309a1ba..000000000 --- a/data/evol/icons/evol-client.ico +++ /dev/null diff --git a/data/evol/icons/evol-client.png b/data/evol/icons/evol-client.png Binary files differdeleted file mode 100644 index 2fb9eaab0..000000000 --- a/data/evol/icons/evol-client.png +++ /dev/null diff --git a/data/evol/icons/evol-client.xpm b/data/evol/icons/evol-client.xpm deleted file mode 100644 index 7fb1f2cda..000000000 --- a/data/evol/icons/evol-client.xpm +++ /dev/null @@ -1,45 +0,0 @@ -/* XPM */ -static char * manaplus_xpm[] = { -"32 32 10 1", -" c None", -". c #663300", -"X c #673200", -"o c #663400", -"O c #653400", -"+ c #653200", -"@ c #653300", -"# c #673300", -"$ c #663200", -"% c #673400", -" .. . ", -" .. X . ", -" .X .. o O. ", -" +@o .o O# o. ", -" Xo. $.@ . o%. ", -" $.#$.#$+ ", -" . $$$## ", -" ....$@+ %. ", -" ....o#$X ", -" .$o.. ", -" .@@. ", -" Oo#. ", -" o ", -" #@ . ", -" O... ", -" $.o ", -" #.$. ", -" ..% ", -" #$@. ", -" .... ", -" # O%.@..$.#.o . ", -" +# oO X+$..@ .#$$ ", -" % +...o # % ", -" O %o..$oO O.% ", -" o #O$@ X# + ", -" # $ $ % ", -" O. . $ #@ ", -" o XO ", -" . X $X ", -" # + + ", -" . @ . ", -" .$# $@ "}; diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png Binary files differdeleted file mode 100644 index a1fe4f83b..000000000 --- a/data/evol/images/loginwallpaper_800x600.png +++ /dev/null diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt index bc5d7d70c..4fb08d5cb 100644 --- a/data/graphics/sprites/CMakeLists.txt +++ b/data/graphics/sprites/CMakeLists.txt @@ -6,9 +6,9 @@ SET(FILES chatemotes.png error.png error.xml - manaplus_emotions.png - manaplus_emote.xml - manaplus_emotes.xml + manaverse_emotions.png + manaverse_emote.xml + manaverse_emotes.xml test.xml ) diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am index 8001e7016..3c3ad7887 100644 --- a/data/graphics/sprites/Makefile.am +++ b/data/graphics/sprites/Makefile.am @@ -8,9 +8,9 @@ sprites_DATA = \ chatemotes.png \ error.png \ error.xml \ - manaplus_emotions.png\ - manaplus_emote.xml \ - manaplus_emotes.xml \ + manaverse_emotions.png\ + manaverse_emote.xml \ + manaverse_emotes.xml \ test.xml EXTRA_DIST = \ diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml deleted file mode 100644 index 8daf57630..000000000 --- a/data/graphics/sprites/manaplus_emotes.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<emotes> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule selector="//emote/sprite/@name" translate="yes"/> - <its:translateRule selector="//*" translate="no"/> - </its:rules> - - <emote id="100"><sprite name="Kitty" variant="0">manaplus_emote.xml</sprite></emote> - <emote id="101"><sprite name="xD" variant="1">manaplus_emote.xml</sprite></emote> - <emote id="102"><sprite name="^.^" variant="2">manaplus_emote.xml</sprite></emote> - <emote id="103"><sprite name="Heart eye" variant="3">manaplus_emote.xml</sprite></emote> - <emote id="104"><sprite name="Gold eye" variant="4">manaplus_emote.xml</sprite></emote> - <emote id="105"><sprite name="Sleepy" variant="5">manaplus_emote.xml</sprite></emote> - <emote id="106"><sprite name="u.u" variant="6">manaplus_emote.xml</sprite></emote> - <emote id="107"><sprite name="-.-'" variant="7">manaplus_emote.xml</sprite></emote> - <emote id="108"><sprite name="Surprised" variant="8">manaplus_emote.xml</sprite></emote> - <emote id="109"><sprite name="Dead" variant="9">manaplus_emote.xml</sprite></emote> - <emote id="110"><sprite name="Look away" variant="10">manaplus_emote.xml</sprite></emote> - <emote id="111"><sprite name="Sad" variant="11">manaplus_emote.xml</sprite></emote> - <emote id="112"><sprite name="Palmhead" variant="12">manaplus_emote.xml</sprite></emote> - <emote id="113"><sprite name="Evil" variant="13">manaplus_emote.xml</sprite></emote> - <emote id="114"><sprite name="Angry" variant="14">manaplus_emote.xml</sprite></emote> - <emote id="115"><sprite name="Purple Sad" variant="15">manaplus_emote.xml</sprite></emote> - <emote id="116"><sprite name="Insult Buble" variant="16">manaplus_emote.xml</sprite></emote> - <emote id="117"><sprite name="Heart" variant="17">manaplus_emote.xml</sprite></emote> - <emote id="118"><sprite name="Emote" variant="18">manaplus_emote.xml</sprite></emote> - <emote id="119"><sprite name="Pumpkin" variant="19">manaplus_emote.xml</sprite></emote> - <emote id="120"><sprite name="Evil" variant="20">manaplus_emote.xml</sprite></emote> - <emote id="121"><sprite name="Epic" variant="21">manaplus_emote.xml</sprite></emote> - <emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote> - <emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote> - <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote> - <emote id="125"><sprite name="Troll" variant="25">manaplus_emote.xml</sprite></emote> - <emote id="126"><sprite name="Metal" variant="26">manaplus_emote.xml</sprite></emote> - <emote id="127"><sprite name="Crying" variant="27">manaplus_emote.xml</sprite></emote> -</emotes> diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaverse_emote.xml index 7c5c48046..857436201 100644 --- a/data/graphics/sprites/manaplus_emote.xml +++ b/data/graphics/sprites/manaverse_emote.xml @@ -2,7 +2,7 @@ <!-- Author : Reid, 4144 Copyright (C) 2011-2012 Manaplus --> <sprite variants="28" variant_offset="1"> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="stand" imageset="base"> <animation direction="default"> diff --git a/data/graphics/sprites/manaverse_emotes.xml b/data/graphics/sprites/manaverse_emotes.xml new file mode 100644 index 000000000..e951379d5 --- /dev/null +++ b/data/graphics/sprites/manaverse_emotes.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<emotes> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//emote/sprite/@name" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + + <emote id="100"><sprite name="Kitty" variant="0">manaverse_emote.xml</sprite></emote> + <emote id="101"><sprite name="xD" variant="1">manaverse_emote.xml</sprite></emote> + <emote id="102"><sprite name="^.^" variant="2">manaverse_emote.xml</sprite></emote> + <emote id="103"><sprite name="Heart eye" variant="3">manaverse_emote.xml</sprite></emote> + <emote id="104"><sprite name="Gold eye" variant="4">manaverse_emote.xml</sprite></emote> + <emote id="105"><sprite name="Sleepy" variant="5">manaverse_emote.xml</sprite></emote> + <emote id="106"><sprite name="u.u" variant="6">manaverse_emote.xml</sprite></emote> + <emote id="107"><sprite name="-.-'" variant="7">manaverse_emote.xml</sprite></emote> + <emote id="108"><sprite name="Surprised" variant="8">manaverse_emote.xml</sprite></emote> + <emote id="109"><sprite name="Dead" variant="9">manaverse_emote.xml</sprite></emote> + <emote id="110"><sprite name="Look away" variant="10">manaverse_emote.xml</sprite></emote> + <emote id="111"><sprite name="Sad" variant="11">manaverse_emote.xml</sprite></emote> + <emote id="112"><sprite name="Palmhead" variant="12">manaverse_emote.xml</sprite></emote> + <emote id="113"><sprite name="Evil" variant="13">manaverse_emote.xml</sprite></emote> + <emote id="114"><sprite name="Angry" variant="14">manaverse_emote.xml</sprite></emote> + <emote id="115"><sprite name="Purple Sad" variant="15">manaverse_emote.xml</sprite></emote> + <emote id="116"><sprite name="Insult Buble" variant="16">manaverse_emote.xml</sprite></emote> + <emote id="117"><sprite name="Heart" variant="17">manaverse_emote.xml</sprite></emote> + <emote id="118"><sprite name="Emote" variant="18">manaverse_emote.xml</sprite></emote> + <emote id="119"><sprite name="Pumpkin" variant="19">manaverse_emote.xml</sprite></emote> + <emote id="120"><sprite name="Evil" variant="20">manaverse_emote.xml</sprite></emote> + <emote id="121"><sprite name="Epic" variant="21">manaverse_emote.xml</sprite></emote> + <emote id="122"><sprite name="Bad geek" variant="22">manaverse_emote.xml</sprite></emote> + <emote id="123"><sprite name="Mimi" variant="23">manaverse_emote.xml</sprite></emote> + <emote id="124"><sprite name="Alien" variant="24">manaverse_emote.xml</sprite></emote> + <emote id="125"><sprite name="Troll" variant="25">manaverse_emote.xml</sprite></emote> + <emote id="126"><sprite name="Metal" variant="26">manaverse_emote.xml</sprite></emote> + <emote id="127"><sprite name="Crying" variant="27">manaverse_emote.xml</sprite></emote> +</emotes> diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaverse_emotions.png Binary files differindex c93262ba4..c93262ba4 100644 --- a/data/graphics/sprites/manaplus_emotions.png +++ b/data/graphics/sprites/manaverse_emotions.png diff --git a/data/graphics/sprites/test.xml b/data/graphics/sprites/test.xml index 7243254af..54944216e 100644 --- a/data/graphics/sprites/test.xml +++ b/data/graphics/sprites/test.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sprite> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="default" imageset="base"> <animation direction="default"> diff --git a/data/help/about.txt b/data/help/about.txt index e0202466b..5dea3a601 100644 --- a/data/help/about.txt +++ b/data/help/about.txt @@ -1,16 +1,19 @@ <- @@index|<<Back to Index>>@@ -##3 === <<ABOUT MANAPLUS>> === - <<##2ManaPlus##9 is extended client based on old code from ##2Mana##9 client. +##3 === <<ABOUT MANAVERSE>> === + <<##2ManaVerse##9 is extended client based on old code from ##2Mana##9 client. Added many features, improved perfomance, stability, security and more.>> - <<##2ManaPlus##9 is a serious effort to create an innovative free and open - source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large + <<##2ManaVerse##9 is a serious effort to create an innovative free and open + source MMORPG Client. ManaVerse uses 2.5D graphics and aims to create a large and diverse interactive world. It is licensed under the GPL, making sure this game can't ever run away from you.>> -##9 Copyright (C) 2012-2017 The ManaPlus Developers +##9 Copyright (C) 2020-2023 The ManaVerse Developers + -> @@team|<<ManaVerse Developers>>, https://themanaworlg.org@@ + +##9 Copyright (C) 2012-2020 The ManaPlus Developers -> @@team|<<Manaplus Developers>>, http://manaplus.org@@ ##9 Copyright (C) 2004-2017 The Mana World Development Team diff --git a/data/help/footer.txt b/data/help/footer.txt index be8738115..d4bcde2a1 100644 --- a/data/help/footer.txt +++ b/data/help/footer.txt @@ -1,3 +1,3 @@ -##2 <<Website: @@http://manaplus.org/|http://manaplus.org/@@>> +##2 <<Website: @@https://manaverse.germantmw.de/|https://manaverse.germantmw.de/@@>> diff --git a/data/help/header.txt b/data/help/header.txt index 2657b9e4e..36f627024 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -1,3 +1,3 @@ - <<##2ManaPlus version: ##6%VER%>> + <<##2ManaVerse version: ##6%VER%>> diff --git a/data/help/idx/about.idx b/data/help/idx/about.idx index 40ce8cb34..b7ce572c8 100644 --- a/data/help/idx/about.idx +++ b/data/help/idx/about.idx @@ -1,4 +1,4 @@ about|about -about|about manaplus -about|manaplus about -about|manaplus +about|about manaverse +about|manaverse about +about|manaverse diff --git a/data/help/idx/team.idx b/data/help/idx/team.idx index 598e3be8e..bc12ebac9 100644 --- a/data/help/idx/team.idx +++ b/data/help/idx/team.idx @@ -1,2 +1,2 @@ team|team -team|manaplus +team|manaverse diff --git a/data/help/index.txt b/data/help/index.txt index bb02caa96..119281ba8 100644 --- a/data/help/index.txt +++ b/data/help/index.txt @@ -2,7 +2,7 @@ ##1-> @@about|<<About>>@@ -> @@download|<<Download>>@@ - -> @@team|<<Manaplus Developers>>@@ + -> @@team|<<ManaVerse Developers>>@@ -> @@commands|<<Commands>>@@ -> @@chatcommands|<<Chat commands>>@@ diff --git a/data/help/support.txt b/data/help/support.txt index b64b1fcd1..c1a8bf5f0 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -10,22 +10,16 @@ <<Current server support url:>> @@%SUPPORTURL%|%SUPPORTURL%@@ - <<For Evol Online support:>> + <<For ManaVerse Online support:>> <<Visit IRC channel:>> -##2 #evolonline ##9@##2 irc.freenode.net - - <<For ManaPlus Online support:>> - - <<Visit IRC channel:>> -##2 #manaplus #evolonline ##9@##2 irc.freenode.net - +##2 #themanaworld-dev ##9@##2 irc.libera.chat:6697 (TLS) <<For TMW support:>> ##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@ <<or come visit us on our IRC channel:>> -##2 #themanaworld ##9@##2 irc.freenode.net +##2 #themanaworld ##9@##2 irc.libera.chat:6697 (TLS) <<Otherwise see the @@team|Development Team@@ section to have a list of developers and how to contact them.>> diff --git a/data/help/tips/16.txt b/data/help/tips/16.txt index 0e8c9f681..343396309 100644 --- a/data/help/tips/16.txt +++ b/data/help/tips/16.txt @@ -1,3 +1,3 @@ <<Look this page for help and downloads:>> -@@http://manaplus.org/|http://manaplus.org/@@ +@@https://manaverse.germantmw.de/|https://manaverse.germantmw.de/@@ diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 2d5a0a899..0106dc8ef 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,7 +1,7 @@ SET(FILES - manaplus.svg + manaverse.svg ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "manaplus.svg" DESTINATION share/icons/hicolor/scalable/apps) +INSTALL(FILES "manaverse.svg" DESTINATION share/icons/hicolor/scalable/apps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 37eb702fd..dab4f85c0 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,19 +1,19 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = manaplus.png \ - manaplus.svg \ - manaplus.icns \ - manaplus.ico \ - manaplus.hqx \ - manaplus.xpm +icons_DATA = manaverse.png \ + manaverse.svg \ + manaverse.icns \ + manaverse.ico \ + manaverse.hqx \ + manaverse.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps - $(INSTALL) $(srcdir)/manaplus.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + $(INSTALL) $(srcdir)/manaverse.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg uninstall-local: - rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg EXTRA_DIST = \ $(icons_DATA) \ diff --git a/data/icons/manaplus.hqx b/data/icons/manaverse.hqx index 77b9e3b98..77b9e3b98 100644 --- a/data/icons/manaplus.hqx +++ b/data/icons/manaverse.hqx diff --git a/data/icons/manaplus.icns b/data/icons/manaverse.icns Binary files differindex 6556fccb1..6556fccb1 100644 --- a/data/icons/manaplus.icns +++ b/data/icons/manaverse.icns diff --git a/data/icons/manaplus.ico b/data/icons/manaverse.ico Binary files differindex bb2dea3b8..bb2dea3b8 100644 --- a/data/icons/manaplus.ico +++ b/data/icons/manaverse.ico diff --git a/data/icons/manaplus.png b/data/icons/manaverse.png Binary files differindex 423d1c6c2..423d1c6c2 100644 --- a/data/icons/manaplus.png +++ b/data/icons/manaverse.png diff --git a/data/icons/manaplus.svg b/data/icons/manaverse.svg index ea9564037..ea9564037 100644 --- a/data/icons/manaplus.svg +++ b/data/icons/manaverse.svg diff --git a/data/icons/manaplus.xpm b/data/icons/manaverse.xpm index c8480d214..80476fab4 100644 --- a/data/icons/manaplus.xpm +++ b/data/icons/manaverse.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * manaplus_xpm[] = { +static char * manaverse_xpm[] = { "32 32 3 1", " c None", ". c #001FC6", diff --git a/data/test/serverlistplus.xml b/data/test/serverlistplus.xml index 4e2b6123a..bcf104d24 100644 --- a/data/test/serverlistplus.xml +++ b/data/test/serverlistplus.xml @@ -48,33 +48,6 @@ <description_es>Únete a la aventura con gente de todo el mundo.</description_es> </server> - <server name="Evol Online" type="evol2"> - <connection hostname="world.evolonline.org" althostname="212.85.158.133" port="6901" protocol="TCP" /> - <state>DEVELOPMENT</state> - <defaultUpdateHost name="Evol normal updates" /> - <updates name="Evol beta updates"> - <host>http://download2.evolonline.org</host> - </updates> - <site>http://www.evolonline.org/</site> - <support>http://www.evolonline.org/chat/</support> - <description>Evol Online Beta server.</description> - <description_fr>Serveur Beta d'Evol Online.</description_fr> - <description_nl> Evol Online Beta server.</description_nl> - <description_pt_BR>Servidor Beta Evol Online</description_pt_BR> - <description_pt>Servidor Beta Evol Online</description_pt> - <description_zh_CN>Evol Online Beta 服务器。</description_zh_CN> - <description_de>Evol Online Beta server.</description_de> - <description_it>Evol Online Beta server.</description_it> - <description_ja>Evol Onlineβサーバー</description_ja> - <description_pl>Evol Online- serwer beta </description_pl> - <description_cs>Evol Online Beta server.</description_cs> - <description_ru>Evol Online бета сервер.</description_ru> - <description_vls>Evol Online Beta server.</description_vls> - <description_nl_BE>Evol Online Beta Server</description_nl_BE> - <description_id>server Evol Online Beta.</description_id> - <description_es>Servidor Beta de Evol Online.</description_es> - </server> - <server name="The Mana World (Brazil)" type="tmwathena"> <connection hostname="tmw-br.scall.org" port="6901" protocol="TCP" /> <state>PRODUCTION</state> @@ -97,53 +70,6 @@ <description_es>Servidor con contenido original en portugués.</description_es> </server> - <server name="The Mana World (German)" type="tmwathena"> - <connection hostname="germantmw.de" port="6901" protocol="TCP" /> - <state>DEVELOPMENT</state> - <site>http://germantmw.de/</site> - <description>A german The Mana World Server.</description> - <description_fr>Un serveur allemand du jeu The Mana World.</description_fr> - <description_nl>Een Duitse The Mana World server.</description_nl> - <description_pt_BR>Um Servidor The Mana World alemão.</description_pt_BR> - <description_pt>Servidor The Mana World Alemão.</description_pt> - <description_zh_CN>德语版 The Mana World。</description_zh_CN> - <description_de>Ein deutscher The Mana World Server.</description_de> - <description_it>Server The Mana World in tedesco.</description_it> - <description_ja>The Mana World ドイツ語サーバー</description_ja> - <description_pl>Niemiecki serwer The Mana World.</description_pl> - <description_cs>Německý The Mana World Server.</description_cs> - <description_ru>Немецкий сервер The Mana World.</description_ru> - <description_vls>Nen dutsn The Mana World serv'r.</description_vls> - <description_nl_BE>Een Duitse 'The Mana World' server.</description_nl_BE> - <description_id>Server The Mana World dengan Bahasa German</description_id> - <description_es>Un Servidor de The Mana World en alemán.</description_es> - </server> - - <server name="Land of Fire" type="tmwathena"> - <connection hostname="landoffire.org" port="6901" protocol="TCP" /> - <description>Mutant clone of TMW with new quests, items, and progression speed</description> - <description_fr>Clone mutant de TMW avec de nouvelles quêtes, de nouveaux objets et une progression accélérée.</description_fr> - <description_pt_BR>Clone mutante do TMW com novas quests, itens e velocidade de progressão.</description_pt_BR> - <description_zh_CN>TheManaWorld游戏的克隆版本，拥有新的关卡，任务和物品等</description_zh_CN> - <description_pl>Zmutowany klon TMW z nowymi questami, przedmiotami i prędkością progresji.</description_pl> - <description_cs>Mutantní klon TMW s novými úkoly, předměty a rychlostí postupu.</description_cs> - <description_ru>TMW клон-мутан с новыми квестами, предметами и скоростью развития</description_ru> - <description_vls>Gemutièrde kloan van TMW me nieuw' kwestn, ding'n en voorutgoande snel'eid</description_vls> - <description_nl_BE>Aangepaste versie van TMW met nieuwe opdrachten, voorwerpen en ontwikkelingssnelheid</description_nl_BE> - <description_es>Clon mutante de TMW con nuevas misiones, artículos y veloz progreso.</description_es> - <state>DEVELOPMENT</state> - <site>http://landoffire.org/</site> - </server> - - <server name="Hercules preview server" type="eathena"> - <connection hostname="hercules.manaplus.org" althostname="212.85.158.133" port="6900" protocol="TCP" packetVersion="20150000"/> - <state>DEVELOPMENT</state> - <site>http://manaplus.org/</site> - <support>http://manaplus.org/</support> - <updateMirror>http://download.evolonline.org/manaplus/hercules/data</updateMirror> - <description>Server for testing ManaPlus features.</description> - </server> - <server name="The Mana World test server" type="tmwathena"> <connection hostname="testing.themanaworld.org" althostname="167.114.185.71" port="6902" protocol="TCP" /> <state>DEVELOPMENT</state> diff --git a/data/tmw/Makefile.am b/data/tmw/Makefile.am index f8135b488..0335b1132 100644 --- a/data/tmw/Makefile.am +++ b/data/tmw/Makefile.am @@ -6,14 +6,14 @@ branding: mkdir -p "$(DESTDIR)$(datarootdir)/icons" mkdir -p "$(DESTDIR)$(desktopdir)" cp tmw.desktop "$(DESTDIR)$(desktopdir)" - cp tmw.manaplus "$(DESTDIR)$(pkgdatadir)/data/tmw" + cp tmw.manverse "$(DESTDIR)$(pkgdatadir)/data/tmw" cp icons/tmw-client.png "$(DESTDIR)$(pkgdatadir)/data/tmw/icons/tmw.png" cp icons/tmw-client.png "$(DESTDIR)$(datarootdir)/icons/tmw.png" cp -r images "$(DESTDIR)$(pkgdatadir)/data/tmw" EXTRA_DIST = tmw.desktop.in \ tmw.in \ - tmw.manaplus \ + tmw.manaverse \ icons/tmw-client.ico \ icons/tmw-client.png \ icons/tmw-client.xpm \ diff --git a/data/tmw/tmw.desktop.in b/data/tmw/tmw.desktop.in index 358877af0..5710ba70e 100644 --- a/data/tmw/tmw.desktop.in +++ b/data/tmw/tmw.desktop.in @@ -8,7 +8,7 @@ Comment[de]=ein Online Fantasy Spiel Comment[it]=Un gioco fantasy online Comment[nl]=Een online role playing game Comment[sv]=Ett fantasyrollspel online -Exec=manaplus @datadir@/manaplus/data/tmw/tmw.manaplus +Exec=manaverse @datadir@/manaverse/data/tmw/tmw.manaverse StartupNotify=false Terminal=false Type=Application diff --git a/data/tmw/tmw.in b/data/tmw/tmw.in index d726db2c3..ca6e35ee9 100755 --- a/data/tmw/tmw.in +++ b/data/tmw/tmw.in @@ -1,2 +1,2 @@ #!/bin/sh -exec manaplus @datadir@/manaplus/data/tmw/tmw.manaplus "$@" +exec manaverse @datadir@/manaverse/data/tmw/tmw.manaverse "$@" diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaverse index c4b66237e..c4b66237e 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.manaverse |
