Skip to Content

Changes for page Timeline

Last modified by Yann VIOGEAS on 2025/02/07 21:14
From version 64.1
edited by Daniel Turner
on 2021/12/20 04:25
Change comment: There is no comment for this version
To version 60.1
edited by Daniel Turner
on 2021/12/17 07:03
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -34,7 +34,7 @@
34 34  
35 35  )))|(% colspan="1" %)(% colspan="1" %)
36 36  (((
37 -The United Space Command (USC) is established to consolidate the Earth's science and military spacecraft under one organisation, it serves as the government of Sol until its dissolution and merger into the [[doc:Terran Protectorate]].
37 +The United Space Command (USC) is established to consolidate the Earth's science and military spacecraft under one organisation, it serves as the government of Sol until its dissolution and merger into the Terran Protectorate.
38 38  )))
39 39  |(((
40 40  -124
... ... @@ -44,7 +44,7 @@
44 44  (((
45 45  
46 46  )))|(((
47 -The flight of the //USC Winterblossom// to explore the Jump Gate network begins lead by René Farnham.\\
47 +The flight of the //Winterblossom// to explore the Jump Gate network begins lead by René Farnham.\\
48 48  )))
49 49  |(% colspan="1" %)(% colspan="1" %)
50 50  (((
... ... @@ -57,7 +57,7 @@
57 57  
58 58  )))|(% colspan="1" %)(% colspan="1" %)
59 59  (((
60 -The //USC Winterblossom// is recalled to Sol bringing a contracted end to its mission.
60 +The //Winterblossom// is recalled to Sol bringing a contracted end to its mission.
61 61  )))
62 62  |(% colspan="1" %)(% colspan="1" %)
63 63  (((
... ... @@ -93,7 +93,7 @@
93 93  
94 94  )))|(% colspan="1" %)(% colspan="1" %)
95 95  (((
96 -**First Terraformer Conflict:** The Second Terraformer Fleet, having been corrupted by disgruntled terraformer scientist Martin Winters' corruption of the termination code, begins destroying the worlds they were created to build. They then set about achieving their new goal of eliminating all biological life.
96 +**The First Terraformer Conflict:** The Second Terraformer Fleet, having been corrupted by disgruntled terraformer scientist Martin Winters' corruption of the termination code, begins destroying the worlds they were created to build. They then set about achieving their new goal of eliminating all biological life.
97 97  )))
98 98  |(% colspan="1" %)(% colspan="1" %)
99 99  (((
... ... @@ -106,10 +106,23 @@
106 106  
107 107  )))|(% colspan="1" %)(% colspan="1" %)
108 108  (((
109 -The Earth Jumpgate is destroyed by Nathan R Gunne's fleet lead by the //USC Dragonfire// to protect Earth (By X4 its remains orbit [[doc:Mars]]) trapping the rogue terraformers in the X-Universe. This ends the First Terraformer Conflict
109 +The Earth Jump Gate is destroyed by Nathan R Gunne's fleet lead by the //USC Dragonfire// to protect Earth (By X4 its remains orbit [[doc:Mars]]) trapping the rogue terraformers in the X-Universe.
110 110  )))
111 111  |(% colspan="1" %)(% colspan="1" %)
112 112  (((
113 +-23
114 +)))|(% colspan="1" %)(% colspan="1" %)
115 +(((
116 +2147
117 +)))|(% colspan="1" %)(% colspan="1" %)
118 +(((
119 +
120 +)))|(% colspan="1" %)(% colspan="1" %)
121 +(((
122 +The First Terraformer Conflict ends.
123 +)))
124 +|(% colspan="1" %)(% colspan="1" %)
125 +(((
113 113  0
114 114  )))|(% colspan="1" %)(% colspan="1" %)
115 115  (((
... ... @@ -171,7 +171,7 @@
171 171  
172 172  )))|(% colspan="1" %)(% colspan="1" %)
173 173  (((
174 -**First Xenon Conflict:** [[doc:Xenon]] destroy the superstation "Antigone", The sector [[doc:Antigone Memorial]] and the [[doc:Antigone Republic]] is named in its honour.
187 +**First Xenon Conflict:** [[doc:Xenon]] destroy the superstation "Antigone", The sector [[doc:Antigone Memorial]] and The [[doc:Antigone Republic]] is named in its honour.
175 175  )))
176 176  |(% colspan="1" %)(% colspan="1" %)
177 177  (((
... ... @@ -184,7 +184,7 @@
184 184  
185 185  )))|(% colspan="1" %)(% colspan="1" %)
186 186  (((
187 -The Free State of Solara is established in reaction to the effects of the First Xenon Conflict (Solara refers to the star that the planetoid Aldrin orbits).
200 +The Free State of Solara is established in reaction to the effects of the First Xenon Conflict. Solara refers to the star that the planetoid Aldrin orbits.
188 188  )))
189 189  |(% colspan="1" %)(% colspan="1" %)
190 190  (((
... ... @@ -197,7 +197,7 @@
197 197  
198 198  )))|(% colspan="1" %)(% colspan="1" %)
199 199  (((
200 -The [[doc:Hatikvah Free League]] is established by Christiane Hatikvah, also in reaction to the effects of the First Xenon Conflict. The orga
213 +The [[doc:Hatikvah Free League]] is established also in reaction to the effects of the First Xenon Conflict.
201 201  )))
202 202  |(% colspan="1" %)(% colspan="1" %)
203 203  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -**Boron Campaign:** Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split.
252 +**The Boron Campaign:** Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split.
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -337,7 +337,7 @@
337 337  )))
338 338  |(% colspan="1" %)(% colspan="1" %)
339 339  (((
340 -**Second Xenon Conflict:** The Xenon are ejected from the North-Western region of the old Jump Gate network after their M0 class superweapon was destroyed.
353 +**Second Xenon Conflict:** The Xenon are ejected from the North-Western region of the old Jump Gate network.
341 341  )))
342 342  |(% colspan="1" %)(% colspan="1" %)
343 343  (((
... ... @@ -447,7 +447,7 @@
447 447  )))
448 448  |(% colspan="1" %)(% colspan="1" %)
449 449  (((
450 -The Xenon Hub is discovered by Bala Gi and Julian Gardna-Brennan. The device is capable of realigning jumpgates in pairs to its 6 gates.
463 +The Xenon Hub is discovered by Bala Gi and Julian Brennan. The device is capable of realigning jumpgates in pairs to its 6 gates.
451 451  )))
452 452  |(% colspan="1" %)(% colspan="1" %)
453 453  (((
... ... @@ -494,19 +494,6 @@
494 494  )))
495 495  |(% colspan="1" %)(% colspan="1" %)
496 496  (((
497 -772
498 -)))|(% colspan="1" %)(% colspan="1" %)
499 -(((
500 -2942
501 -)))|(% colspan="1" %)(% colspan="1" %)
502 -(((
503 -
504 -)))|(% colspan="1" %)(% colspan="1" %)
505 -(((
506 -Badlands Colony established as the defacto base of the [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] in Albion
507 -)))
508 -|(% colspan="1" %)(% colspan="1" %)
509 -(((
510 510  774
511 511  )))|(% colspan="1" %)(% colspan="1" %)
512 512  (((
... ... @@ -545,17 +545,6 @@
545 545  (((
546 546  Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[JSS>>doc:XRWIKI.Jonferson Space Systems]].
547 547  )))
548 -|(((
549 -779
550 -)))|(((
551 -2949
552 -)))|(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)
553 -(((
554 -XR*
555 -)))|(% colspan="1" %)(% colspan="1" %)
556 -(((
557 -**Plutarch Coup:** [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] declares war on the [[doc:Argon Federation]] over control over the Albion system.
558 -)))
559 559  |(% colspan="1" %)(% colspan="1" %)
560 560  (((
561 561  780
... ... @@ -606,7 +606,7 @@
606 606  X:R*
607 607  )))|(% colspan="1" %)(% colspan="1" %)
608 608  (((
609 -**Plutarch Accession:** [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system. The remains of the Argon Government and Argon Navy form the [[doc:XRWIKI.Heart of Albion]].
598 +[[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system. The remains of the Argon Government and Argon Navy form the [[doc:XRWIKI.Heart of Albion]].
610 610  )))
611 611  |(% colspan="1" %)(% colspan="1" %)
612 612  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -106890417
1 +106890345
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890417/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890345/Timeline