aboutsummaryrefslogtreecommitdiff
path: root/dev/pony-checklist
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-09-17 19:24:05 +0200
committerMattias Andrée <maandree@operamail.com>2012-09-17 19:24:05 +0200
commit140d04b2ca532de5447d64747210f9eb496d6b2e (patch)
tree058605b875aa86a8cdc30d6035dcb7391f1e1757 /dev/pony-checklist
parent3008d6509b61bd0a26af61b0c7e94a06a49bdd94 (diff)
parent9f9298d76c441d9dd18eeb9794d6a25058bf477e (diff)
downloadponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.gz
ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.bz2
ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.zip
conflict resolve + typo + m
Diffstat (limited to 'dev/pony-checklist')
-rw-r--r--dev/pony-checklist29
1 files changed, 14 insertions, 15 deletions
diff --git a/dev/pony-checklist b/dev/pony-checklist
index 642fb47..37df00b 100644
--- a/dev/pony-checklist
+++ b/dev/pony-checklist
@@ -36,8 +36,8 @@ Princess Luna
Fancypants
Flam
Flim
-Joe http://mlp.wikia.com/wiki/Joe
-Prince Blueblood
+Joe
+Prince Blueblood
Shining Armor
The Great and Powerful Trixie
Unicorn royal guards http://mlp.wikia.com/wiki/Royal_guards
@@ -134,7 +134,7 @@ Fiddlesticks http://images2.wikia.nocookie.net/__cb20111022193515/mlp/images/th
Film Reel http://images3.wikia.nocookie.net/__cb20110822054522/mlp/images/thumb/4/44/Film_Reel.png/150px-Film_Reel.png
Flounder http://images2.wikia.nocookie.net/__cb20110610061737/mlp/images/thumb/8/85/Flounder.png/150px-Flounder.png
Forest Spirit
-Frederic Horseshoepin http://images3.wikia.nocookie.net/__cb20111213195912/mlp/images/thumb/8/8a/Frederic_Horseshoepin.png/150px-Frederic_Horseshoepin.png
+Frederic Horseshoepin
Fuzzy Slippers http://images4.wikia.nocookie.net/__cb20120208020302/mlp/images/thumb/0/05/Bald_pony_s02e14.png/150px-Bald_pony_s02e14.png
G. Raff http://images4.wikia.nocookie.net/__cb20120212060405/mlp/images/thumb/d/dd/Too_tall.png/150px-Too_tall.png
Geri http://images2.wikia.nocookie.net/__cb20111113165236/mlp/images/thumb/c/cc/Fore_S2E06.png/150px-Fore_S2E06.png
@@ -158,8 +158,8 @@ Horte Cuisine
Hugh Jelly
Icy Drop http://images4.wikia.nocookie.net/__cb20110822064622/mlp/images/thumb/3/38/Icy_Rain.png/150px-Icy_Rain.png
Jangles http://images1.wikia.nocookie.net/__cb20110614052860/mlp/images/thumb/e/e8/Party_pony_2_S1E26.png/150px-Party_pony_2_S1E26.png
-Jeff "The Dude" Letrotski http://images3.wikia.nocookie.net/__cb20111113154012/mlp/images/thumb/0/04/Jeff_The_Dude_Letrotskti.png/150px-Jeff_The_Dude_Letrotskti.png
-Jesús Pezuña http://images1.wikia.nocookie.net/__cb20111113161740/mlp/images/thumb/3/3e/Jesus_S2E05.png/150px-Jesus_S2E05.png
+Jeff "The Dude" Letrotski
+Jesús Pezuña
Jim Beam http://images4.wikia.nocookie.net/__cb20120227215231/mlp/images/thumb/6/67/Construction_worker_i-beam_s02e08.png/150px-Construction_worker_i-beam_s02e08.png
John Bull http://images3.wikia.nocookie.net/__cb20110403103440/mlp/images/thumb/5/52/Second_engineer_pony_pulling_locomotive_S1E21.jpg/150px-Second_engineer_pony_pulling_locomotive_S1E21.jpg
Junebug
@@ -185,7 +185,7 @@ Maroon Carrot http://images3.wikia.nocookie.net/__cb20110822222505/mlp/images/t
Masquerade http://images2.wikia.nocookie.net/__cb20110614052849/mlp/images/thumb/0/01/Party_pony_1.png/150px-Party_pony_1.png
Master
Maybelline http://images4.wikia.nocookie.net/__cb20120227223534/mlp/images/thumb/2/2e/S02E08_UEM2.png/150px-S02E08_UEM2.png
-Meadow Song http://images3.wikia.nocookie.net/__cb20120630043550/mlp/images/thumb/6/61/Meadow_Song.png/150px-Meadow_Song.png
+Meadow Song
Melilot http://images2.wikia.nocookie.net/__cb20110709060736/mlp/images/thumb/1/17/Melilot.png/150px-Melilot.png
Midnight Fun http://images1.wikia.nocookie.net/__cb20110624094129/mlp/images/thumb/f/fb/Marge_pony.png/150px-Marge_pony.png
Millie http://images1.wikia.nocookie.net/__cb20111127205205/mlp/images/thumb/0/04/Millie.png/150px-Millie.png
@@ -250,13 +250,13 @@ Sun Streak http://images1.wikia.nocookie.net/__cb20110822224209/mlp/images/thu
Sunset Bliss http://images2.wikia.nocookie.net/__cb20110708000917/mlp/images/thumb/9/90/Sunset_bliss.png/150px-Sunset_bliss.png
Surf http://images2.wikia.nocookie.net/__cb20120309140137/mlp/images/thumb/5/51/S02E19_UEM2.png/150px-S02E19_UEM2.png
Symphony http://images1.wikia.nocookie.net/__cb20120207133422/mlp/images/thumb/1/13/Violin_pony_s02e09.png/150px-Violin_pony_s02e09.png
-Theodore Donald "Donny" Kerabatsos http://images1.wikia.nocookie.net/__cb20111113153728/mlp/images/thumb/d/d2/Theodore_Donald_Donny_Kerabatsos.png/150px-Theodore_Donald_Donny_Kerabatsos.png
+Theodore Donald "Donny" Kerabatsos
Time Turner
Toffee http://images2.wikia.nocookie.net/__cb20110822224628/mlp/images/thumb/2/29/Toffee.png/150px-Toffee.png
Tourist Trap http://images3.wikia.nocookie.net/__cb20120227223534/mlp/images/thumb/2/2c/S02E08_UES4.png/150px-S02E08_UES4.png
Tree Sap http://images2.wikia.nocookie.net/__cb20110822224332/mlp/images/thumb/f/fc/Tree_Sap.png/150px-Tree_Sap.png
Tropical Spring http://images4.wikia.nocookie.net/__cb20120224190631/mlp/images/thumb/3/3c/S02E18_UEM3.png/150px-S02E18_UEM3.png
-Turf http://images4.wikia.nocookie.net/__cb20120309140136/mlp/images/thumb/3/39/S02E19_UEM1.png/150px-S02E19_UEM1.png
+Turf
Tux n' Tails http://images3.wikia.nocookie.net/__cb20110621063125/mlp/images/thumb/8/81/Tux_'n_Tails.png/150px-Tux_'n_Tails.png
Twilight Sky http://images4.wikia.nocookie.net/__cb20110331124145/mlp/images/thumb/7/77/Ice.png/150px-Ice.png
Vanilla Sweets http://images4.wikia.nocookie.net/__cb20110624094310/mlp/images/thumb/f/ff/Vanilla_sweets.png/150px-Vanilla_sweets.png
@@ -264,7 +264,7 @@ Vera http://images3.wikia.nocookie.net/__cb20110706140537/mlp/images/thumb/3/3
Vigilance http://images3.wikia.nocookie.net/__cb20120205002823/mlp/images/thumb/e/ee/S02E16_UES2.png/150px-S02E16_UES2.png
Wacky Hair Day and Spray http://images3.wikia.nocookie.net/__cb20110727212619/mlp/images/thumb/e/ea/Wackyhair.png/150px-Wackyhair.png
Mr. Waddle http://images2.wikia.nocookie.net/__cb20111213195636/mlp/images/thumb/d/d8/Elderly_pony_bubble_pipe_cutie_mark_S2E08.png/150px-Elderly_pony_bubble_pipe_cutie_mark_S2E08.png
-Walter Coltchak http://images4.wikia.nocookie.net/__cb20111113172152/mlp/images/thumb/f/f2/WalterColtchak.png/150px-WalterColtchak.png
+Walter Coltchak
Welly http://images2.wikia.nocookie.net/__cb20120224190630/mlp/images/thumb/b/bb/S02E18_UEM2.png/150px-S02E18_UEM2.png
Wildwood Flower http://images1.wikia.nocookie.net/__cb20120123194028/mlp/images/thumb/5/50/Happy_cowpony_S02E14.png/150px-Happy_cowpony_S02E14.png
William Wright http://images4.wikia.nocookie.net/__cb20120224190634/mlp/images/thumb/9/9c/S02E18_UES1.png/150px-S02E18_UES1.png
@@ -293,7 +293,7 @@ Brolly http://images3.wikia.nocookie.net/__cb20110405235216/mlp/images/thumb/7
Cappuccino / Luke http://images1.wikia.nocookie.net/__cb20111216012454/mlp/images/5/5c/S01E16_Cappuccino.png
Chocolate Blueberry http://images1.wikia.nocookie.net/__cb20110709061019/mlp/images/thumb/d/d3/Chocolate_Blueberry.png/150px-Chocolate_Blueberry.png
Cinnamon Swirl http://images3.wikia.nocookie.net/__cb20120224191007/mlp/images/thumb/a/a1/S02E18_UPM2.png/150px-S02E18_UPM2.png
-Cloud Kicker http://images2.wikia.nocookie.net/__cb20110216030054/mlp/images/thumb/4/46/Cloud_Kicker_id.png/150px-Cloud_Kicker_id.png
+Cloud Kicker
Cloud Showers http://images2.wikia.nocookie.net/__cb20110727054813/mlp/images/thumb/5/5d/Cloudshowers.png/150px-Cloudshowers.png
Cloudchaser http://images4.wikia.nocookie.net/__cb20120319192208/mlp/images/thumb/d/de/Pony_next_to_pink_bow_pegasus_s02e22.png/150px-Pony_next_to_pink_bow_pegasus_s02e22.png
Crafty Crate
@@ -429,7 +429,7 @@ Raty / Polly http://images2.wikia.nocookie.net/__cb20110823214235/mlp/images/th
Rhythm / Night Shade http://images2.wikia.nocookie.net/__cb20110714111158/mlp/images/thumb/9/92/Rhytm_unicorn.PNG/150px-Rhytm_unicorn.PNG
Rosewood Brook http://images3.wikia.nocookie.net/__cb20120107205209/mlp/images/9/96/S02E12_UUM3.png
Royal Ribbon
-Sea Swirl http://mlp.wikia.com/wiki/Sea_Swirl
+Sea Swirl
South Pole http://images3.wikia.nocookie.net/__cb20110707235429/mlp/images/thumb/5/51/Southpole.png/150px-Southpole.png
Star Bright http://images2.wikia.nocookie.net/__cb20120311212054/mlp/images/thumb/6/61/Gray_stallion_with_telescope_CM_s02e14.png/115px-Gray_stallion_with_telescope_CM_s02e14.png
Star Dream / Sky Dream http://images1.wikia.nocookie.net/__cb20110707121344/mlp/images/thumb/c/c3/Star_Dream.png/150px-Star_Dream.png
@@ -663,11 +663,11 @@ Philomena
Owlowiscious
Tank
Peewee http://mlp.wikia.com/wiki/Spike#Peewee
-Cerberus http://mlp.wikia.com/wiki/Creatures#Cerberus
+Cerberus
Changeling
Cockatrice http://mlp.wikia.com/wiki/Creatures#Cockatrice
Hydra http://mlp.wikia.com/wiki/Creatures#Hydra
-Manticore http://mlp.wikia.com/wiki/Creatures#Manticore
+Manticore
Parasprite
Phoenix
Quarray eel http://mlp.wikia.com/wiki/Creatures#Quarray_eels
@@ -683,7 +683,7 @@ Basil http://images2.wikia.nocookie.net/__cb20101214223529/mlp/images/thumb/9/
http://images1.wikia.nocookie.net/__cb20110425055507/mlp/images/thumb/8/8c/Green_dragon_s1e24.png/200px-Green_dragon_s1e24.png
http://images2.wikia.nocookie.net/__cb20120319133616/mlp/images/thumb/d/d1/S2E21_dragon_three.png/180px-S2E21_dragon_three.png
Garble http://images2.wikia.nocookie.net/__cb20120322093252/mlp/images/thumb/d/d0/Garble_with_the_other_teen_dragons_S2E21.png/274px-Garble_with_the_other_teen_dragons_S2E21.png
-Cracky
+Crackle
More in S02E21...
Other buffalo:
@@ -691,4 +691,3 @@ http://images1.wikia.nocookie.net/__cb20110329021538/mlp/images/thumb/c/ce/RD%2C
Wild life:
http://mlp.wikia.com/wiki/Wildlife
-