https://wiki.hard-light.org/index.php?action=history&feed=atom&title=Portal%3AFreeSpace_Universe
Portal:FreeSpace Universe - Revision history
2026-11-15T22:29:05Z
Revision history for this page on the wiki
MediaWiki 1.43.9
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=58741&oldid=prev
Nightmare: Added name origins
2019-05-06T00:07:09Z
<p>Added name origins</p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 00:07, 6 May 2019</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l39">Line 39:</td>
<td colspan="2" class="diff-lineno">Line 39:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace_2_Ship_Database|Named ships of FreeSpace 2]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace_2_Ship_Database|Named ships of FreeSpace 2]]</div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">|-</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">! style="color: white; height: 30px; 70%;"|[[Name origins]]</ins></div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Fighter squadrons]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Fighter squadrons]]</div></td></tr>
</table>
Nightmare
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=36091&oldid=prev
Cyborg17 at 07:44, 5 August 2011
2011-08-05T07:44:27Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 07:44, 5 August 2011</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l80">Line 80:</td>
<td colspan="2" class="diff-lineno">Line 80:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>The period between 2335 and 2367 is called the [[Reconstruction]]. In this period, the Terrans and Vasudans rebuild their ravaged worlds and form an alliance called the [[Galactic Terran-Vasudan Alliance]] (or GTVA). Eighteen months before the events of [[Portal:FreeSpace 2|''FreeSpace 2'']], a [[Neo-Terran Front|military coup]] led by Admiral [[Aken Bosch]] takes place and threatens the integrity of the GTVA.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>The period between 2335 and 2367 is called the [[Reconstruction]]. In this period, the Terrans and Vasudans rebuild their ravaged worlds and form an alliance called the [[Galactic Terran-Vasudan Alliance]] (or GTVA). Eighteen months before the events of [[Portal:FreeSpace 2|''FreeSpace 2'']], a [[Neo-Terran Front|military coup]] led by Admiral [[Aken Bosch]] takes place and threatens the integrity of the GTVA.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>''FreeSpace 2'' deals with the last weeks of the rebellion (called the [[Neo-Terran Front]] or NTF) and tells the story of the [[Second Shivan Incursion|Shivans' <del style="font-weight: bold; text-decoration: none;">second </del>return]]. This event is not canonically named. It's usually referred to as the Second Shivan Incursion or the Second Great War. The NTF is ultimately defeated but the Shivans muster a seemingly invincible fleet in the [[Capella]] system. The GTVA fleets do not stand a chance, and they destroy the two subspace nodes that lead out of the Capella system and severe the Shivan armada from the rest of the known galaxy.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>''FreeSpace 2'' deals with the last weeks of the rebellion (called the [[Neo-Terran Front]] or NTF) and tells the story of the [[Second Shivan Incursion|Shivans' return]]. This event is not canonically named. It's usually referred to as the Second Shivan Incursion or the Second Great War. The NTF is ultimately defeated but the Shivans muster a seemingly invincible fleet in the [[Capella]] system. The GTVA fleets do not stand a chance, and they destroy the two subspace nodes that lead out of the Capella system and severe the Shivan armada from the rest of the known galaxy.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>There is no canon information about the events happened after that. The FreeSpace community refers to this era as the Post-Capella Era.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>There is no canon information about the events happened after that. The FreeSpace community refers to this era as the Post-Capella Era.</div></td></tr>
</table>
Cyborg17
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=29966&oldid=prev
TopAce: ...
2010-06-25T18:42:12Z
<p>...</p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 18:42, 25 June 2010</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l48">Line 48:</td>
<td colspan="2" class="diff-lineno">Line 48:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ground combat]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ground combat]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Famous <del style="font-weight: bold; text-decoration: none;">Persons</del>]]</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Famous <ins style="font-weight: bold; text-decoration: none;">persons</ins>]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Politics]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Politics]]</div></td></tr>
</table>
TopAce
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=29957&oldid=prev
TopAce at 18:34, 25 June 2010
2010-06-25T18:34:29Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 18:34, 25 June 2010</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l46">Line 46:</td>
<td colspan="2" class="diff-lineno">Line 46:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Corporations]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Corporations]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ground <del style="font-weight: bold; text-decoration: none;">Combat</del>]]</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ground <ins style="font-weight: bold; text-decoration: none;">combat</ins>]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Famous Persons]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Famous Persons]]</div></td></tr>
</table>
TopAce
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=27194&oldid=prev
TopAce: according to move
2009-12-18T20:10:31Z
<p>according to move</p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 20:10, 18 December 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l52">Line 52:</td>
<td colspan="2" class="diff-lineno">Line 52:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Politics]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Politics]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[List of <del style="font-weight: bold; text-decoration: none;">Historical Events</del>|History]]</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[List of <ins style="font-weight: bold; text-decoration: none;">historic events</ins>|History]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ranks in FreeSpace|Ranks]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Ranks in FreeSpace|Ranks]]</div></td></tr>
</table>
TopAce
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=25953&oldid=prev
TopAce at 12:18, 11 October 2009
2009-10-11T12:18:00Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 12:18, 11 October 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l34">Line 34:</td>
<td colspan="2" class="diff-lineno">Line 34:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; background: #512020; 70%;"|'''''Ships'''''</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; background: #512020; 70%;"|'''''Ships'''''</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[<del style="font-weight: bold; text-decoration: none;">The </del>Great War <del style="font-weight: bold; text-decoration: none;">Era Craft</del>|FreeSpace 1]]</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[Great War<ins style="font-weight: bold; text-decoration: none;">-era craft</ins>|FreeSpace 1]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace 2-era craft|FreeSpace 2]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace 2-era craft|FreeSpace 2]]</div></td></tr>
</table>
TopAce
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=25948&oldid=prev
TopAce at 12:12, 11 October 2009
2009-10-11T12:12:06Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 12:12, 11 October 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l36">Line 36:</td>
<td colspan="2" class="diff-lineno">Line 36:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[The Great War Era Craft|FreeSpace 1]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[The Great War Era Craft|FreeSpace 1]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace 2 <del style="font-weight: bold; text-decoration: none;">Era Craft</del>|FreeSpace 2]]</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace 2<ins style="font-weight: bold; text-decoration: none;">-era craft</ins>|FreeSpace 2]]</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|-</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace_2_Ship_Database|Named ships of FreeSpace 2]]</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>! style="color: white; height: 30px; 70%;"|[[FreeSpace_2_Ship_Database|Named ships of FreeSpace 2]]</div></td></tr>
</table>
TopAce
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=24794&oldid=prev
Mongoose: /* The galaxy */
2009-08-10T03:55:43Z
<p><span class="autocomment">The galaxy</span></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 03:55, 10 August 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l85">Line 85:</td>
<td colspan="2" class="diff-lineno">Line 85:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>==The galaxy==</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>==The galaxy==</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>The FreeSpace galaxy consists of numerous star systems, most of them are based on real-life <del style="font-weight: bold; text-decoration: none;">astrological </del>observations. The FreeSpace galaxy is best observed through the [[Official Volition Node Map|official galaxy map]] released by [[Volition]]. Travel between these star systems is realized through the use of [[subspace]]. Ships can enter subspace through fixed-position [[jump node]]s. It is not clear how much time it takes to travel from one system to another through subspace; the only ambiguous source is the [[Good Luck|last mission]] of ''Conflict:FreeSpace'', where the player has 10 minutes to complete the mission before the [[SD Lucifer|SD ''Lucifer'']] would enter [[Sol]] through the [[Delta Serpentis]]-Sol jump node.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>The FreeSpace galaxy consists of numerous star systems, most of them are based on real-life <ins style="font-weight: bold; text-decoration: none;">astronomical </ins>observations. The FreeSpace galaxy is best observed through the [[Official Volition Node Map|official galaxy map]] released by [[Volition]]. Travel between these star systems is realized through the use of [[subspace]]. Ships can enter subspace through fixed-position [[jump node]]s. It is not clear how much time it takes to travel from one system to another through subspace; the only ambiguous source is the [[Good Luck|last mission]] of ''Conflict:FreeSpace'', where the player has 10 minutes to complete the mission before the [[SD Lucifer|SD ''Lucifer'']] would enter [[Sol]] through the [[Delta Serpentis]]-Sol jump node.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>==FreeSpace canon==</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>==FreeSpace canon==</div></td></tr>
</table>
Mongoose
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=22475&oldid=prev
Wistler at 11:02, 27 April 2009
2009-04-27T11:02:07Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 11:02, 27 April 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l76">Line 76:</td>
<td colspan="2" class="diff-lineno">Line 76:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>In 2335, the [[Terrans]] (as humans are called in ''FreeSpace'') and the [[Vasudans]] had been at war for fourteen years when a third species, the [[Shivans]], entered with their superior technologies. The two species put aside their differences to combat this new threat. This conflict is known as the [[Great War]]. The antagonistic Shivans were defeated; however, not only was the [[Vasuda Prime|Vasudan homeworld]] obliterated, contact with Earth was also severed.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>In 2335, the [[Terrans]] (as humans are called in ''FreeSpace'') and the [[Vasudans]] had been at war for fourteen years when a third species, the [[Shivans]], entered with their superior technologies. The two species put aside their differences to combat this new threat. This conflict is known as the [[Great War]]. The antagonistic Shivans were defeated; however, not only was the [[Vasuda Prime|Vasudan homeworld]] obliterated, contact with Earth was also severed.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>Shortly after the events of the first game, a rebellion known as the [[Hades Rebellion]] takes place. A rogue element of [[Galactic Terran Intelligence]] <del style="font-weight: bold; text-decoration: none;">construct </del>a massive warship, the [[GTD Hades|GTD ''Hades'']], with Shivan weaponry. The rebellion ultimately ends with the destruction of the ''Hades''. The official expansion of ''Conflict: FreeSpace'', ''[[Silent Threat]]'', catalogues this rebellion.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>Shortly after the events of the first game, a rebellion known as the [[Hades Rebellion]] takes place. A rogue element of [[Galactic Terran Intelligence]] <ins style="font-weight: bold; text-decoration: none;">constructed </ins>a massive warship, the [[GTD Hades|GTD ''Hades'']], with Shivan weaponry. The rebellion ultimately ends with the destruction of the ''Hades''. The official expansion of ''Conflict: FreeSpace'', ''[[Silent Threat]]'', catalogues this rebellion.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>The period between 2335 and 2367 is called the [[Reconstruction]]. In this period, the <del style="font-weight: bold; text-decoration: none;">two species </del>rebuild their ravaged worlds and form an alliance called the [[Galactic Terran-Vasudan Alliance]] (or GTVA). Eighteen months before the events of [[Portal:FreeSpace 2|''FreeSpace 2'']], a [[Neo-Terran Front|military coup]] led by Admiral [[Aken Bosch]] takes place and threatens the integrity of the GTVA.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>The period between 2335 and 2367 is called the [[Reconstruction]]. In this period, the <ins style="font-weight: bold; text-decoration: none;">Terrans and Vasudans </ins>rebuild their ravaged worlds and form an alliance called the [[Galactic Terran-Vasudan Alliance]] (or GTVA). Eighteen months before the events of [[Portal:FreeSpace 2|''FreeSpace 2'']], a [[Neo-Terran Front|military coup]] led by Admiral [[Aken Bosch]] takes place and threatens the integrity of the GTVA.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>''FreeSpace 2'' deals with the last weeks of the rebellion (called the [[Neo-Terran Front]] or NTF) and tells the story of the [[Second Shivan Incursion|Shivans' second return]]. This event is not canonically named. It's usually referred to as the Second Shivan Incursion or the Second Great War. The NTF is ultimately defeated but the Shivans muster a seemingly invincible fleet in the [[Capella]] system. The GTVA fleets do not stand a chance, and they destroy the two subspace nodes that lead out of the Capella system and severe the Shivan armada from the rest of the known galaxy.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>''FreeSpace 2'' deals with the last weeks of the rebellion (called the [[Neo-Terran Front]] or NTF) and tells the story of the [[Second Shivan Incursion|Shivans' second return]]. This event is not canonically named. It's usually referred to as the Second Shivan Incursion or the Second Great War. The NTF is ultimately defeated but the Shivans muster a seemingly invincible fleet in the [[Capella]] system. The GTVA fleets do not stand a chance, and they destroy the two subspace nodes that lead out of the Capella system and severe the Shivan armada from the rest of the known galaxy.</div></td></tr>
</table>
Wistler
https://wiki.hard-light.org/index.php?title=Portal:FreeSpace_Universe&diff=22474&oldid=prev
Wistler at 11:00, 27 April 2009
2009-04-27T11:00:42Z
<p></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 11:00, 27 April 2009</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l74">Line 74:</td>
<td colspan="2" class="diff-lineno">Line 74:</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>The '''FreeSpace universe''' is a fictional continuation of human history as they spread their [[Galactic Terran Alliance|globalized culture]] and interact with two alien species. Canon events range from 2335 until 2367, with heavy emphasis on these two dates.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>The '''FreeSpace universe''' is a fictional continuation of human history as they spread their [[Galactic Terran Alliance|globalized culture]] and interact with two alien species. Canon events range from 2335 until 2367, with heavy emphasis on these two dates.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>In 2335, the [[Terrans]] (as humans are called in ''FreeSpace'') and the [[Vasudans]] had been at war for fourteen years when a third species, the [[Shivans]], entered with their superior technologies. The two species put aside their differences <del style="font-weight: bold; text-decoration: none;">and </del>combat this new threat. This conflict is known as the [[Great War]]. The antagonistic Shivans were defeated; however, not only was the [[Vasuda Prime|Vasudan homeworld]] obliterated, contact with Earth was also severed.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>In 2335, the [[Terrans]] (as humans are called in ''FreeSpace'') and the [[Vasudans]] had been at war for fourteen years when a third species, the [[Shivans]], entered with their superior technologies. The two species put aside their differences <ins style="font-weight: bold; text-decoration: none;">to </ins>combat this new threat. This conflict is known as the [[Great War]]. The antagonistic Shivans were defeated; however, not only was the [[Vasuda Prime|Vasudan homeworld]] obliterated, contact with Earth was also severed.</div></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Shortly after the events of the first game, a rebellion known as the [[Hades Rebellion]] takes place. A rogue element of [[Galactic Terran Intelligence]] construct a massive warship, the [[GTD Hades|GTD ''Hades'']], with Shivan weaponry. The rebellion ultimately ends with the destruction of the ''Hades''. The official expansion of ''Conflict: FreeSpace'', ''[[Silent Threat]]'', catalogues this rebellion.</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Shortly after the events of the first game, a rebellion known as the [[Hades Rebellion]] takes place. A rogue element of [[Galactic Terran Intelligence]] construct a massive warship, the [[GTD Hades|GTD ''Hades'']], with Shivan weaponry. The rebellion ultimately ends with the destruction of the ''Hades''. The official expansion of ''Conflict: FreeSpace'', ''[[Silent Threat]]'', catalogues this rebellion.</div></td></tr>
</table>
Wistler