Merge branch 'contrib_update_20200510' into 'master'

updated revolt contributors

See merge request evol/evol-tools!26

3 files changed, 200 insertions, 25 deletions

diff --git a/contrib_xsl/about-server.xsl b/contrib_xsl/about-server.xsl
index 99f5f1c..384c0ce 100644
--- a/contrib_xsl/about-server.xsl
+++ b/contrib_xsl/about-server.xsl
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- Author: Reid
+<!-- Author: Reid, jak1
+Copyright (C) 2016-2020 The Mana World
 Copyright (C) 2016 Evol Online -->
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -14,6 +15,14 @@ Copyright (C) 2016 Evol Online -->
         <xsl:apply-templates/>
     </xsl:template>
 
+    <xsl:template match="tmw-revolt">
+        <xsl:text>&#xa;##3---------------------------&#xa;</xsl:text>
+        <xsl:text>##3-- &lt;&lt;The Mana World rEvolt Contributors&gt;&gt; --&#xa;</xsl:text>
+        <xsl:text>##3---------------------------&#xa;&#xa;</xsl:text>
+
+        <xsl:apply-templates select="contributor"/>
+    </xsl:template>
+
     <xsl:template match="evol">
         <xsl:text>&#xa;##3---------------------------&#xa;</xsl:text>
         <xsl:text>##3-- &lt;&lt;Evol Online Contributors&gt;&gt; --&#xa;</xsl:text>
diff --git a/contrib_xsl/contributors.xml b/contrib_xsl/contributors.xml
index 08af36f..5ac60d3 100644
--- a/contrib_xsl/contributors.xml
+++ b/contrib_xsl/contributors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Reid
-Copyright (C) 2016-2017 The Mana World
+<!-- Author: Reid, jak1
+Copyright (C) 2016-2020 The Mana World
 Copyright (C) 2010-2016 Evol Online
 
 This file contains a list of all contributors and developers who took part in the The Mana World project.
@@ -13,7 +13,32 @@ http://wiki.themanaworld.org/index.php/Contributors
 -->
 
 <contributors>
-    <!-- "The Mana World" developers & contributors -->
+    <!-- "The Mana World rEvolt" developers & contributors -->
+    <tmw-revolt>
+        <contributor nick="41444d494e" name="Andrei Karas" mailid="4144" mailserver="evolonline.org"/>
+        <contributor nick="Chicka-Maria" mailid="comfycheeks" mailserver="themanaworld.org"/>
+        <contributor nick="Ejlol" name="Oscar Klein Heerenbrink"/>
+        <contributor nick="Freeyorp101"/>
+        <contributor nick="gumi"/>
+        <contributor nick="Hello=)"/>
+        <contributor nick="Hocus Pocus Fidibus" mailid="kurt.kuschinski" mailserver="gmail.com"/>
+        <contributor nick="jak1" name="Mike Wollmann" mailid="jak1" mailserver="germantmw.de"/>
+        <contributor nick="Jesusalva" name="Jonatas L. Nogueira" mailid="cpntb1" mailserver="ymail.com"/>
+        <contributor nick="kytty"/>
+        <contributor nick="Ledmitz" mailid="ledmitz" mailserver="gmail.com"/>
+        <contributor nick="Livio" name="Livio Recchia"/>
+        <contributor nick="Micksha" name="Mick" mailid="ms-shaman" mailserver="gmx.de"/>
+        <contributor nick="mifritscher"/>
+        <contributor nick="Prsm"/>
+        <contributor nick="Reid" mailid="reid" mailserver="evolonline.org"/>
+        <contributor nick="Rill"/>
+        <contributor nick="Saulc" name="Lucas Helaine" mailid="lucashelaine14" mailserver="gmail.com"/>
+        <contributor nick="Soren"/>
+        <contributor nick="Tomminator"/>
+        <contributor nick="WildX" name="William Pine" mailid="wildx" mailserver="evolonline.org"/>
+        <contributor nick="Wushin" mailid="pasekei" mailserver="gmail.com"/>
+    </tmw-revolt>
+    <!-- "Evol Online" developers & contributors -->
     <evol>
         <contributor nick="41444d494e" name="Andrei Karas" mailid="4144" mailserver="evolonline.org"/>
         <contributor nick="Ablu" name="Erik Schilling" mailid="ablu.erikschilling" mailserver="googlemail.com"/>
@@ -32,9 +57,9 @@ http://wiki.themanaworld.org/index.php/Contributors
         <contributor nick="Crush" name="Philipp Sehmisch" mailid="tmw" mailserver="crushnet.org"/>
         <contributor nick="Dariunas" name="Aasif Chaudry" mailid="aasif.chaudry" mailserver="infectedmusicdesigns.co.uk"/>
         <contributor nick="Dark_Mage"/>
-        <contributor nick="DerLoisl" name="Max Isele" mailid="der.loisl" mailserver="theavoraproject.org"/>
+        <contributor nick="Der Loisl" name="Max Isele" mailid="der.loisl" mailserver="theavoraproject.org"/>
         <contributor nick="Derpella"/>
-        <contributor nick="EJlol"/>
+        <contributor nick="EJlol" name="Oscar Klein Heerenbrink"/>
         <contributor nick="Elvano" name="Elvano Miok" mailid="elvano" mailserver="evolonline.org"/>
         <contributor nick="Enchilado" name="W E Sayers"/>
         <contributor nick="Eric" name="Eric Matyas" mailid="ematyas" mailserver="aol.com"/>
@@ -44,10 +69,10 @@ http://wiki.themanaworld.org/index.php/Contributors
         <contributor nick="FotherJ" name="Jarrett Thomas-Huxley"/>
         <contributor nick="gumi"/>
         <contributor nick="Hal9000" name="Francesco Miglietta" mailid="francesco.miglietta" mailserver="evolonline.org"/>
-        <contributor nick="Irukard" name="Krzysztof Daszuta"/>
+        <contributor nick="Irukard" name="Krzysztof Daszuta" mailid="irukard" mailserver="gmail.com"/>
         <contributor nick="IvanMorve" name="Martin"/>
-        <contributor nick="Jak1" name="Mike Wollmann" mailid="jak89_1" mailserver="ftb4u.de"/>
-        <contributor nick="jesusalva" name="Jonatas L. Nogueira" mailid="cpntb1" mailserver="ymail.com"/>
+        <contributor nick="jak1" name="Mike Wollmann" mailid="jak1" mailserver="germantmw.de"/>
+        <contributor nick="Jesusalva" name="Jonatas L. Nogueira" mailid="cpntb1" mailserver="ymail.com"/>
         <contributor nick="KaTSuo" name="Gremly" mailid="tlz.katsuo" mailserver="gmail.com"/>
         <contributor nick="Kenny690" name="Saidullin Il'shat" mailid="bio_editor" mailserver="mail.ru"/>
         <contributor nick="Kestrel"/>
@@ -71,28 +96,30 @@ http://wiki.themanaworld.org/index.php/Contributors
         <contributor nick="Nard" name="Bernard Hugonnet" mailid="bernard.hugonnet" mailserver="bh28.net"/>
         <contributor nick="Necromonger" name="Mihail Barer"/>
         <contributor nick="Nelson6e65" name="Nelson Martell" mailid="nelson6e65-manaplus" mailserver="yahoo.es"/>
-        <contributor nick="omatt" mailid="m.vuoso" mailserver="@laposte.net"/>
+        <contributor nick="omatt" mailid="m.vuoso" mailserver="laposte.net"/>
         <contributor nick="Othello" name="Vincent Van Beveren" mailid="v.van.beveren" mailserver="nikhef.nl"/>
-        <contributor nick="Pajarico"/>
+        <contributor nick="Pajarico" name="Pajarico Guaje"/>
         <contributor nick="Pihro" name="Garett Smith" mailid="theonewhoplayswithfire" mailserver="gmail.com"/>
         <contributor nick="Piman"/>
         <contributor nick="Pitriss" name="Petr Varkoček"/>
         <contributor nick="Posydonia" name="Mélanie Dinot"/>
-        <contributor nick="Qwerty Dragon"/>
         <contributor nick="Reid" mailid="reid" mailserver="evolonline.org"/>
         <contributor nick="Saci"/>
-        <contributor nick="Saphy"/>
         <contributor nick="Salius" name="Aleksey S."/>
+        <contributor nick="Saphy"/>
         <contributor nick="saturn" name="Nikola Whallon" mailid="6.saturn.6" mailserver="gmail.com"/>
         <contributor nick="Saweres" mailid="onshine20" mailserver="gmail.com"/>
         <contributor nick="Sir_lance"/>
         <contributor nick="Socapex" name="Philippe Groarke" mailid="socapex" mailserver="evolonline.org"/>
+        <contributor nick="SudoPlatypus"/>
         <contributor nick="Talaroc" name="Ryan Voss" mailid="arashi86" mailserver="gmail.com"/>
         <contributor nick="Taree"/>
         <contributor nick="Tayoko"/>
         <contributor nick="Teru"/>
+        <contributor nick="Tezer431"/>
         <contributor nick="Tirifto"/>
-        <contributor nick="Vasily Makarov" name="Dan Sagunov" mailid="vasily" mailserver="evolonline.org"/>
+        <contributor nick="Tomminator"/>
+        <contributor nick="Vasily Makarov" name="Danil Sagunov" mailid="vasily" mailserver="evolonline.org"/>
         <contributor nick="VxD" mailid="vxd.michael" mailserver="gmail.com"/>
         <contributor nick="WildX" name="William Pine" mailid="wildx" mailserver="evolonline.org"/>
         <contributor nick="Wushin" mailid="pasekei" mailserver="gmail.com"/>
@@ -101,16 +128,146 @@ http://wiki.themanaworld.org/index.php/Contributors
     </evol>
     <!-- "The Mana World: Legacy" contributors -->
     <tmw-legacy>
-        <contributor nick="Chicka-Maria" mailid="comfycheeks" mailserver="themanaworld.org"/>
-        <contributor nick="Crush" name="Philipp Sehmisch" mailid="tmw" mailserver="crushnet.org"/>
-        <contributor nick="Enchilado" name="W E Sayers"/>
-        <contributor nick="gumi"/>
-        <contributor nick="Len" name="Leonard Pabin III"/>
-        <contributor nick="Saphy"/>
-        <contributor nick="Varuna"/>
-        <contributor nick="Wombat" mailid="hpwombat" mailserver="yahoo.com" page="https://github.com/wombatism"/>
-        <contributor nick="Wushin" mailid="pasekei" mailserver="gmail.com"/>
-        <contributor nick="Yosuhara"/>
+      <contributor nick="41444d494e" name="Andrei Karas" mailid="4144" mailserver="evolonline.org"/>
+      <contributor nick="Ablu" name="Erik Schilling" mailid="ablu.erikschilling" mailserver="gmail.com"/>
+      <contributor nick="AL13N" name="Maarten Vanraes" mailid="alien" mailserver="rmail.be"/>
+      <contributor nick="Alastrim" name="Antônio" mailid="alasmirt" mailserver="gmail.com"/>
+      <contributor nick="Alige" mailid="alige" mailserver="evolonline.org"/>
+      <contributor nick="AlOns"/>
+      <contributor nick="Argul" name="Stefan Beller"/>
+      <contributor nick="Arikel"/>
+      <contributor nick="Avaniel" name="Rogier Polak"/>
+      <contributor nick="Bagzie"/>
+      <contributor nick="Bear"/>
+      <contributor nick="Bernhardt" name="Chay"/>
+      <contributor nick="Bertram" name="Yohann Ferreira"/>
+      <contributor nick="Big Crunch"/>
+      <contributor nick="CapitanAwesome"/>
+      <contributor nick="Cassy" name="Cassandra"/>
+      <contributor nick="Catfish_Man"/>
+      <contributor nick="ChefChelios"/>
+      <contributor nick="Chetic" name="Fredrik Reveny" mailid="chetic" mailserver="gmail.com"/>
+      <contributor nick="Chicka-Maria" mailid="comfycheeks" mailserver="themanaworld.org"/>
+      <contributor nick="Clef"/>
+      <contributor nick="Coolkid782" mailid="coolkid782" mailserver="evolonline.org"/>
+      <contributor nick="Crush" name="Philipp Sehmisch" mailid="tmw" mailserver="crushnet.org"/>
+      <contributor nick="Dabe" name="David Del Re"/>
+      <contributor nick="Delasia"/>
+      <contributor nick="Demon"/>
+      <contributor nick="Der Loisl" name="Max Isele" mailid="der.loisl" mailserver="theavoraproject.org"/>
+      <contributor nick="deviexx"/>
+      <contributor nick="dobey" name="Rodney Dawes"/>
+      <contributor nick="doorsman"/>
+      <contributor nick="Ejlol" name="Oscar Klein Heerenbrink"/>
+      <contributor nick="ElvenProgammer" name="Eugenio Favalli" mailid="elvenprogrammer" mailserver="gmail.com"/>
+      <contributor nick="Enchilado" name="W E Sayers"/>
+      <contributor nick="FotherJ" name="Jarrett Thomas-Huxley"/>
+      <contributor nick="Freeyorp"/>
+      <contributor nick="Frost"/>
+      <contributor nick="Gnulia"/>
+      <contributor nick="Golgo"/>
+      <contributor nick="GonzoDark" name="Leif Kildelund"/>
+      <contributor nick="gumi"/>
+      <contributor nick="Hello=)"/>
+      <contributor nick="Hocus Pocus Fidibus" mailid="kurt.kuschinski" mailserver="gmail.com"/>
+      <contributor nick="I"/>
+      <contributor nick="imorgado" name="Igor Morgado"/>
+      <contributor nick="IvanMorve" name="Martin"/>
+      <contributor nick="jak1" name="Mike Wollmann" mailid="jak1" mailserver="germantmw.de"/>
+      <contributor nick="Javila" name="José Ávila"/>
+      <contributor nick="jaxed0127" name="Jared Adams"/>
+      <contributor nick="Jenalia"/>
+      <contributor nick="Jesusalva" name="Jonatas L. Nogueira" mailid="cpntb1" mailserver="ymail.com"/>
+      <contributor nick="JoshLangley" name="Joshua Langley"/>
+      <contributor nick="Kage" name="Chuck Miller" mailid="shadowmil" mailserver="gmail.com"/>
+      <contributor nick="Katze"/>
+      <contributor nick="kindjal" name="Huynh Ngoc Chau Tran"/>
+      <contributor nick="Kineticstorm"/>
+      <contributor nick="kth5/Shura" name="Alexander Baldeck"/>
+      <contributor nick="Kyokai" name="Kiyoshi Kyokai"/>
+      <contributor nick="kytty"/>
+      <contributor nick="Ledmitz" mailid="ledmitz" mailserver="gmail.com"/>
+      <contributor nick="Len" name="Leonard Pabin III"/>
+      <contributor nick="Livio" name="Livio Recchia"/>
+      <contributor nick="Lizandra" name="Filipa Serra e Silva"/>
+      <contributor nick="maci" name="Marcel W. Wysocki"/>
+      <contributor nick="MadCamel"/>
+      <contributor nick="Maester Pixel"/>
+      <contributor nick="Magick" name="Jordan" mailid="admin_magick" mailserver="hotmail.com"/>
+      <contributor nick="MasterKenobi"/>
+      <contributor nick="Meko"/>
+      <contributor nick="meway" name="Andrew Hall"/>
+      <contributor nick="Micksha" name="Mick" mailid="ms-shaman" mailserver="gmx.de"/>
+      <contributor nick="Mkael"/>
+      <contributor nick="Modanung" name="Frode Lindeijer"/>
+      <contributor nick="moi1392" name="Cedric Borgese" mailid="cedric.borgese" mailserver="gmail.com"/>
+      <contributor nick="monwarez" name="Thibault Payet" mailid="monwarez" mailserver="mailoo.org" page="https://gitlab.com/u/monwarez"/>
+      <contributor nick="Mra" name="Jan-Fabian Humann" mailid="malastare" mailserver="gmx.net"/>
+      <contributor nick="mrgrey"/>
+      <contributor nick="Nard" name="Bernard Hugonnet" mailid="bernard.hugonnet" mailserver="bh28.net"/>
+      <contributor nick="Narus" mailid="narus.tmw" mailserver="gmail.com"/>
+      <contributor nick="Necromonger" name="Mihail Barer"/>
+      <contributor nick="Neko-mon"/>
+      <contributor nick="Neorice"/>
+      <contributor nick="nym"/>
+      <contributor nick="o11c"/>
+      <contributor nick="omatt" mailid="m.vuoso" mailserver="laposte.net"/>
+      <contributor nick="Pajarico" name="Pajarico Guaje"/>
+      <contributor nick="Pauan"/>
+      <contributor nick="peavey" name="Dennis Friis" mailid="peavey" mailserver="placid.dk"/>
+      <contributor nick="Pihro" name="Garett Smith" mailid="theonewhoplayswithfire" mailserver="gmail.com"/>
+      <contributor nick="Platyna" name="Zuzanna Karolina Filutowska"/>
+      <contributor nick="Pluto" name="Arian Asimi"/>
+      <contributor nick="Prsm"/>
+      <contributor nick="Purple" name="Thorbjørn Lindeijer" mailid="thorbjorn" mailserver="lindeijer.nl"/>
+      <contributor nick="Pyndragon" name="Daniel Foerster"/>
+      <contributor nick="Qoal" name="Scott Ellis" mailid="quiche_on_a_leash" mailserver="hotmail.co.uk"/>
+      <contributor nick="Qwerty Dragon"/>
+      <contributor nick="razor85" name="Romulo Fernandes"/>
+      <contributor nick="Reid" mailid="reid" mailserver="evolonline.org"/>
+      <contributor nick="Rotonen" name="Joni Orponen"/>
+      <contributor nick="salmondine" name="Mark Dunbar"/>
+      <contributor nick="Silene" name="Guillaume Melquiond"/>
+      <contributor nick="Silent Dawn"/>
+      <contributor nick="simonedw" name="Simon Edwardsson" mailid="simon" mailserver="crossnet.se"/>
+      <contributor nick="Skipy"/>
+      <contributor nick="Sora"/>
+      <contributor nick="SudoPlatipus"/>
+      <contributor nick="Sull" name="Jean-Francois Lampron" mailid="sull.kf" mailserver="gmail.com"/>
+      <contributor nick="Superkoop" name="John Koopman"/>
+      <contributor nick="Swimmy"/>
+      <contributor nick="Talaroc" name="Ryan Voss" mailid="arashi86" mailserver="gmail.com"/>
+      <contributor nick="Tametomo" name="Ira Rice" mailid="irarice" mailserver="gmail.com"/>
+      <contributor nick="Tatjana"/>
+      <contributor nick="Tezer431"/>
+      <contributor nick="Ti Sing Hao"/>
+      <contributor nick="Tiana"/>
+      <contributor nick="Tirifto"/>
+      <contributor nick="Tomminator"/>
+      <contributor nick="Turmfalke"/>
+      <contributor nick="tux9th"/>
+      <contributor nick="Ultramichy"/>
+      <contributor nick="Usiu" name="Mateusz Kaduk"/>
+      <contributor nick="V0id" name="Vincent Petithory"/>
+      <contributor nick="Varuna"/>
+      <contributor nick="Vasily Makarov" name="Danil Sagunov" mailid="vasily" mailserver="evolonline.org"/>
+      <contributor nick="veryapeGM"/>
+      <contributor nick="VictorSan"/>
+      <contributor nick="Vink"/>
+      <contributor nick="Vlady"/>
+      <contributor nick="WildX" name="William Pine" mailid="wildx" mailserver="evolonline.org"/>
+      <contributor nick="Wombat" mailid="hpwombat" mailserver="yahoo.com" page="https://github.com/wombatism"/>
+      <contributor nick="Wushin" mailid="pasekei" mailserver="gmail.com"/>
+      <contributor nick="zenogais" name="Eric Scrivner"/>
+      <contributor nick="Zipon"/>
+      <contributor nick="(unknown)" name="Aaron Marks"/>
+      <contributor nick="(unknown)" name="Andrej Sinicyn"/>
+      <contributor nick="(unknown)" name="Douglas Boffey"/>
+      <contributor nick="(unknown)" name="Duane Bailey"/>
+      <contributor nick="(unknown)" name="Johannelaliberte"/>
+      <contributor nick="(unknown)" name="Kess Vargavind" mailid="vargavind" mailserver="gmail.com"/>
+      <contributor nick="(unknown)" name="Lloyd Bryant" mailid="lloyd_bryant" mailserver="netzero.net"/>
+      <contributor nick="(unknown)" name="Matthias Hartmann" mailid="hartmann.matthias" mailserver="gmail.com"/>
     </tmw-legacy>
     <!-- "TMW-UFB" Contributors -->
     <tmw-ufb>
@@ -133,9 +290,12 @@ http://wiki.themanaworld.org/index.php/Contributors
     </freesound>
     <!-- Related Communities -->
     <other>
+        <community name="Crew of Red Corsair" site="http://crc.themanaworld.org/"/>
+        <community name="Moubotaur Legends" site="https://moubootaurlegends.org/"/>
         <community name="OpenGameArt" site="http://opengameart.org"/>
+        <community name="Software in the Public Interest" site="https://www.spi-inc.org/"/>
         <community name="TheManaWorld-Br" site="http://tmw-br.scall.org"/>
+        <community name="Tiled Map Editor" site="https://www.mapeditor.org/"/>
         <community name="TuxFamily" site="http://tuxfamily.org"/>
-        <community name="Crew of Red Corsair" site="http://crc.themanaworld.org/"/>
     </other>
 </contributors>
diff --git a/contrib_xsl/wiki.xsl b/contrib_xsl/wiki.xsl
index 24b063e..cace538 100644
--- a/contrib_xsl/wiki.xsl
+++ b/contrib_xsl/wiki.xsl
@@ -12,6 +12,12 @@ Copyright (C) 2016 Evol Online -->
         <xsl:apply-templates/>
     </xsl:template>
 
+    <xsl:template match="tmw-revolt">
+        <xsl:text>^	rEvolt Contributors	^^&#xa;</xsl:text>
+        <xsl:text>^	Nickname	^	Real Name / Email	^	Link	^&#xa;</xsl:text>
+        <xsl:apply-templates/>
+    </xsl:template>
+
     <xsl:template match="evol">
         <xsl:text>^	Evol Online Contributors	^^&#xa;</xsl:text>
         <xsl:text>^	Nickname	^	Real Name / Email	^	Link	^&#xa;</xsl:text>