diff --git a/CHANGELOG b/CHANGELOG index c940d1f3..63b43cb4 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,13 @@ version 3.0.3 New ponies: auntorange, caballeron, cocopommel, coloratura, coriander, - ember, flurryheart, fluttershybat, fluttershybathang, - goldiedelicious, grace, kevin, kingthorax, lovemelody, - moondancer, rara, saffron, starlightglimmer, - stellareclipse, stormyflare, sunburst, sunburstcape, - svengallop, thesmooze, thorax, tirek, treehugger, - troubleshoes, twilightbreezie, whoanelly, zephyrbreeze, - zipporwhill, zipporwhillsfather + doublediamond, ember, flurryheart, fluttershybat, + fluttershybathang, goldiedelicious, grace, kevin, + kingthorax, lovemelody, moondancer, rara, saffron, + starlightglimmer, stellareclipse, stormyflare, sunburst, + sunburstcape, svengallop, thesmooze, thorax, tirek, + treehugger, troubleshoes, twilightbreezie, whoanelly, + zephyrbreeze, zipporwhill, zipporwhillsfather New extraponies: cocoachill, riverbeauty, velvetremedy diff --git a/dev/history-list b/dev/history-list index 259a15af..8f532ed8 100755 --- a/dev/history-list +++ b/dev/history-list @@ -148,7 +148,7 @@ S06E24 Top Bolt S06E25 To Where and Back Again [Part 1] S06E26 To Where and Back Again [Part 2] -S07E01 CCelestial Advice +S07E01 Celestial Advice S02E02 All Bottled Up S07E03 A Flurry of Emotions S07E04 Rock Solid Friendship @@ -164,22 +164,26 @@ S07E13 The Perfect Pear S07E14 Fame and Misfortune S07E15 Triple Threat S07E16 Campfire Tales -S07E17 +S07E17 To Change a Changeling S07E18 A Health of Information S07E19 To Change a Changeling S07E20 It Isn't the Mane Thing About You S07E21 Once Upon a Zeppelin S07E22 Marks and Recreation S07E23 Secrets and Pies -S07E24 -S07E25 -S07E26 +S07E24 Uncommond Bond +S07E25 Shadow Play [Part 1] +S07E26 Shadow Play [Part 2] + +S08E01 +S08E02 [Movies with scenes with ponies from G4 there count here] My Little Pony: Equestria Girls My Little Pony Equestria Girls: Rainbow Rocks *not the other, these two just directly jump to the otherworld* + [Official Comic here] My Little Pony: (Arc 1) [Issues 1 - 4] Return of Queen Chrysalis My Little Pony: (Arc 2) [Issues 5 - 8] Nightmare Rarity diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 43cee0fa..c0923256 100755 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -3414,7 +3414,7 @@ ANSI escape sequences. @itemize @bullet @item New ponies: @file{auntorange}, @file{caballeron}, @file{cocopommel}, @file{coloratura}, -@file{coriander}, @file{ember}, @file{flurryheart}, @file{fluttershybat}, +@file{coriander}, @file{doublediamond}, @file{ember}, @file{flurryheart}, @file{fluttershybat}, @file{fluttershybathang}, @file{goldiedelicious}, @file{grace}, @file{kevin}, @file{kingthorax}, @file{lovemelody}, @file{moondancer}, @file{rara}, @file{saffron}, @file{starlightglimmer}, @file{stellareclipse}, @file{stormyflare}, diff --git a/ponies/applejack.pony b/ponies/applejack.pony index a62a8d9d..9d012436 100755 --- a/ponies/applejack.pony +++ b/ponies/applejack.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Friendship is Magic [Part 1] BALLOON: top -BALLOON TOP: 0 BALLOON BOTTOM: 0 +BALLOON TOP: 0 BASED ON: Generation 1 Apple Jack COAT: brown DISPLAY: full, left @@ -14,10 +14,10 @@ LINK: regular MANE: yellow NAME: Applejack OTHER NAMES: AJ (official, short) -POSE: stapm +POSE: stamp SOURCE: (Jay Wright, RJP!, Pony Noi, Bot-chan, StarStep, Anonycat) Desktop ponies WIDTH: 52 -HEIGHT: 27 +HEIGHT: 26 $$$ $balloon15$ diff --git a/ponies/doublediamond.pony b/ponies/doublediamond.pony new file mode 100644 index 00000000..3aac7129 --- /dev/null +++ b/ponies/doublediamond.pony @@ -0,0 +1,47 @@ +$$$ +APPEARANCE: S05E01 The Cutie Map [Part 1] +BALLOON: top +BALLOON BOTTOM: 0 +BALLOON TOP: 2 +COAT: white +DISPLAY: full, left +EYE: blue +FREE: no +GROUP: stallion +KIND: earth +LINK: regular +MANE: white +NAME: Double Diamond +POSE: stand +SOURCE: (Beot chan) Desktop ponies +WIDTH: 43 +HEIGHT: 27 + +$$$ +$balloon5$ + $\$  + $\$  + $\$  + $\$ ▄▄▄▄ ▀▄▄  + ▄▄▄█▄▄▄▄▄█▄▄▄  + ██▄█▄▄▄▄▄▄▄████  + ▄▄▄▄▄███████▄▄██▄██  + ▄▄▄▄▄▄▄█▄▄█▄█▄▄█▄██  + ▀▀█▄▄▄▄▄█▄▄▄████▄█  + █████▄▄█████▄▄█ ▄▄▄  + ▄▄█████▄▄█▄▄█▄██▄▄▄ ▄▄▄█▄▄█▀  + ▀▄█▄████████▄▄▄▄▀▀ ▄▄▄▄▄▄██▄▄▄▄  + ▀▄▄▄▄▄▄▄▄██▄▄ ▄▄▄▄▄▄▄▄█▄▄▄▄█  + ██████▄▄▄▄▄▄▄▄▄▄▄▄▄▀▀▄███▄▄▄▄█ + ████████████▄▄████ ██▄█████ + ██████████▄▄█▄▄██ █▄▀█████ + ▀▄███████▄█▄█████ ▀ ███  + ▄▄██████▄▄█████ █▀  + ██████▀▀▄▄█▄███▄▄  + ██████ ██▄▄████  + ███████ ███████▄▄  + ▄▄██████ █████████  + █▄███████ ████████▄▄  + ▀▄▄████▄▀ ▀▀▀███████  + ▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀  +  diff --git a/ponyquotes/doublediamond.0 b/ponyquotes/doublediamond.0 new file mode 100644 index 00000000..be0c3576 --- /dev/null +++ b/ponyquotes/doublediamond.0 @@ -0,0 +1 @@ +You said cutie marks were evil! You said special talents led to pain and heartache! diff --git a/ponyquotes/doublediamond.1 b/ponyquotes/doublediamond.1 new file mode 100644 index 00000000..12c83402 --- /dev/null +++ b/ponyquotes/doublediamond.1 @@ -0,0 +1 @@ +Trouble? Why, I don't think we've ever had trouble in our little village. diff --git a/ponyquotes/doublediamond.2 b/ponyquotes/doublediamond.2 new file mode 100644 index 00000000..e475c6fa --- /dev/null +++ b/ponyquotes/doublediamond.2 @@ -0,0 +1 @@ +This is a chance for all of us to get to know each other again for the very first time! diff --git a/ponyquotes/ponies b/ponyquotes/ponies index 7773bcd7..86bbb978 100755 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -71,6 +71,7 @@ diamondtiara dinky discord+discordpuppetmaster+discordamused doctor+doctornohat+timeturner+drhooves +doublediamond elsie+prettyvision ember fancypants diff --git a/ttyponies/applejack.pony b/ttyponies/applejack.pony index 91dfb674..f769f4bc 100755 --- a/ttyponies/applejack.pony +++ b/ttyponies/applejack.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Friendship is Magic [Part 1] BALLOON: top -BALLOON TOP: 0 BALLOON BOTTOM: 0 +BALLOON TOP: 0 BASED ON: Generation 1 Apple Jack COAT: brown DISPLAY: full, left @@ -14,10 +14,10 @@ LINK: regular MANE: yellow NAME: Applejack OTHER NAMES: AJ (official, short) -POSE: stapm +POSE: stamp SOURCE: (Jay Wright, RJP!, Pony Noi, Bot-chan, StarStep, Anonycat) Desktop ponies WIDTH: 52 -HEIGHT: 27 +HEIGHT: 26 $$$ $balloon15$ diff --git a/ttyponies/doublediamond.pony b/ttyponies/doublediamond.pony new file mode 100644 index 00000000..ea19f1ad --- /dev/null +++ b/ttyponies/doublediamond.pony @@ -0,0 +1,48 @@ +$$$ +APPEARANCE: S05E01 The Cutie Map [Part 1] +BALLOON: top +BALLOON BOTTOM: 0 +BALLOON TOP: 2 +COAT: white +DISPLAY: full, left +EYE: blue +FREE: no +GROUP: stallion +KIND: earth +LINK: regular +MANE: white +NAME: Double Diamond +POSE: stand +SOURCE: (Beot chan) Desktop ponies +WIDTH: 43 +HEIGHT: 27 + +$$$ +$balloon5$ + $\$  + $\$  + $\$  + $\$ ]PFBCBCBC▄▄▄▄]P7AAAAAA ]PFBCBCBC▀▄▄]P7AAAAAA  + ]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄▄]P7FFFFFF█]PFD0D0D0▄▄▄]P7BCBCBC▄]PFFFFFFF▄]P7FFFFFF█]PFD0D0D0▄]P7BCBCBC▄]P0000000▄]P7AAAAAA  + ]P7BCBCBC]PFBCBCBC█]P7FFFFFF]PFFFFFFF█]PFD0D0D0▄]P7D0D0D0█]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄▄]P7D0D0D0]PFFFFFFF▄▄▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0█]P7FFFFFF]PFFFFFFF██]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]PFBCBCBC▄▄]P7BCBCBC]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]PFD0D0D0█]P7FFFFFF]PFFFFFFF█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF████]PFD0D0D0▄▄]P7D0D0D0█]P7FFFFFF]PFFFFFFF█]PFD0D0D0▄]PFFFFFFF█]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄▄]P7D0D0D0▄]PFBCBCBC▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF█]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄]PFBCBCBC█]PFFFFFFF▄]P7FFFFFF█]PFBCBCBC▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF█]P7D0D0D0▄]P7FFFFFF█]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]PFBCBCBC▀▀]P7BCBCBC█]P7FFFFFF▄▄]P7BCBCBC]PFFFFFFF▄▄]P7FFFFFF]P8000000▄]P7BCBCBC]PFBCBCBC█]P7FFFFFF▄]P7BCBCBC]PFFFFFFF▄]P8000000▄]P7FFFFFF]PFFFFFFF████]PFD0D0D0▄]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA  + ]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF███]P0000000]P8000000█]P7FFFFFF▄]P75F87D7]PF87AFFF▄]P7FFFFFF]PFFFFFFF██]P0000000]P8000000█]P7FFFFFF]PFFFFFFF██]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄]PFBCBCBC█]P0000000]P7AAAAAA ]PFBCBCBC▄▄▄]P7AAAAAA  + ]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF█████]P0000000]PFAFD7FF▄]P7AFD7FF]PFFFFFFF▄]P7FFFFFF█]P8000000▄]P0000000]PFFFFFFF▄]P7BCBCBC]PFBCBCBC█]PFFFFFFF▄]P7FFFFFF█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFBCBCBC▄]P0000000]PFFFFFFF▄]PFBCBCBC▄]P7AAAAAA ]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄▄]P7FFFFFF█]PFBCBCBC▄▄]P7BCBCBC█]P0000000▀]P7AAAAAA  + ]PFD0D0D0▀]P7FFFFFF▄]PFFFFFFF█]PFD0D0D0▄]PFFFFFFF████████]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄]P7D0D0D0▄]P7FFFFFF]PFBCBCBC▄]P0000000▀▀]P7AAAAAA ]PFBCBCBC▄]P7BCBCBC]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄▄]P7D0D0D0]PFFFFFFF▄▄]PFD0D0D0██]P7FFFFFF▄]P7BCBCBC▄]PFFFFFFF▄]P0000000]PFBCBCBC▄]P7AAAAAA  + ]PFD0D0D0▀]P7FFFFFF▄▄▄▄▄▄▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF██]P7BCBCBC▄]PFD0D0D0▄]P0000000]P7AAAAAA ]PFBCBCBC▄]P7BCBCBC]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄▄]P7D0D0D0]PFFFFFFF▄▄]P7FFFFFF]PFD0D0D0▄]PFFFFFFF█]P7D0D0D0▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA  + ]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█████]P7D0D0D0▄]P0000000]PFD0D0D0▄▄▄▄]P7D0D0D0]PFFFFFFF▄▄▄▄▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF]PFBCBCBC▄]P0000000▀▀]P7FFFFFF▄]PFFFFFFF█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█]P7D0D0D0▄]P7FFFFFF]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF]PFD0D0D0▄]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA + ]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF███████████]P787AFD7]PFAFD7FF▄]P7AFD7FF]PF87AFD7▄]P7FFFFFF]PFFFFFFF███]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7FFFFFF]PFFFFFFF█]P7D0D0D0]PFBCBCBC▄]P7FFFFFF]PFFFFFFF█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█]P7D0D0D0]PFD0D0D0█]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA + ]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█████████]PF87AFD7▄]PFAFD7FF▄]PFFFFFFF█]P7AFD7FF]PF87AFD7▄]P787AFD7]PFFFFFFF▄]P7FFFFFF█]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7FFFFFF▄]P0000000▀]P7BCBCBC█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF██]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA + ]PFD0D0D0▀]P7FFFFFF▄]PFFFFFFF███████]PFD0D0D0▄]PFFFFFFF█]P787AFD7▄]P7FFFFFF████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]PFBCBCBC▀]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7FFFFFF]PFFFFFFF█]P7BCBCBC]PFBCBCBC█]P0000000]P7AAAAAA  + ]P7D0D0D0]PFBCBCBC▄]P7FFFFFF]PFD0D0D0▄]PFFFFFFF██████]P7D0D0D0▄]P7FFFFFF]PFD0D0D0▄]PFFFFFFF████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P0000000▀]P7AAAAAA  + ]P7BCBCBC]PFBCBCBC█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF███]P7D0D0D0]PFD0D0D0█]P0000000▀▀]P7D0D0D0]PFBCBCBC▄]PFE4E4E4▄]PFD0D0D0█]P7FFFFFF▄]PFFFFFFF███]P7D0D0D0▄]P0000000]PFD0D0D0▄]P7AAAAAA  + ]P7BCBCBC]PFBCBCBC█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF███]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7E4E4E4]PFE4E4E4█]P7D0D0D0▄]P7FFFFFF]PFD0D0D0▄]PFFFFFFF███]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]P7BCBCBC]PFBCBCBC█]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7E4E4E4]PFE4E4E4██]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF███]P7D0D0D0▄]P0000000]PFD0D0D0▄]P7AAAAAA  + ]PFBCBCBC▄]P7BCBCBC]PFE4E4E4▄]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7E4E4E4]PFE4E4E4██]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]P7BCBCBC]PFBCBCBC█]PFE4E4E4▄]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA ]P7BCBCBC]PFBCBCBC█]P7E4E4E4]PFE4E4E4██]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF████]P7D0D0D0▄]P0000000]PFD0D0D0▄]P7AAAAAA  + ]PFBCBCBC▀]P7BCBCBC]PFD0D0D0▄]P7D0D0D0]PFFFFFFF▄]P7FFFFFF████]PFD0D0D0▄]P0000000▀]P7AAAAAA ]PFBCBCBC▀▀▀]P7D0D0D0]PFD0D0D0█]P7FFFFFF]PFFFFFFF█████]P7D0D0D0]PFD0D0D0█]P0000000]P7AAAAAA  + ]PFD0D0D0▀▀▀▀▀▀▀]P7AAAAAA ]PFD0D0D0▀▀▀▀▀▀▀]P7AAAAAA  +  +]P0000000]P1800000]P2008000]P3808000]P4000080]P5800080]P6008080]P7C0C0C0]P8808080]P9FF0000]PA00FF00]PBFFFF00]PC0000FF]PDFF00FF]PE00FFFF]PFFFFFFF \ No newline at end of file