From 1692b9e6b1ad57d25c9efc587658cf8323983505 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Reyes Date: Fri, 13 Dec 2013 13:28:03 -0300 Subject: [PATCH 1/2] update official names and hitorylist Signed-off-by: Pablo Lezaeta Reyes --- dev/history-list | 4 ++-- ponies/fiddlesticks.pony | 4 ++-- ponies/surprise.pony | 4 ++-- ponyquotes/ponies | 2 +- ttyponies/fiddlesticks.pony | 4 ++-- ttyponies/surprise.pony | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev/history-list b/dev/history-list index 8e972ad8..95c1bfc8 100644 --- a/dev/history-list +++ b/dev/history-list @@ -74,8 +74,8 @@ S04E04 Daring Don't S04E05 Fight to the Finish S04E06 Power Ponies S04E07 Bats! -S04E08 -S04E09 +S04E08 Rarity Takes Manehattan +S04E09 Pinkie Apple Pie S04E10 S04E11 S04E12 diff --git a/ponies/fiddlesticks.pony b/ponies/fiddlesticks.pony index e5221a82..8cfdab3f 100644 --- a/ponies/fiddlesticks.pony +++ b/ponies/fiddlesticks.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S02E04 Luna Eclipsed BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: creme DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Fiddlesticks (unofficial) +OTHER NAMES: Fiddlesticks (unofficial), Fiddly Faddle (official, on Trading card game) POSE: trot SOURCE: (vulcan539/james539) Desktop ponies WIDTH: 42 diff --git a/ponies/surprise.pony b/ponies/surprise.pony index c7b6287f..d526557c 100644 --- a/ponies/surprise.pony +++ b/ponies/surprise.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E03 The Ticket Master BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, left EYE: closed @@ -12,7 +12,7 @@ KIND: pegasus LINK: regular MANE: yellow NAME: (not mentioned) -OTHER NAMES: Surprise (unofficial), Fleetfoot (Gameloft game beta) +OTHER NAMES: Surprise (official, on Tradings card game), Fleetfoot (Gameloft game beta) POSE: stand SOURCE: [jristz] WIDTH: 37 diff --git a/ponyquotes/ponies b/ponyquotes/ponies index 06753b9e..07859d7c 100644 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -70,7 +70,7 @@ doctor+doctornohat+timeturner+drhooves elsie+prettyvision fancypants featherweight -fiddlesticks +fiddlesticks+fiddlyfaddle fido fillydash+fillydashfly filmreel diff --git a/ttyponies/fiddlesticks.pony b/ttyponies/fiddlesticks.pony index 36f27d9f..38c90945 100644 --- a/ttyponies/fiddlesticks.pony +++ b/ttyponies/fiddlesticks.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S02E04 Luna Eclipsed BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: creme DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Fiddlesticks (unofficial) +OTHER NAMES: Fiddlesticks (unofficial), Fiddly Faddle (official, on Trading card game) POSE: trot SOURCE: (vulcan539/james539) Desktop ponies WIDTH: 42 diff --git a/ttyponies/surprise.pony b/ttyponies/surprise.pony index 7a64314b..0ab16af7 100644 --- a/ttyponies/surprise.pony +++ b/ttyponies/surprise.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E03 The Ticket Master BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, left EYE: closed @@ -12,7 +12,7 @@ KIND: pegasus LINK: regular MANE: yellow NAME: (not mentioned) -OTHER NAMES: Surprise (unofficial), Fleetfoot (Gameloft game beta) +OTHER NAMES: Surprise (official, on Tradings card game), Fleetfoot (Gameloft game beta) POSE: stand SOURCE: [jristz] WIDTH: 37 From 3f2b436b4a7515281a5f41bb70bd494d1959a851 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Reyes Date: Sun, 15 Dec 2013 23:17:01 -0300 Subject: [PATCH 2/2] Added more extra official names Signed-off-by: Pablo Lezaeta Reyes --- ponies/airheart.pony | 4 ++-- ponies/hairytipper.pony | 2 +- ponies/horte.pony | 4 ++-- ponies/pokey.pony | 4 ++-- ponies/powderrouge.pony | 2 +- ponies/quickfix.pony | 4 ++-- ponies/ravenearth.pony | 4 ++-- ponies/redheart.pony | 4 ++-- ponies/screwloose.pony | 2 +- ttyponies/airheart.pony | 4 ++-- ttyponies/cadance.pony | 2 +- ttyponies/cadancecrystal.pony | 2 +- ttyponies/cadancescruffy.pony | 2 +- ttyponies/fillycadance.pony | 2 +- ttyponies/hairytipper.pony | 2 +- ttyponies/horte.pony | 4 ++-- ttyponies/pokey.pony | 4 ++-- ttyponies/powderrouge.pony | 2 +- ttyponies/quickfix.pony | 4 ++-- ttyponies/ravenearth.pony | 4 ++-- ttyponies/redheart.pony | 4 ++-- ttyponies/screwloose.pony | 2 +- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ponies/airheart.pony b/ponies/airheart.pony index 6fe349f4..44879d79 100644 --- a/ponies/airheart.pony +++ b/ponies/airheart.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E06 Boast Busters BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: pink DISPLAY: full, front EYE: cyan, closed @@ -12,7 +12,7 @@ KIND: pegasus LINK: regular MANE: brown NAME: (not mentioned) -OTHER NAMES: Airheart (unofficial) +OTHER NAMES: Airheart (unofficial), Jetstream (official, on Trading card) POSE: smile SOURCE: [jristz] WIDTH: 24 diff --git a/ponies/hairytipper.pony b/ponies/hairytipper.pony index ab61b17f..59bcd0a4 100644 --- a/ponies/hairytipper.pony +++ b/ponies/hairytipper.pony @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: brown NAME: (not mentioned) -OTHER NAMES: Hairy Tipper (unofficial), Dance Fever (official on Card game) +OTHER NAMES: Hairy Tipper (unofficial), Dance Fever (official on Trading card) POSE: stand SOURCE: [jristz], based on Desktop ponies WIDTH: 47 diff --git a/ponies/horte.pony b/ponies/horte.pony index d4e37b58..b578944e 100644 --- a/ponies/horte.pony +++ b/ponies/horte.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E03 The Ticket Master BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: beige DISPLAY: full, left EYE: closed, brown @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Horte Cuisine (unofficial) +OTHER NAMES: Horte Cuisine (unofficial), Savoir Fare (official on Trading card) POSE: stand SOURCE: (Anonycat) Desktop ponies WIDTH: 40 diff --git a/ponies/pokey.pony b/ponies/pokey.pony index 5eca7207..bc444219 100644 --- a/ponies/pokey.pony +++ b/ponies/pokey.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Friendship is Magic [Part 1] BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: blue DISPLAY: full, left EYE: yellow @@ -12,7 +12,7 @@ KIND: unicorn LINK: regular MANE: white NAME: (not mentioned) -OTHER NAMES: Pokey Pierce (unofficial), Perry Pierce (unofficial, same look) +OTHER NAMES: Pokey Pierce (unofficial), Perry Pierce (unofficial, same look), Pinprick (official on Trading card) POSE: stand SOURCE: (Anonycat) Desktop ponies WIDTH: 44 diff --git a/ponies/powderrouge.pony b/ponies/powderrouge.pony index 174dc674..6f94977d 100644 --- a/ponies/powderrouge.pony +++ b/ponies/powderrouge.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E20 Green isn't Your Color BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: beige DISPLAY: full, right EYE: closed, purple diff --git a/ponies/quickfix.pony b/ponies/quickfix.pony index 0ed31866..0b3a47ed 100644 --- a/ponies/quickfix.pony +++ b/ponies/quickfix.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Frienship is Magic [Part 1] BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: brown DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: unicorn LINK: regular MANE: yellow NAME: (not mentioned) -OTHER NAMES: Quickfix (unofficial), Epona (unofficial), Clockwork (unofficial) +OTHER NAMES: Quickfix (unofficial), Epona (unofficial), Clockwork (unofficial), Silver Spanner (official on Trading card) POSE: stand SOURCE: [jristz] WIDTH: 46 diff --git a/ponies/ravenearth.pony b/ponies/ravenearth.pony index a672d1b8..8c53da59 100644 --- a/ponies/ravenearth.pony +++ b/ponies/ravenearth.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S02E04 Luna Eclipsed BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, right EYE: gray @@ -13,7 +13,7 @@ LINK: regular MANE: black MASTER: raven NAME: (not mentioned) -OTHER NAMES: Raven (unofficial) +OTHER NAMES: Raven (official) POSE: demon SOURCE: [jristz], based on (Bot-chan) Desktop ponies WIDTH: 44 diff --git a/ponies/redheart.pony b/ponies/redheart.pony index fa789b1a..db3fdbe5 100644 --- a/ponies/redheart.pony +++ b/ponies/redheart.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E04 Applebuck Season BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: white (ponysay), pink (source) NAME: (not mentioned) -OTHER NAMES: Nurse Redheart (unofficial) +OTHER NAMES: Nurse Redheart (official) POSE: stand SOURCE: (Logan, StarStep) Desktop ponies WIDTH: 40 diff --git a/ponies/screwloose.pony b/ponies/screwloose.pony index cea0b6e8..81abf06e 100644 --- a/ponies/screwloose.pony +++ b/ponies/screwloose.pony @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Screw Loose (unofficial) +OTHER NAMES: Screw Loose (unofficial), Screwy (official on Trading card) POSE: smile SOURCE: (Bot-chsn) Desktop ponies, [jristz] until version 3.0.1 WIDTH: 49 diff --git a/ttyponies/airheart.pony b/ttyponies/airheart.pony index 84661cb6..2fc9181d 100644 --- a/ttyponies/airheart.pony +++ b/ttyponies/airheart.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E06 Boast Busters BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: pink DISPLAY: full, front EYE: cyan, closed @@ -12,7 +12,7 @@ KIND: pegasus LINK: regular MANE: brown NAME: (not mentioned) -OTHER NAMES: Airheart (unofficial) +OTHER NAMES: Airheart (unofficial), Jetstream (official, on Trading card) POSE: smile SOURCE: [jristz] WIDTH: 24 diff --git a/ttyponies/cadance.pony b/ttyponies/cadance.pony index 4eab56da..3228bb99 100644 --- a/ttyponies/cadance.pony +++ b/ttyponies/cadance.pony @@ -13,7 +13,7 @@ KIND: alicorn LINK: regular MANE: pastel NAME: Cadance -OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full named) +OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full name without title), Princess Mi Amore Cadenza (official, full name) POSE: stand SOURCE: [jristz] WIDTH: 55 diff --git a/ttyponies/cadancecrystal.pony b/ttyponies/cadancecrystal.pony index 55e9e067..033267be 100644 --- a/ttyponies/cadancecrystal.pony +++ b/ttyponies/cadancecrystal.pony @@ -14,7 +14,7 @@ LINK: regular MANE: pastel MASTER: cadance NAME: Cadance -OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full named) +OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full name without title), Princess Mi Amore Cadenza (official, full name) POSE: stand SOURCE: [jristz] WIDTH: 46 diff --git a/ttyponies/cadancescruffy.pony b/ttyponies/cadancescruffy.pony index 1977a33b..44d1ed56 100644 --- a/ttyponies/cadancescruffy.pony +++ b/ttyponies/cadancescruffy.pony @@ -14,7 +14,7 @@ LINK: regular MANE: pastel MASTER: cadance NAME: Cadance -OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full named) +OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full name) POSE: scruffy SOURCE: (robokitty) Desktop ponies WIDTH: 48 diff --git a/ttyponies/fillycadance.pony b/ttyponies/fillycadance.pony index 515a9c6c..f02f8a5c 100644 --- a/ttyponies/fillycadance.pony +++ b/ttyponies/fillycadance.pony @@ -14,7 +14,7 @@ LINK: regular MANE: pastel MASTER: cadance NAME: Cadance -OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full named) +OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full name) POSE: filly SOURCE: (Kloopp) Desktop ponies WIDTH: 49 diff --git a/ttyponies/hairytipper.pony b/ttyponies/hairytipper.pony index 9df8b7ab..56c0e96c 100644 --- a/ttyponies/hairytipper.pony +++ b/ttyponies/hairytipper.pony @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: brown NAME: (not mentioned) -OTHER NAMES: Hairy Tipper (unofficial), Dance Fever (official on Card game) +OTHER NAMES: Hairy Tipper (unofficial), Dance Fever (official on Trading card) POSE: stand SOURCE: [jristz], based on Desktop ponies WIDTH: 47 diff --git a/ttyponies/horte.pony b/ttyponies/horte.pony index c52b3e8a..bb87d2b2 100644 --- a/ttyponies/horte.pony +++ b/ttyponies/horte.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E03 The Ticket Master BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: beige DISPLAY: full, left EYE: closed, brown @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Horte Cuisine (unofficial) +OTHER NAMES: Horte Cuisine (unofficial), Savoir Fare (official on Trading card) POSE: stand SOURCE: (Anonycat) Desktop ponies WIDTH: 40 diff --git a/ttyponies/pokey.pony b/ttyponies/pokey.pony index 2bd42024..d70bafbe 100644 --- a/ttyponies/pokey.pony +++ b/ttyponies/pokey.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Friendship is Magic [Part 1] BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: blue DISPLAY: full, left EYE: yellow @@ -12,7 +12,7 @@ KIND: unicorn LINK: regular MANE: white NAME: (not mentioned) -OTHER NAMES: Pokey Pierce (unofficial), Perry Pierce (unofficial, same look) +OTHER NAMES: Pokey Pierce (unofficial), Perry Pierce (unofficial, same look), Pinprick (official on Trading card) POSE: stand SOURCE: (Anonycat) Desktop ponies WIDTH: 44 diff --git a/ttyponies/powderrouge.pony b/ttyponies/powderrouge.pony index 0767baab..f87ce0a9 100644 --- a/ttyponies/powderrouge.pony +++ b/ttyponies/powderrouge.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E20 Green isn't Your Color BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: beige DISPLAY: full, right EYE: closed, purple diff --git a/ttyponies/quickfix.pony b/ttyponies/quickfix.pony index 8c778565..43c533d7 100644 --- a/ttyponies/quickfix.pony +++ b/ttyponies/quickfix.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E01 Frienship is Magic [Part 1] BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: brown DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: unicorn LINK: regular MANE: yellow NAME: (not mentioned) -OTHER NAMES: Quickfix (unofficial), Epona (unofficial), Clockwork (unofficial) +OTHER NAMES: Quickfix (unofficial), Epona (unofficial), Clockwork (unofficial), Silver Spanner (official on Trading card) POSE: stand SOURCE: [jristz] WIDTH: 46 diff --git a/ttyponies/ravenearth.pony b/ttyponies/ravenearth.pony index a7eb973e..8ad7af35 100644 --- a/ttyponies/ravenearth.pony +++ b/ttyponies/ravenearth.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S02E04 Luna Eclipsed BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, right EYE: gray @@ -13,7 +13,7 @@ LINK: regular MANE: black MASTER: raven NAME: (not mentioned) -OTHER NAMES: Raven (unofficial) +OTHER NAMES: Raven (official) POSE: demon SOURCE: [jristz], based on (Bot-chan) Desktop ponies WIDTH: 44 diff --git a/ttyponies/redheart.pony b/ttyponies/redheart.pony index abfbfeb2..f9114089 100644 --- a/ttyponies/redheart.pony +++ b/ttyponies/redheart.pony @@ -1,8 +1,8 @@ $$$ APPEARANCE: S01E04 Applebuck Season BALLOON: top -BALLOON TOP: 3 BALLOON BOTTOM: 0 +BALLOON TOP: 3 COAT: white DISPLAY: full, left EYE: blue @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: white (ponysay), pink (source) NAME: (not mentioned) -OTHER NAMES: Nurse Redheart (unofficial) +OTHER NAMES: Nurse Redheart (official) POSE: stand SOURCE: (Logan, StarStep) Desktop ponies WIDTH: 40 diff --git a/ttyponies/screwloose.pony b/ttyponies/screwloose.pony index 46d7fcc4..ba347cce 100644 --- a/ttyponies/screwloose.pony +++ b/ttyponies/screwloose.pony @@ -12,7 +12,7 @@ KIND: earth LINK: regular MANE: blue NAME: (not mentioned) -OTHER NAMES: Screw Loose (unofficial) +OTHER NAMES: Screw Loose (unofficial), Screwy (official on Trading card) POSE: smile SOURCE: (Bot-chsn) Desktop ponies, [jristz] until version 3.0.1 WIDTH: 49