Changes for page Timeline

Last modified by Daniel Turner on 2025/09/10 16:00

From version 30.1
edited by Daniel Turner
on 2021/04/07 00:56
Change comment: There is no comment for this version
To version 22.1
edited by Daniel Turner
on 2020/11/20 08:20
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -21,21 +21,8 @@
21 21  (((
22 22  
23 23  )))|(((
24 -Earth scientists create Jump Gates (2 billion years after 'The Ancients' created the main Jump Gate network).
24 +Earth scientists create Jump Gates
25 25  )))
26 -|(% colspan="1" %)(% colspan="1" %)
27 -(((
28 --124
29 -)))|(% colspan="1" %)(% colspan="1" %)
30 -(((
31 -2046
32 -)))|(% colspan="1" %)(% colspan="1" %)
33 -(((
34 -
35 -)))|(% colspan="1" %)(% colspan="1" %)
36 -(((
37 -An Earth-built Jump Gate connects to a Jump Gate already in Alpha Centauri (Brennan's Triumph) revealing 'The Ancients' Jump Gate network
38 -)))
39 39  |(((
40 40  -124
41 41  )))|(((
... ... @@ -44,23 +44,10 @@
44 44  (((
45 45  
46 46  )))|(((
47 -The flight of the Winterblossom to explore the Jump Gate Network lead by René Farnham\\
34 +The flight of the Winterblossom
48 48  )))
49 49  |(% colspan="1" %)(% colspan="1" %)
50 50  (((
51 --122
52 -)))|(% colspan="1" %)(% colspan="1" %)
53 -(((
54 -2048
55 -)))|(% colspan="1" %)(% colspan="1" %)
56 -(((
57 -
58 -)))|(% colspan="1" %)(% colspan="1" %)
59 -(((
60 -The Winterblossom is recalled
61 -)))
62 -|(% colspan="1" %)(% colspan="1" %)
63 -(((
64 64  -118
65 65  )))|(% colspan="1" %)(% colspan="1" %)
66 66  (((
... ... @@ -106,7 +106,7 @@
106 106  
107 107  )))|(% colspan="1" %)(% colspan="1" %)
108 108  (((
109 -The First Terraformer Conflict
83 +The Terraformer Conflict
110 110  )))
111 111  |(% colspan="1" %)(% colspan="1" %)
112 112  (((
... ... @@ -119,7 +119,7 @@
119 119  
120 120  )))|(% colspan="1" %)(% colspan="1" %)
121 121  (((
122 -The Earth Jump Gate is destroyed to protect Earth and it's remains orbit Mars
96 +The Earth Jump Gate is destroyed to protect Earth
123 123  )))
124 124  |(% colspan="1" %)(% colspan="1" %)
125 125  (((
... ... @@ -132,7 +132,7 @@
132 132  
133 133  )))|(% colspan="1" %)(% colspan="1" %)
134 134  (((
135 -The First Terraformer Conflict ends
109 +The Terraformer Conflict ends
136 136  )))
137 137  |(% colspan="1" %)(% colspan="1" %)
138 138  (((
... ... @@ -145,36 +145,10 @@
145 145  
146 146  )))|(% colspan="1" %)(% colspan="1" %)
147 147  (((
148 -Earth is removed from the history of the Terraformer Conflict's survivors
122 +Earth is removed from the history of the conflict's survivors who go on to from the [[doc:Argon Federation]]
149 149  )))
150 150  |(% colspan="1" %)(% colspan="1" %)
151 151  (((
152 -103
153 -)))|(% colspan="1" %)(% colspan="1" %)
154 -(((
155 -2273
156 -)))|(% colspan="1" %)(% colspan="1" %)
157 -(((
158 -
159 -)))|(% colspan="1" %)(% colspan="1" %)
160 -(((
161 -Terraformer Conflict survivors relocate to the 4th planet in the Sonra System, named Argon Prime after Nathan R. Gunne
162 -)))
163 -|(% colspan="1" %)(% colspan="1" %)
164 -(((
165 -103
166 -)))|(% colspan="1" %)(% colspan="1" %)
167 -(((
168 -2273
169 -)))|(% colspan="1" %)(% colspan="1" %)
170 -(((
171 -
172 -)))|(% colspan="1" %)(% colspan="1" %)
173 -(((
174 -The [[doc:Argon Federation]] is established
175 -)))
176 -|(% colspan="1" %)(% colspan="1" %)
177 -(((
178 178  130
179 179  )))|(% colspan="1" %)(% colspan="1" %)
180 180  (((
... ... @@ -184,7 +184,7 @@
184 184  
185 185  )))|(% colspan="1" %)(% colspan="1" %)
186 186  (((
187 -Argon make first contact with the Paranid
135 +First contact with the Paranid
188 188  )))
189 189  |(% colspan="1" %)(% colspan="1" %)
190 190  (((
... ... @@ -210,7 +210,7 @@
210 210  
211 211  )))|(% colspan="1" %)(% colspan="1" %)
212 212  (((
213 -[[doc:Xenon]] destroy the superstation "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
161 +[[doc:Xenon]] destroy the spaceport "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
214 214  )))
215 215  |(% colspan="1" %)(% colspan="1" %)
216 216  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -Argon make first contact with the Boron
187 +First contact with the Boron
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -249,7 +249,7 @@
249 249  
250 250  )))|(% colspan="1" %)(% colspan="1" %)
251 251  (((
252 -Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split
200 +The Boron Campaign
253 253  )))
254 254  |(% colspan="1" %)(% colspan="1" %)
255 255  (((
... ... @@ -288,7 +288,7 @@
288 288  
289 289  )))|(% colspan="1" %)(% colspan="1" %)
290 290  (((
291 -First contact with the [[Teladi>>doc:Teladi Company]]
239 +First contact with [[Teladi>>doc:Teladi Company]]
292 292  )))
293 293  |(% colspan="1" %)(% colspan="1" %)
294 294  (((
... ... @@ -355,7 +355,7 @@
355 355  X:T
356 356  )))|(% colspan="1" %)(% colspan="1" %)
357 357  (((
358 -Arrival of Kyle Brennan and //USC X// (Xperimental Shuttle) in the Jump Gate network after a Jump Drive test
306 +Arrival of USC X and Kyle Brennan
359 359  )))
360 360  |(% colspan="1" %)(% colspan="1" %)
361 361  (((
... ... @@ -368,19 +368,6 @@
368 368  
369 369  )))|(% colspan="1" %)(% colspan="1" %)
370 370  (((
371 -Arrival of Elena Kho and //Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X//
372 -)))
373 -|(% colspan="1" %)(% colspan="1" %)
374 -(((
375 -742
376 -)))|(% colspan="1" %)(% colspan="1" %)
377 -(((
378 -2912
379 -)))|(% colspan="1" %)(% colspan="1" %)
380 -(((
381 -
382 -)))|(% colspan="1" %)(% colspan="1" %)
383 -(((
384 384  The Jump Gate network is reconfigured with the [[Teladi>>doc:Teladi Company]] home-world (Ianamus Zura) cut-off
385 385  )))
386 386  |(% colspan="1" %)(% colspan="1" %)
... ... @@ -404,7 +404,7 @@
404 404  2933
405 405  )))|(% colspan="1" %)(% colspan="1" %)
406 406  (((
407 -X2
342 +X2:
408 408  )))|(% colspan="1" %)(% colspan="1" %)
409 409  (((
410 410  The President's End massacre
... ... @@ -417,7 +417,7 @@
417 417  2933
418 418  )))|(% colspan="1" %)(% colspan="1" %)
419 419  (((
420 -X2
355 +X2:
421 421  )))|(% colspan="1" %)(% colspan="1" %)
422 422  (((
423 423  The Battle of Omicron Lyrae
... ... @@ -443,36 +443,10 @@
443 443  2934
444 444  )))|(% colspan="1" %)(% colspan="1" %)
445 445  (((
446 -X3:R
447 -)))|(% colspan="1" %)(% colspan="1" %)
448 -(((
449 -The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jump Gate Network
450 -)))
451 -|(% colspan="1" %)(% colspan="1" %)
452 -(((
453 -764
454 -)))|(% colspan="1" %)(% colspan="1" %)
455 -(((
456 -2934
457 -)))|(% colspan="1" %)(% colspan="1" %)
458 -(((
459 -
460 -)))|(% colspan="1" %)(% colspan="1" %)
461 -(((
462 -The Earth Jump Gate is relocated to the Asteroid Belt
463 -)))
464 -|(% colspan="1" %)(% colspan="1" %)
465 -(((
466 -764
467 -)))|(% colspan="1" %)(% colspan="1" %)
468 -(((
469 -2934
470 -)))|(% colspan="1" %)(% colspan="1" %)
471 -(((
472 472  X3:TC
473 473  )))|(% colspan="1" %)(% colspan="1" %)
474 474  (((
475 -Relations with the [[Terrans>>doc:Terran Protectorate]] begin to cool
384 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
476 476  )))
477 477  |(% colspan="1" %)(% colspan="1" %)
478 478  (((
... ... @@ -489,19 +489,6 @@
489 489  )))
490 490  |(% colspan="1" %)(% colspan="1" %)
491 491  (((
492 -764
493 -)))|(% colspan="1" %)(% colspan="1" %)
494 -(((
495 -2934
496 -)))|(% colspan="1" %)(% colspan="1" %)
497 -(((
498 -X3:TC
499 -)))|(% colspan="1" %)(% colspan="1" %)
500 -(((
501 -The Xenon Hub is discovered
502 -)))
503 -|(% colspan="1" %)(% colspan="1" %)
504 -(((
505 505  770
506 506  )))|(% colspan="1" %)(% colspan="1" %)
507 507  (((
... ... @@ -524,7 +524,7 @@
524 524  X3:AP*
525 525  )))|(% colspan="1" %)(% colspan="1" %)
526 526  (((
527 -The Terran Conflict begins between the [[Terrans >>doc:Terran Protectorate]]and their Argon cousins, The Community of Planets later joins in support of the [[doc:Argon Federation]]
423 +The Terran Conflict begins between the [[Terrans >>doc:Terran Faction 1]]and their Argon cousins, The Community of Planets later joins in support of the [[doc:Argon Federation]]
528 528  )))
529 529  |(% colspan="1" %)(% colspan="1" %)
530 530  (((
... ... @@ -573,19 +573,6 @@
573 573  2952
574 574  )))|(% colspan="1" %)(% colspan="1" %)
575 575  (((
576 -X3:AP~*~*
577 -)))|(% colspan="1" %)(% colspan="1" %)
578 -(((
579 -[[Beryll Astrotech>>doc:XRWIKI.Beryll]] unleashes a new AGI threat on Sol from reverse engineered Xenon fighters
580 -)))
581 -|(% colspan="1" %)(% colspan="1" %)
582 -(((
583 -782
584 -)))|(% colspan="1" %)(% colspan="1" %)
585 -(((
586 -2952
587 -)))|(% colspan="1" %)(% colspan="1" %)
588 -(((
589 589  
590 590  )))|(% colspan="1" %)(% colspan="1" %)
591 591  (((
... ... @@ -593,19 +593,6 @@
593 593  )))
594 594  |(% colspan="1" %)(% colspan="1" %)
595 595  (((
596 -~~782
597 -)))|(% colspan="1" %)(% colspan="1" %)
598 -(((
599 -2952
600 -)))|(% colspan="1" %)(% colspan="1" %)
601 -(((
602 -
603 -)))|(% colspan="1" %)(% colspan="1" %)
604 -(((
605 -USC and ATF are reformed into the Terran Protectorate
606 -)))
607 -|(% colspan="1" %)(% colspan="1" %)
608 -(((
609 609  782
610 610  )))|(% colspan="1" %)(% colspan="1" %)
611 611  (((
... ... @@ -654,7 +654,7 @@
654 654  X:R
655 655  )))|(% colspan="1" %)(% colspan="1" %)
656 656  (((
657 -A treaty is signed between the remnants of the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The [[Republic of Canterra>>doc:XRWIKI.Republic of Cantera]], bringing an end to the Terran Conflict
527 +A treaty is signed between the remnants of the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The Republic of Canterra, bringing an end to the Terran Conflict
658 658  )))
659 659  |(% colspan="1" %)(% colspan="1" %)
660 660  (((
... ... @@ -730,8 +730,6 @@
730 730  {{/layout-cell}}
731 731  
732 732  {{layout-cell}}
733 -
734 -
735 735  Legend
736 736  
737 737  |=(((
... ... @@ -756,13 +756,6 @@
756 756  (((
757 757  Prologue
758 758  )))
759 -|(% colspan="1" %)(% colspan="1" %)
760 -(((
761 -~*~*
762 -)))|(% colspan="1" %)(% colspan="1" %)
763 -(((
764 -Epilogue / Immediately after story events of game
765 -)))
766 766  |(((
767 767  X:Btf
768 768  )))|(((
... ... @@ -805,13 +805,6 @@
805 805  )))
806 806  |(% colspan="1" %)(% colspan="1" %)
807 807  (((
808 -X3:FL
809 -)))|(% colspan="1" %)(% colspan="1" %)
810 -(((
811 -X3: Farnham's Legacy (2021)
812 -)))
813 -|(% colspan="1" %)(% colspan="1" %)
814 -(((
815 815  X:R
816 816  )))|(% colspan="1" %)(% colspan="1" %)
817 817  (((
... ... @@ -836,7 +836,7 @@
836 836  (CoH)
837 837  )))|(% colspan="1" %)(% colspan="1" %)
838 838  (((
839 -X4: Foundations Cradle of Humanity DLC (2021)
693 +X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
840 840  )))
841 841  {{/layout-cell}}
842 842  {{/layout-section}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -102367725
1 +100466985
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/102367725/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466985/Timeline