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 59.1
edited by Daniel Turner
on 2021/12/17 06:38
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  (((
... ... @@ -145,7 +145,7 @@
145 145  
146 146  )))|(% colspan="1" %)(% colspan="1" %)
147 147  (((
148 -Argon make first contact with the Paranid and inter-species trade proliferates.
161 +Argon make first contact with the Paranid.
149 149  )))
150 150  |(% colspan="1" %)(% colspan="1" %)
151 151  (((
... ... @@ -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  (((
... ... @@ -288,7 +288,7 @@
288 288  
289 289  )))|(% colspan="1" %)(% colspan="1" %)
290 290  (((
291 -Credits become the currency of the X universe having been promulgated by the Teladi Company.
304 +Credits become the currency of the X universe.
292 292  )))
293 293  |(% colspan="1" %)(% colspan="1" %)
294 294  (((
... ... @@ -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  (((
... ... @@ -425,7 +425,7 @@
425 425  )))
426 426  |(% colspan="1" %)(% colspan="1" %)
427 427  (((
428 -**Reunion:** The Paranid Empire constructs a Jump Gate to reconnect Earth to the jumpgate network. The Earth Government is invited to join the Argon Federation and the Community of Planets, Earth declines.
441 +**Reunion:** The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jumpgate network. The Earth Government is invited to join the Argon Federation and the Community of Planets, Earth declines.
429 429  )))
430 430  |(% colspan="1" %)(% colspan="1" %)
431 431  (((
... ... @@ -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  (((
... ... @@ -490,23 +490,10 @@
490 490  
491 491  )))|(% colspan="1" %)(% colspan="1" %)
492 492  (((
493 -[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] relocates from the Ore Belt to the recently discovered Albion System. Co-operation with [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]] facilitates the deployment of Trans-Orbital Accelerators in Albion based on Terran designs. JSS begins developing highway technology to supplant the Accelerators.
506 +[[doc:XRWIKI.Plutarch Mining Corporation]] relocates from the Ore Belt to the recently discovered Albion System. Co-operation with [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]] facilitates the deployment of Trans-Orbital Accelerators in Albion based on Terran designs. JSS begins developing highway technology to supplant the Accelerators.
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  (((
... ... @@ -526,7 +526,7 @@
526 526  2946
527 527  )))|(% colspan="1" %)(% colspan="1" %)
528 528  (((
529 -**Second Terraformer Conflict:** The [[doc:XRWIKI.Beryll]] unleashes newly built terraformer drones against Sol with Argon Federation support.
529 +**Second Terraformer Conflict:** The [[doc:XRWIKI.Beryll]] unleashes newly built terraformer drones against Sol
530 530  )))
531 531  |(% rowspan="2" %)(% rowspan="2" %)
532 532  (((
... ... @@ -536,7 +536,7 @@
536 536  2948
537 537  )))|(% colspan="1" %)(% colspan="1" %)
538 538  (((
539 -The destruction of the Torus Aeternal occurs escalating the Terran Conflict. The vast majority of the superstructure's remains are recycled during the Jump Gate Shutdown.
539 +The destruction of the Torus Aeternal occurs escalating the Terran Conflict. The vast majority of its remains are recycled during the Jump Gate Shutdown.
540 540  )))
541 541  |(% class="highlight-green" colspan="1" data-highlight-colour="green" %)(% class="highlight-green" colspan="1" data-highlight-colour="green" %)
542 542  (((
... ... @@ -543,19 +543,8 @@
543 543  X3:AP
544 544  )))|(% colspan="1" %)(% colspan="1" %)
545 545  (((
546 -Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[JSS>>doc:XRWIKI.Jonferson Space Systems]].
546 +Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (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 +[[Plutarch Mining Corporation (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  (((
... ... @@ -619,7 +619,7 @@
619 619  
620 620  )))|(% colspan="1" %)(% colspan="1" %)
621 621  (((
622 -The [[doc:Alliance of the Word]] is established in [[doc:Sacred Relic]] and deploys probes to the other systems of the community of planets lost to the Jump Gate Shutdown. The organisation also fosters resurgent interest in Jumpgate and generation ship technologies
611 +The [[doc:Alliance of the Word]] is established.
623 623  )))
624 624  |(% rowspan="3" %)(% rowspan="3" %)
625 625  (((
... ... @@ -640,7 +640,7 @@
640 640  )))
641 641  |(% colspan="1" %)(% colspan="1" %)
642 642  (((
643 -Attacks on Xenon installations in Maelstrom by the combined force of the Heart of Albion, Family Ryak and the Argon Government prove a failure with Xenon learning the location of De'vries and Albion.
632 +Attacks on Xenon Installations in Maelstrom by the combined force of the Heart of Albion, Family Ryak and the Argon Government prove a failure with Xenon learning the location of De'vries and Albion.
644 644  )))
645 645  |(% colspan="1" %)(% colspan="1" %)
646 646  (((
... ... @@ -681,7 +681,7 @@
681 681  (SV)
682 682  )))|(% colspan="1" %)(% colspan="1" %)
683 683  (((
684 -The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[doc:Zyarth Patriarchy]] in [[Fires of Defeat/Victory>>doc:Fires of Defeat]]. The Free Families' systems are forced to accomodate Zyarth's police presence.
673 +The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[doc:Zyarth Patriarchy]] in [[Fires of Defeat/Victory>>doc:Fires of Defeat]].
685 685  )))
686 686  |(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)
687 687  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -106890417
1 +106890339
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/106890339/Timeline