Difference between revisions of "Template:Mars spacecraft"

From blackwiki
Jump to navigation Jump to search
imported>Drbogdan
imported>Drbogdan
(alphabetized listings - seems better.)
Line 14: Line 14:
 
   | group1 = [[Orbiter]]s
 
   | group1 = [[Orbiter]]s
 
   | list1 =
 
   | list1 =
 +
* [[ExoMars Trace Gas Orbiter]]
 
* [[Mars Express]]
 
* [[Mars Express]]
 +
* [[Mars Orbiter Mission]]
 
* [[Mars Reconnaissance Orbiter]]
 
* [[Mars Reconnaissance Orbiter]]
 +
* [[MAVEN]]
 
* [[2001 Mars Odyssey]]
 
* [[2001 Mars Odyssey]]
* [[Mars Orbiter Mission]]
 
* [[MAVEN]]
 
* [[ExoMars Trace Gas Orbiter]]
 
  
 
   | group2 = [[Mars rover|Rovers]]
 
   | group2 = [[Mars rover|Rovers]]
 
   | list2 =
 
   | list2 =
 +
* [[Curiosity (rover)|Curiosity]]
 +
** [[Timeline of Mars Science Laboratory|Timeline]]
 
* [[Opportunity (rover)|Opportunity]]
 
* [[Opportunity (rover)|Opportunity]]
 
** [[List of surface features of Mars seen by Opportunity|Observations]]
 
** [[List of surface features of Mars seen by Opportunity|Observations]]
* [[Curiosity (rover)|Curiosity]]
 
** [[Timeline of Mars Science Laboratory|Timeline]]
 
 
  }}
 
  }}
  
Line 36: Line 36:
 
| group1 = [[Mars flyby|Flybys]]
 
| group1 = [[Mars flyby|Flybys]]
 
| list1 =
 
| list1 =
 +
* [[Dawn (spacecraft)|Dawn]]
 
* [[Mariner 4]]
 
* [[Mariner 4]]
 
* [[Mariner 6 and 7|Mariner 6]]
 
* [[Mariner 6 and 7|Mariner 6]]
Line 43: Line 44:
 
* [[Mars 7]]
 
* [[Mars 7]]
 
* [[Nozomi (spacecraft)|Nozomi]]<sup>†</sup>
 
* [[Nozomi (spacecraft)|Nozomi]]<sup>†</sup>
 +
* [[Rosetta (spacecraft)|Rosetta]]
 
* [[Zond 2]]<sup>†</sup>
 
* [[Zond 2]]<sup>†</sup>
* [[Dawn (spacecraft)|Dawn]]
 
* [[Rosetta (spacecraft)|Rosetta]]
 
  
 
| group2 = [[Orbiter]]s
 
| group2 = [[Orbiter]]s
Line 92: Line 92:
 
| group4 = Failed at launch
 
| group4 = Failed at launch
 
| list4 =
 
| list4 =
 +
* [[Fobos-Grunt]] / [[Yinghuo-1]]
 +
* [[Kosmos 419]]
 
* [[Mars 1M No.1|1M No.1]]
 
* [[Mars 1M No.1|1M No.1]]
 
* [[Mars 1M No.2|1M No.2]]
 
* [[Mars 1M No.2|1M No.2]]
Line 100: Line 102:
 
* [[Mars 2M No.522|2M No.522]]
 
* [[Mars 2M No.522|2M No.522]]
 
* [[Mariner 8]]
 
* [[Mariner 8]]
* [[Kosmos 419]]
 
 
* [[Mars 96]]
 
* [[Mars 96]]
* [[Fobos-Grunt]] / [[Yinghuo-1]]
 
  
 
| group5 = Planned
 
| group5 = Planned
Line 108: Line 108:
 
* [[InSight]] / [[Mars Cube One]] {{small|(2018)}}
 
* [[InSight]] / [[Mars Cube One]] {{small|(2018)}}
 
* [[Red Dragon (spacecraft)|Red Dragon]] {{small|(2018)}}
 
* [[Red Dragon (spacecraft)|Red Dragon]] {{small|(2018)}}
 +
* [[ExoMars (rover)]] / [[ExoMars 2020 surface platform]] {{small|(2020)}}
 
* [[Mangalyaan 2]] {{small|(2020)}}
 
* [[Mangalyaan 2]] {{small|(2020)}}
* [[ExoMars (rover)]] / [[ExoMars 2020 surface platform]] {{small|(2020)}}
 
 
* [[Mars Hope]] {{small|(2020)}}
 
* [[Mars Hope]] {{small|(2020)}}
 
* [[Mars 2020]] {{small|(2020)}}
 
* [[Mars 2020]] {{small|(2020)}}

Revision as of 14:04, 13 November 2016