Merge branch 'master' of https://gitlab.com/evol/clientdata

3 files changed, 186 insertions, 14 deletions

diff --git a/LICENSE b/LICENSE
index 9c2a00e4..8fae56be 100644
--- a/LICENSE
+++ b/LICENSE
@@ -165,7 +165,11 @@ legal@themanaworld.org
     graphics/items/equipment/head/nohmask.png (LEGACY)                      (GPLv2)               (-)
     graphics/items/equipment/head/pinkiehat.png (LEGACY)                    (GPLv2)               (-)
     graphics/items/equipment/head/pumpkinhat.png (Modanung)                 (CC BY-SA 3.0)        (-)
+<<<<<<< HEAD
     graphics/items/equipment/head/rangerhat.png (LEGACY)                    (GPLv2)               (-)
+=======
+    graphics/items/equipment/head/rangerhat.png (Pauan)                     (GPLv2)               (-)
+>>>>>>> 2d0c4f74a7490f4d074cdf4774e279890f517925
     graphics/items/equipment/head/rosehat.png (Nami, skipy)                 (GPLv2)               (Alige, Micksha)
     graphics/items/equipment/head/silkheadband.png (LEGACY)                 (GPLv2)               (-)
     graphics/items/equipment/head/standardheadband.png (LEGACY)             (GPLv2)               (-)
@@ -896,7 +900,7 @@ legal@themanaworld.org
     graphics/sprites/equipment/head/pumpkinhat.png (Modanung)               (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/purplemodel.png (Saulc)                 (GPLv2)               (-)
     graphics/sprites/equipment/head/rosehat.png (LEGACY)                    (GPLv2)               (Micksha)
-    graphics/sprites/equipment/head/rangerhat.png (LEGACY)                  (GPLv2)               (Micksha)
+    graphics/sprites/equipment/head/rangerhat.png (Pauan)                   (GPLv2)               (Micksha)
     graphics/sprites/equipment/head/santabeardhat.png (LEGACY)              (GPLv2)               (-)
     graphics/sprites/equipment/head/santahat.png (LEGACY)                   (GPLv2)               (-)
     graphics/sprites/equipment/head/silkheadband.png (LEGACY)               (GPLv2)               (-)
diff --git a/graphics/sprites/equipment/head/rangerhat.xml b/graphics/sprites/equipment/head/rangerhat.xml
index 0cd5df36..c96af388 100644
--- a/graphics/sprites/equipment/head/rangerhat.xml
+++ b/graphics/sprites/equipment/head/rangerhat.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha
 Copyright (C) 2020 rEvolt -->
+<<<<<<< HEAD
 <sprite>
 	<saedit>
 		<layer type="repeater" file="races/demon-male.xml"/>
 		<layer type="background" color="rgba(128,128,128,0.5)" zindex="-2"/>
 	</saedit>
+=======
+
+<sprite>
+
+>>>>>>> 2d0c4f74a7490f4d074cdf4774e279890f517925
     <imageset name="base"
               src="graphics/sprites/equipment/head/rangerhat.png"
               width="42"
diff --git a/help/about-server.txt b/help/about-server.txt
index 730ab461..3dba7f4a 100644
--- a/help/about-server.txt
+++ b/help/about-server.txt
@@ -3,6 +3,33 @@
 @@http://evolonline.org/|<<Official site:>> http://evolonline.org@@
 
 ##3---------------------------
+##3-- <<The Mana World rEvolt Contributors>> --
+##3---------------------------
+
+##941444d494e (Andrei Karas) <4144 evolonline.org>
+##9Chicka-Maria <comfycheeks themanaworld.org>
+##9Ejlol (Oscar Klein Heerenbrink)
+##9Freeyorp101
+##9gumi
+##9Hello=)
+##9Hocus Pocus Fidibus <kurt.kuschinski gmail.com>
+##9jak1 (Mike Wollmann) <jak1 germantmw.de>
+##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com>
+##9kytty
+##9Ledmitz <ledmitz gmail.com>
+##9Livio (Livio Recchia)
+##9Micksha (Mick) <ms-shaman gmx.de>
+##9mifritscher
+##9Prsm
+##9Reid <reid evolonline.org>
+##9Rill
+##9Saulc (Lucas Helaine) <lucashelaine14 gmail.com>
+##9Soren
+##9Tomminator
+##9WildX (William Pine) <wildx evolonline.org>
+##9Wushin <pasekei gmail.com>
+
+##3---------------------------
 ##3-- <<Evol Online Contributors>> --
 ##3---------------------------
 
@@ -23,9 +50,9 @@
 ##9Crush (Philipp Sehmisch) <tmw crushnet.org>
 ##9Dariunas (Aasif Chaudry) <aasif.chaudry infectedmusicdesigns.co.uk>
 ##9Dark_Mage
-##9DerLoisl (Max Isele) <der.loisl theavoraproject.org>
+##9Der Loisl (Max Isele) <der.loisl theavoraproject.org>
 ##9Derpella
-##9EJlol
+##9EJlol (Oscar Klein Heerenbrink)
 ##9Elvano (Elvano Miok) <elvano evolonline.org>
 ##9Enchilado (W E Sayers)
 ##9Eric (Eric Matyas) <ematyas aol.com>
@@ -35,10 +62,10 @@
 ##9FotherJ (Jarrett Thomas-Huxley)
 ##9gumi
 ##9Hal9000 (Francesco Miglietta) <francesco.miglietta evolonline.org>
-##9Irukard (Krzysztof Daszuta)
+##9Irukard (Krzysztof Daszuta) <irukard gmail.com>
 ##9IvanMorve (Martin)
-##9Jak1 (Mike Wollmann) <jak89_1 ftb4u.de>
-##9jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com>
+##9jak1 (Mike Wollmann) <jak1 germantmw.de>
+##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com>
 ##9KaTSuo (Gremly) <tlz.katsuo gmail.com>
 ##9Kenny690 (Saidullin Il'shat) <bio_editor mail.ru>
 ##9Kestrel
@@ -62,28 +89,30 @@
 ##9Nard (Bernard Hugonnet) <bernard.hugonnet bh28.net>
 ##9Necromonger (Mihail Barer)
 ##9Nelson6e65 (Nelson Martell) <nelson6e65-manaplus yahoo.es>
-##9omatt <m.vuoso @laposte.net>
+##9omatt <m.vuoso laposte.net>
 ##9Othello (Vincent Van Beveren) <v.van.beveren nikhef.nl>
-##9Pajarico
+##9Pajarico (Pajarico Guaje)
 ##9Pihro (Garett Smith) <theonewhoplayswithfire gmail.com>
 ##9Piman
 ##9Pitriss (Petr Varkoček)
 ##9Posydonia (Mélanie Dinot)
-##9Qwerty Dragon
 ##9Reid <reid evolonline.org>
 ##9Saci
-##9Saphy
 ##9Salius (Aleksey S.)
+##9Saphy
 ##9saturn (Nikola Whallon) <6.saturn.6 gmail.com>
 ##9Saweres <onshine20 gmail.com>
 ##9Sir_lance
 ##9Socapex (Philippe Groarke) <socapex evolonline.org>
+##9SudoPlatypus
 ##9Talaroc (Ryan Voss) <arashi86 gmail.com>
 ##9Taree
 ##9Tayoko
 ##9Teru
+##9Tezer431
 ##9Tirifto
-##9Vasily Makarov (Dan Sagunov) <vasily evolonline.org>
+##9Tomminator
+##9Vasily Makarov (Danil Sagunov) <vasily evolonline.org>
 ##9VxD <vxd.michael gmail.com>
 ##9WildX (William Pine) <wildx evolonline.org>
 ##9Wushin <pasekei gmail.com>
@@ -94,16 +123,146 @@
 ##3-- <<The Mana World Legacy Contributors>> --
 ##3---------------------------
 
+##941444d494e (Andrei Karas) <4144 evolonline.org>
+##9Ablu (Erik Schilling) <ablu.erikschilling gmail.com>
+##9AL13N (Maarten Vanraes) <alien rmail.be>
+##9Alastrim (Antônio) <alasmirt gmail.com>
+##9Alige <alige evolonline.org>
+##9AlOns
+##9Argul (Stefan Beller)
+##9Arikel
+##9Avaniel (Rogier Polak)
+##9Bagzie
+##9Bear
+##9Bernhardt (Chay)
+##9Bertram (Yohann Ferreira)
+##9Big Crunch
+##9CapitanAwesome
+##9Cassy (Cassandra)
+##9Catfish_Man
+##9ChefChelios
+##9Chetic (Fredrik Reveny) <chetic gmail.com>
 ##9Chicka-Maria <comfycheeks themanaworld.org>
+##9Clef
+##9Coolkid782 <coolkid782 evolonline.org>
 ##9Crush (Philipp Sehmisch) <tmw crushnet.org>
+##9Dabe (David Del Re)
+##9Delasia
+##9Demon
+##9Der Loisl (Max Isele) <der.loisl theavoraproject.org>
+##9deviexx
+##9dobey (Rodney Dawes)
+##9doorsman
+##9Ejlol (Oscar Klein Heerenbrink)
+##9ElvenProgammer (Eugenio Favalli) <elvenprogrammer gmail.com>
 ##9Enchilado (W E Sayers)
+##9FotherJ (Jarrett Thomas-Huxley)
+##9Freeyorp
+##9Frost
+##9Gnulia
+##9Golgo
+##9GonzoDark (Leif Kildelund)
 ##9gumi
+##9Hello=)
+##9Hocus Pocus Fidibus <kurt.kuschinski gmail.com>
+##9I
+##9imorgado (Igor Morgado)
+##9IvanMorve (Martin)
+##9jak1 (Mike Wollmann) <jak1 germantmw.de>
+##9Javila (José Ávila)
+##9jaxed0127 (Jared Adams)
+##9Jenalia
+##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com>
+##9JoshLangley (Joshua Langley)
+##9Kage (Chuck Miller) <shadowmil gmail.com>
+##9Katze
+##9kindjal (Huynh Ngoc Chau Tran)
+##9Kineticstorm
+##9kth5/Shura (Alexander Baldeck)
+##9Kyokai (Kiyoshi Kyokai)
+##9kytty
+##9Ledmitz <ledmitz gmail.com>
 ##9Len (Leonard Pabin III)
-##9Saphy
+##9Livio (Livio Recchia)
+##9Lizandra (Filipa Serra e Silva)
+##9maci (Marcel W. Wysocki)
+##9MadCamel
+##9Maester Pixel
+##9Magick (Jordan) <admin_magick hotmail.com>
+##9MasterKenobi
+##9Meko
+##9meway (Andrew Hall)
+##9Micksha (Mick) <ms-shaman gmx.de>
+##9Mkael
+##9Modanung (Frode Lindeijer)
+##9moi1392 (Cedric Borgese) <cedric.borgese gmail.com>
+##9monwarez (Thibault Payet) <monwarez mailoo.org>[@@https://gitlab.com/u/monwarez|<<https://gitlab.com/u/monwarez>>@@]
+##9Mra (Jan-Fabian Humann) <malastare gmx.net>
+##9mrgrey
+##9Nard (Bernard Hugonnet) <bernard.hugonnet bh28.net>
+##9Narus <narus.tmw gmail.com>
+##9Necromonger (Mihail Barer)
+##9Neko-mon
+##9Neorice
+##9nym
+##9o11c
+##9omatt <m.vuoso laposte.net>
+##9Pajarico (Pajarico Guaje)
+##9Pauan
+##9peavey (Dennis Friis) <peavey placid.dk>
+##9Pihro (Garett Smith) <theonewhoplayswithfire gmail.com>
+##9Platyna (Zuzanna Karolina Filutowska)
+##9Pluto (Arian Asimi)
+##9Prsm
+##9Purple (Thorbjørn Lindeijer) <thorbjorn lindeijer.nl>
+##9Pyndragon (Daniel Foerster)
+##9Qoal (Scott Ellis) <quiche_on_a_leash hotmail.co.uk>
+##9Qwerty Dragon
+##9razor85 (Romulo Fernandes)
+##9Reid <reid evolonline.org>
+##9Rotonen (Joni Orponen)
+##9salmondine (Mark Dunbar)
+##9Silene (Guillaume Melquiond)
+##9Silent Dawn
+##9simonedw (Simon Edwardsson) <simon crossnet.se>
+##9Skipy
+##9Sora
+##9SudoPlatipus
+##9Sull (Jean-Francois Lampron) <sull.kf gmail.com>
+##9Superkoop (John Koopman)
+##9Swimmy
+##9Talaroc (Ryan Voss) <arashi86 gmail.com>
+##9Tametomo (Ira Rice) <irarice gmail.com>
+##9Tatjana
+##9Tezer431
+##9Ti Sing Hao
+##9Tiana
+##9Tirifto
+##9Tomminator
+##9Turmfalke
+##9tux9th
+##9Ultramichy
+##9Usiu (Mateusz Kaduk)
+##9V0id (Vincent Petithory)
 ##9Varuna
+##9Vasily Makarov (Danil Sagunov) <vasily evolonline.org>
+##9veryapeGM
+##9VictorSan
+##9Vink
+##9Vlady
+##9WildX (William Pine) <wildx evolonline.org>
 ##9Wombat <hpwombat yahoo.com>[@@https://github.com/wombatism|<<https://github.com/wombatism>>@@]
 ##9Wushin <pasekei gmail.com>
-##9Yosuhara
+##9zenogais (Eric Scrivner)
+##9Zipon
+##9(unknown) (Aaron Marks)
+##9(unknown) (Andrej Sinicyn)
+##9(unknown) (Douglas Boffey)
+##9(unknown) (Duane Bailey)
+##9(unknown) (Johannelaliberte)
+##9(unknown) (Kess Vargavind) <vargavind gmail.com>
+##9(unknown) (Lloyd Bryant) <lloyd_bryant netzero.net>
+##9(unknown) (Matthias Hartmann) <hartmann.matthias gmail.com>
 
 ##3---------------------------
 ##3-- <<Unknown Flying Bullet Contributors>> --
@@ -132,7 +291,10 @@
 ##3-- <<Related Communities>> --
 ##3---------------------------
 
+[@@http://crc.themanaworld.org/|<<Crew of Red Corsair>>http://crc.themanaworld.org/@@]
+[@@https://moubootaurlegends.org/|<<Moubotaur Legends>>https://moubootaurlegends.org/@@]
 [@@http://opengameart.org|<<OpenGameArt>>http://opengameart.org@@]
+[@@https://www.spi-inc.org/|<<Software in the Public Interest>>https://www.spi-inc.org/@@]
 [@@http://tmw-br.scall.org|<<TheManaWorld-Br>>http://tmw-br.scall.org@@]
+[@@https://www.mapeditor.org/|<<Tiled Map Editor>>https://www.mapeditor.org/@@]
 [@@http://tuxfamily.org|<<TuxFamily>>http://tuxfamily.org@@]
-[@@http://crc.themanaworld.org/|<<Crew of Red Corsair>>http://crc.themanaworld.org/@@]