Merge branch 'develop' of github.com:erkin/ponysay into develop

This commit is contained in:
Mattias Andrée 2013-03-12 22:59:14 +01:00
commit 629d8de0ed
5 changed files with 50 additions and 7 deletions

View file

@ -2,9 +2,9 @@ Version 3.0
New ponies: applesplit, amira, babseed, bear, beautybrass, bigmacsleep, billneigh, cadancecrystal, cloudchaser,
descent, featherweight, fiddlesticks, flitter, gingersnap, haakim, hayseed, lighningdust, jubileena,
midnightstrike, mrbreezy, orangebird, orangefrog, pinkiecrazyface, poundcake, raccoon, rarityelite,
ravenearth, ravenunicorn, royalunicornguard, rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel,
sweetcream (comic), trixieamulet, twilacorn, twilightcrystal, twilightfly, twilightprincess,
midnightstrike, mrbreezy, orangebird, orangefrog, pinkiecrazyface, poundcake, princesserroria, raccoon,
rarityelite, ravenearth, ravenunicorn, royalunicornguard, rumble, shiningarmorcrystal, sombra, spikecrystal,
squirrel, sweetcream (comic), trixieamulet, twilacorn, twilightcrystal, twilightfly, twilightprincess,
twilightwings, twinkleshine
New extraponies: donutpony, gleamingshield, johndelancie, jristz, maandree, orion, pipsqueak (without pirate suit),

View file

@ -455,6 +455,7 @@ Upper Crust http://images2.wikia.nocookie.net/__cb20111216012939/mlp/images/2/2
Vance Van Vendington http://images4.wikia.nocookie.net/__cb20111216012954/mlp/images/a/a8/Kristoph_Gavin.png
Written Script http://images2.wikia.nocookie.net/__cb20111127145431/mlp/images/thumb/4/41/Written_Script.png/150px-Written_Script.png
Alula http://mlp.wikia.com/wiki/Alula
Princess Erroria
Apple Bytes http://images2.wikia.nocookie.net/__cb20120229172615/mlp/images/thumb/b/bb/S02E17_UEF1.png/150px-S02E17_UEF1.png
Archer
Atlas http://images1.wikia.nocookie.net/__cb20120125024638/mlp/images/3/3c/Unnamed_porter_unicorn_S2E9.png

View file

@ -2922,10 +2922,10 @@ sequences.
New ponies: @file{applesplit}, @file{amira}, @file{babseed}, @file{bear}, @file{beautybrass}, @file{bigmacsleep},
@file{billneiigh}, @file{cadancecrystal}, @file{cloudchaser}, @file{descent}, @file{gingersnap}, @file{haakim}, @file{hayseed},
@file{jubileena}, @file{featherweight}, @file{fiddlesticks}, @file{flitter}, @file{lighningdust}, @file{midnightstrike},
@file{mrbreezy}, @file{orangebird}, @file{orangefrog}, @file{pinkiecrazyface}, @file{poundcake}, @file{raccoon}, @file{rarity},
@file{ravenearth}, @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra},
@file{spikecrystal}, @file{squirrel}, @file{sweetcream} (comic), @file{trixieamulet}, @file{twilacorn}, @file{twilightcrystal},
@file{twilightfly}, @file{twilightpricess}, @file{twilightwings}, @file{twinkleshine}
@file{mrbreezy}, @file{orangebird}, @file{orangefrog}, @file{pinkiecrazyface}, @file{princesserroria}, @file{poundcake},
@file{raccoon}, @file{rarity}, @file{ravenearth}, @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble},
@file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, @file{squirrel}, @file{sweetcream} (comic), @file{trixieamulet},
@file{twilacorn}, @file{twilightcrystal}, @file{twilightfly}, @file{twilightpricess}, @file{twilightwings}, @file{twinkleshine}
@item
New extraponies: @file{donutpony}, @file{gleamingshield}, @file{johndelancie}, @file{jristz}, @file{maandree}, @file{orion},
@file{pipsqueak}, @file{pardise}, @file{pizzapony}, @file{tempo}

View file

@ -0,0 +1,41 @@
$$$
APPEARANCE: S02E03 Lesson Zero
BALLOON: top
COAT: yellow
DISPLAY: full, left
EYE: blue
FREE: no
GROUP: filly
KIND: alicorn
LINK: regular
MANE: purple
NAME: (not mentioned)
OTHER NAMES: Princess Erroria (unofficial), Pluto (unifficial), Alula (unofficial)
POSE: stand
SOURCE: (DrSKlee) Desktop ponies OC
WIDTH: 38
HEIGHT: 21
$$$
$balloon9$
$\$
$\$
$\$
 
   
     
         
     
    
            
         
         
        
        
         
         
        
           
             
    

View file

@ -152,6 +152,7 @@ pokey+pokeypierce
ponet
poppycock
poundcake
princesserroria
purplehaze
raccoon
raggedy