From 504f93b83e6f7448c5eb3fbcb421e94b7f34f699 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 24 Jan 2012 14:27:54 +0300
Subject: Add evol and tmw branding.

---
 data/evol/evol.manaplus                     |  17 +++++++++++++++++
 data/evol/images/loginwallpaper_800x600.png | Bin 0 -> 1481772 bytes
 data/tmw/images/loginwallpaper_800x600.png  | Bin 0 -> 903998 bytes
 data/tmw/tmw.manaplus                       |  17 +++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 data/evol/evol.manaplus
 create mode 100644 data/evol/images/loginwallpaper_800x600.png
 create mode 100644 data/tmw/images/loginwallpaper_800x600.png
 create mode 100644 data/tmw/tmw.manaplus

(limited to 'data')

diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
new file mode 100644
index 000000000..af5c1ea1e
--- /dev/null
+++ b/data/evol/evol.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="Evol Online"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
+ <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
+ <option name="defaultServer" value="world.evolonline.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="evol/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>
diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..a1fe4f83b
Binary files /dev/null and b/data/evol/images/loginwallpaper_800x600.png differ
diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..e3a6e492d
Binary files /dev/null and b/data/tmw/images/loginwallpaper_800x600.png differ
diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus
new file mode 100644
index 000000000..47688e1d0
--- /dev/null
+++ b/data/tmw/tmw.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="The Mana World"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="loginMusic" value="Magick - Real.ogg"/>
+ <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/>
+ <option name="defaultServer" value="server.themanaworld.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="tmw/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>
-- 
cgit v1.2.3-70-g09d2


From a913dd41df61760de6ece552f941e002251ff54c Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Wed, 25 Jan 2012 22:04:19 +0100
Subject: Correct manaplus icon on .xpm .

---
 data/icons/manaplus.xpm | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'data')

diff --git a/data/icons/manaplus.xpm b/data/icons/manaplus.xpm
index 33de9197a..df48f3ad3 100644
--- a/data/icons/manaplus.xpm
+++ b/data/icons/manaplus.xpm
@@ -3,39 +3,39 @@ static char * manaplus_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #FF6600",
-"+	c #FF6500",
-"@	c #FF6400",
-"#	c #FF6700",
-"$	c #FF6300",
-"              .+.++..           ",
-"           ..+...@  .+.#        ",
-"         ++..@              @   ",
-"        ..+.               +@   ",
-"      +.+.              $  ++   ",
-"     ..+.               @@$@+$$ ",
-"    ....                  $++++@",
-"   +..+                    @@   ",
-"   ..+                    +@    ",
-"  +..        ...     ...        ",
-"  ..+   ...+.+.....+....++      ",
-" ...   #....  ....+.  .....     ",
-" ...   ....+   .....   ....     ",
-"@..+   +...    ....    ...+     ",
-"+..    ....    ....    ....     ",
+"X	c #FF6500",
+"o	c #FF6400",
+"O	c #FF6700",
+"+	c #FF6300",
+"              .X.XX..           ",
+"           ..X...o  .X.O        ",
+"         XX..o               .  ",
+"        ..X.                o   ",
+"      X.X.              +  XX   ",
+"     ..X.                o+oX+  ",
+"    ....                  +XXXX ",
+"   X..X                    oo  .",
+"   ..X                     o    ",
+"  X..        ...     ...  .     ",
+"  ..X   ...X.X.....X....XX      ",
+" ...   O....  ....X.  .....     ",
+" ...   ....X   .....   ....     ",
+"o..X   X...    ....    ...X     ",
+"X..    ....    ....    ....     ",
 "...    ....    ....    ....     ",
-"...    ....    ....    ...+     ",
-"...    ....    ....    ...+     ",
-"...   +...+   .....    ...+     ",
-"...   +...    +...    +...      ",
-" ..   ....    ....    +..+      ",
-" ..   ...+    ....    ....+++.+.",
-" +.   ...     ...     ..+..    +",
-"  .+                     +     .",
-"  +.                    ..    .+",
-"   +.                  ..    ++ ",
-"    ..                 +.+  ++  ",
-"     ++               +...+..   ",
-"      .+             +.....+    ",
-"        ++         ....+..      ",
-"          +++.#.++.+.+..        ",
-"             ..+..+..           "};
+"...    ....    ....    ...X     ",
+"...    ....    ....    ...X     ",
+"...   X...X   .....    ...X     ",
+"...   X...    X...    X...      ",
+" ..   ....    ....    X..X      ",
+" ..   ...X    ....    ....XXX.X.",
+" X.   ...     ...     ..X..    X",
+"  .X                     X     .",
+"  X.                    ..    .X",
+"   X.                  ..    XX ",
+"    ..                 X.X  XX  ",
+"     XX               X...X..   ",
+"      .X             X.....X    ",
+"        XX         ....X..      ",
+"          XXX.O.XX.X.X..        ",
+"             ..X..X..           "};
-- 
cgit v1.2.3-70-g09d2


From 469b6cc8398c77d2dafaf3038306e2e4f9124094 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2012 17:50:28 +0300
Subject: Add evol icons.

---
 data/evol/icons/manaplus.ico | Bin 0 -> 44055 bytes
 data/evol/icons/manaplus.png | Bin 0 -> 7366 bytes
 data/evol/icons/manaplus.xpm |  45 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 data/evol/icons/manaplus.ico
 create mode 100644 data/evol/icons/manaplus.png
 create mode 100644 data/evol/icons/manaplus.xpm

(limited to 'data')

diff --git a/data/evol/icons/manaplus.ico b/data/evol/icons/manaplus.ico
new file mode 100644
index 000000000..33f379feb
Binary files /dev/null and b/data/evol/icons/manaplus.ico differ
diff --git a/data/evol/icons/manaplus.png b/data/evol/icons/manaplus.png
new file mode 100644
index 000000000..2fb9eaab0
Binary files /dev/null and b/data/evol/icons/manaplus.png differ
diff --git a/data/evol/icons/manaplus.xpm b/data/evol/icons/manaplus.xpm
new file mode 100644
index 000000000..7fb1f2cda
--- /dev/null
+++ b/data/evol/icons/manaplus.xpm
@@ -0,0 +1,45 @@
+/* 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        ",
+"        #   +         +         ",
+"        .   @         .         ",
+"         .$#        $@          "};
-- 
cgit v1.2.3-70-g09d2


From d15f891f23566f31897bfc64f054a1836dc27086 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2012 18:06:11 +0300
Subject: Remove extension from "appIcon" branding parameter.

---
 data/evol/evol.manaplus | 2 +-
 docs/example.manaplus   | 2 +-
 src/defaults.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index af5c1ea1e..9f883509c 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -3,7 +3,7 @@
 <configuration>
  <option name="appName" value="Evol Online"/>
  <option name="appShort" value="mana"/>
- <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="appIcon" value="icons/manaplus"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
  <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
diff --git a/docs/example.manaplus b/docs/example.manaplus
index 80d4c9ce3..2a580463f 100644
--- a/docs/example.manaplus
+++ b/docs/example.manaplus
@@ -11,7 +11,7 @@ filename / path as a command line parameter
 <configuration>
  <option name="appName" value="ManaPlus"/>
  <option name="appShort" value="mana"/>
- <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="appIcon" value="icons/manaplus"/>
  <option name="loginMusic" value="Magick - Real.ogg"/>
  <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/>
  <option name="defaultServer" value="server.themanaworld.org"/>
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 8444fafff..8933cddec 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -235,7 +235,7 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "wallpapersPath", "");
     AddDEF(brandingData, "wallpapersFile", "");
     AddDEF(brandingData, "appName", "ManaPlus");
-    AddDEF(brandingData, "appIcon", "icons/manaplus.png");
+    AddDEF(brandingData, "appIcon", "icons/manaplus");
     AddDEF(brandingData, "loginMusic", "Magick - Real.ogg");
     AddDEF(brandingData, "defaultServer", "");
     AddDEF(brandingData, "defaultPort", DEFAULT_PORT);
-- 
cgit v1.2.3-70-g09d2


From 2f8c81deca6df64e0ae4c228e2bee9aec506e5fe Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2012 18:11:28 +0300
Subject: Add evol icon for windows branding.

---
 data/evol/evol.manaplus      |   2 +-
 data/evol/icons/manaplus.ico | Bin 44055 -> 533366 bytes
 packaging/windows/setup.nsi  |   7 +++++--
 src/manaplus.rc              |   5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'data')

diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 9f883509c..4eca64197 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -3,7 +3,7 @@
 <configuration>
  <option name="appName" value="Evol Online"/>
  <option name="appShort" value="mana"/>
- <option name="appIcon" value="icons/manaplus"/>
+ <option name="appIcon" value="evol/icons/manaplus"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
  <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
diff --git a/data/evol/icons/manaplus.ico b/data/evol/icons/manaplus.ico
index 33f379feb..17309a1ba 100644
Binary files a/data/evol/icons/manaplus.ico and b/data/evol/icons/manaplus.ico differ
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 92f653816..9600c841e 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -365,15 +365,18 @@ 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"'
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"'
+  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
diff --git a/src/manaplus.rc b/src/manaplus.rc
index b7720e2cc..1a6513bd6 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -3,6 +3,7 @@
 #include "winver.h"
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico"
+evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/manaplus.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
@@ -11,10 +12,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
 {
     BLOCK "StringFileInfo" {
         BLOCK "040904E4" {
-            VALUE "CompanyName", "The Mana Development Team"
+            VALUE "CompanyName", "The ManaPlus Development Team"
             VALUE "FileVersion", PACKAGE_VERSION "4144"
             VALUE "FileDescription", "ManaPlus"
-            VALUE "LegalCopyright", "2004-2010 (C)"
+            VALUE "LegalCopyright", "2004-2012 (C)"
             VALUE "OriginalFilename", "manaplus.exe"
             VALUE "ProductName", "ManaPlus MMORPG Client"
             VALUE "ProductVersion", PACKAGE_VERSION "4144"
-- 
cgit v1.2.3-70-g09d2


From 8dea62750ab3a44e0f35f2543bbb6ccf2a9470ce Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 30 Jan 2012 15:25:42 +0100
Subject: Correct "Awesome" and "GP" emotes.

---
 data/graphics/sprites/manaplus_emotions.png | Bin 34648 -> 34710 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'data')

diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaplus_emotions.png
index c6f49ff29..196fc9fb9 100644
Binary files a/data/graphics/sprites/manaplus_emotions.png and b/data/graphics/sprites/manaplus_emotions.png differ
-- 
cgit v1.2.3-70-g09d2


From bd54c1adb58084531c5bbb34cc898cedf2a79561 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 30 Jan 2012 22:04:29 +0100
Subject: Add 3 new emotes (Trollface from mimistakes, Metal-salute and Crying
 requested from AL13N).

---
 data/graphics/sprites/manaplus_emote.xml    |   4 +++-
 data/graphics/sprites/manaplus_emotes.xml   |   3 +++
 data/graphics/sprites/manaplus_emotions.png | Bin 34710 -> 39205 bytes
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml
index 8f27c4f83..1ec57dff2 100644
--- a/data/graphics/sprites/manaplus_emote.xml
+++ b/data/graphics/sprites/manaplus_emote.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<sprite variants="25" variant_offset="1">
+<!-- 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" />
 
     <action name="stand" imageset="base">
diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml
index 38628dc30..aad1b48b7 100644
--- a/data/graphics/sprites/manaplus_emotes.xml
+++ b/data/graphics/sprites/manaplus_emotes.xml
@@ -24,4 +24,7 @@
     <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_emotions.png b/data/graphics/sprites/manaplus_emotions.png
index 196fc9fb9..1b2815b87 100644
Binary files a/data/graphics/sprites/manaplus_emotions.png and b/data/graphics/sprites/manaplus_emotions.png differ
-- 
cgit v1.2.3-70-g09d2


From d7cbb663f5f8e19ccfa7162ef7d1d4e3b4020335 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2012 02:17:40 +0300
Subject: Add special attributes to emotes.

---
 data/graphics/sprites/manaplus_emotes.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'data')

diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml
index aad1b48b7..240b2d4b8 100644
--- a/data/graphics/sprites/manaplus_emotes.xml
+++ b/data/graphics/sprites/manaplus_emotes.xml
@@ -1,4 +1,9 @@
 <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>
-- 
cgit v1.2.3-70-g09d2


From a3b2921f6dec9b989493801958af47664a4a41ca Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2012 20:21:47 +0300
Subject: Rename some files for evol branding.

---
 data/evol/evol.desktop          |  47 ++++++++++++++++++++++++++++++++++++++++
 data/evol/evol.manaplus         |   2 +-
 data/evol/icons/evol-client.ico | Bin 0 -> 533366 bytes
 data/evol/icons/evol-client.png | Bin 0 -> 7366 bytes
 data/evol/icons/evol-client.xpm |  45 ++++++++++++++++++++++++++++++++++++++
 data/evol/icons/manaplus.ico    | Bin 533366 -> 0 bytes
 data/evol/icons/manaplus.png    | Bin 7366 -> 0 bytes
 data/evol/icons/manaplus.xpm    |  45 --------------------------------------
 packaging/windows/evol.nsi      |   4 ++--
 src/manaplus.rc                 |   2 +-
 10 files changed, 96 insertions(+), 49 deletions(-)
 create mode 100644 data/evol/evol.desktop
 create mode 100644 data/evol/icons/evol-client.ico
 create mode 100644 data/evol/icons/evol-client.png
 create mode 100644 data/evol/icons/evol-client.xpm
 delete mode 100644 data/evol/icons/manaplus.ico
 delete mode 100644 data/evol/icons/manaplus.png
 delete mode 100644 data/evol/icons/manaplus.xpm

(limited to 'data')

diff --git a/data/evol/evol.desktop b/data/evol/evol.desktop
new file mode 100644
index 000000000..7ccfc4001
--- /dev/null
+++ b/data/evol/evol.desktop
@@ -0,0 +1,47 @@
+
+[Desktop Entry]
+Version=1.0
+Name=EvolOnline
+Comment=A 2D MMORPG client
+Exec=manaplus /usr/share/games/manaplus/data/evol/evol.manaplus
+StartupNotify=false
+Terminal=false
+Type=Application
+Icon=evol-client
+Categories=Game;AdventureGame;
+
+
+# Translations
+Comment[vls]=Nen 2D MMORPG client
+Name[vls]=ManaPlus
+Icon[vls]=manaplus
+Comment[ru]=Клиент к 2D MMORPG игре
+Name[ru]=ManaPlus
+Icon[ru]=manaplus
+Comment[it]=Un gioco fantasy online
+Name[it]=ManaPlus
+Icon[it]=manaplus
+Comment[ja]=2DのMMORPGクライアント
+Name[ja]=ManaPlus
+Icon[ja]=manaplus
+Comment[cs]=2D MMORPG klient
+Name[cs]=ManaPlus
+Icon[cs]=manaplus
+Comment[nl_BE]=Een 2D MMORPG client
+Name[nl_BE]=ManaPlus
+Icon[nl_BE]=manaplus
+Comment[de]=ein 2D MMORG Client
+Name[de]=ManaPlus
+Icon[de]=manaplus
+Comment[sv_SE]=Ett fantasyrollspel online
+Name[sv_SE]=ManaPlus
+Icon[sv_SE]=manaplus
+Comment[es]=Un cliente MMORPG 2D
+Name[es]=ManaPlus
+Icon[es]=manaplus
+Comment[fr]=Un jeu en ligne dans un univers fantastique
+Name[fr]=ManaPlus
+Icon[fr]=manaplus
+Comment[nl]=Een online role playing game
+Name[nl]=ManaPlus
+Icon[nl]=manaplus
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 4eca64197..9527f9ee3 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -3,7 +3,7 @@
 <configuration>
  <option name="appName" value="Evol Online"/>
  <option name="appShort" value="mana"/>
- <option name="appIcon" value="evol/icons/manaplus"/>
+ <option name="appIcon" value="evol/icons/evol-client"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
  <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
diff --git a/data/evol/icons/evol-client.ico b/data/evol/icons/evol-client.ico
new file mode 100644
index 000000000..17309a1ba
Binary files /dev/null and b/data/evol/icons/evol-client.ico differ
diff --git a/data/evol/icons/evol-client.png b/data/evol/icons/evol-client.png
new file mode 100644
index 000000000..2fb9eaab0
Binary files /dev/null and b/data/evol/icons/evol-client.png differ
diff --git a/data/evol/icons/evol-client.xpm b/data/evol/icons/evol-client.xpm
new file mode 100644
index 000000000..7fb1f2cda
--- /dev/null
+++ b/data/evol/icons/evol-client.xpm
@@ -0,0 +1,45 @@
+/* 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/icons/manaplus.ico b/data/evol/icons/manaplus.ico
deleted file mode 100644
index 17309a1ba..000000000
Binary files a/data/evol/icons/manaplus.ico and /dev/null differ
diff --git a/data/evol/icons/manaplus.png b/data/evol/icons/manaplus.png
deleted file mode 100644
index 2fb9eaab0..000000000
Binary files a/data/evol/icons/manaplus.png and /dev/null differ
diff --git a/data/evol/icons/manaplus.xpm b/data/evol/icons/manaplus.xpm
deleted file mode 100644
index 7fb1f2cda..000000000
--- a/data/evol/icons/manaplus.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/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index 49bfa9963..1d17d46ce 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -62,9 +62,9 @@ RequestExecutionLevel admin
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\evol\icons\manaplus.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\manaplus.ico"
+!define MUI_UNICON "${SRCDIR}\data\evol\icons\evol-client.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
diff --git a/src/manaplus.rc b/src/manaplus.rc
index 1a6513bd6..b16ca40a7 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -3,7 +3,7 @@
 #include "winver.h"
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico"
-evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/manaplus.ico"
+evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/evol-client.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-- 
cgit v1.2.3-70-g09d2


From 71e68d8214317a3516e54a72af655bd35960a359 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 4 Feb 2012 03:51:59 +0300
Subject: Update evol servers list url.

---
 data/evol/evol.manaplus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 9527f9ee3..63a963495 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -5,7 +5,7 @@
  <option name="appShort" value="mana"/>
  <option name="appIcon" value="evol/icons/evol-client"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
- <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
+ <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
  <option name="defaultPort" value="6901"/>
  <option name="defaultServerType" value="evol"/>
-- 
cgit v1.2.3-70-g09d2