Changes for page Timeline

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

From version 29.1
edited by Daniel Turner
on 2021/04/07 00:47
Change comment: There is no comment for this version
To version 23.1
edited by Daniel Turner
on 2020/11/20 08:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -21,7 +21,7 @@
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 26  |(((
27 27  -124
... ... @@ -31,7 +31,7 @@
31 31  (((
32 32  
33 33  )))|(((
34 -The flight of the Winterblossom
34 +The flight of the Winterblossom
35 35  )))
36 36  |(% colspan="1" %)(% colspan="1" %)
37 37  (((
... ... @@ -80,7 +80,7 @@
80 80  
81 81  )))|(% colspan="1" %)(% colspan="1" %)
82 82  (((
83 -The First Terraformer Conflict
83 +The Terraformer Conflict
84 84  )))
85 85  |(% colspan="1" %)(% colspan="1" %)
86 86  (((
... ... @@ -93,7 +93,7 @@
93 93  
94 94  )))|(% colspan="1" %)(% colspan="1" %)
95 95  (((
96 -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
97 97  )))
98 98  |(% colspan="1" %)(% colspan="1" %)
99 99  (((
... ... @@ -106,7 +106,7 @@
106 106  
107 107  )))|(% colspan="1" %)(% colspan="1" %)
108 108  (((
109 -The First Terraformer Conflict ends
109 +The Terraformer Conflict ends
110 110  )))
111 111  |(% colspan="1" %)(% colspan="1" %)
112 112  (((
... ... @@ -158,7 +158,7 @@
158 158  
159 159  )))|(% colspan="1" %)(% colspan="1" %)
160 160  (((
161 -Argon make first contact with the Paranid
161 +First contact with the Paranid
162 162  )))
163 163  |(% colspan="1" %)(% colspan="1" %)
164 164  (((
... ... @@ -184,7 +184,7 @@
184 184  
185 185  )))|(% colspan="1" %)(% colspan="1" %)
186 186  (((
187 -[[doc:Xenon]] destroy the superstation "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
187 +[[doc:Xenon]] destroy the spaceport "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
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 -Argon make first contact with the Boron
213 +First contact with the Boron
214 214  )))
215 215  |(% colspan="1" %)(% colspan="1" %)
216 216  (((
... ... @@ -223,7 +223,7 @@
223 223  
224 224  )))|(% colspan="1" %)(% colspan="1" %)
225 225  (((
226 -Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split
226 +The Boron Campaign
227 227  )))
228 228  |(% colspan="1" %)(% colspan="1" %)
229 229  (((
... ... @@ -329,7 +329,7 @@
329 329  X:T
330 330  )))|(% colspan="1" %)(% colspan="1" %)
331 331  (((
332 -Arrival of Kyle Brennan and //USC X// (Xperimental Shuttle) in the Jump Gate network after a Jump Drive test
332 +Arrival of USC X and Kyle Brennan
333 333  )))
334 334  |(% colspan="1" %)(% colspan="1" %)
335 335  (((
... ... @@ -342,19 +342,6 @@
342 342  
343 343  )))|(% colspan="1" %)(% colspan="1" %)
344 344  (((
345 -Arrival of Elena Kho and //Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X//
346 -)))
347 -|(% colspan="1" %)(% colspan="1" %)
348 -(((
349 -742
350 -)))|(% colspan="1" %)(% colspan="1" %)
351 -(((
352 -2912
353 -)))|(% colspan="1" %)(% colspan="1" %)
354 -(((
355 -
356 -)))|(% colspan="1" %)(% colspan="1" %)
357 -(((
358 358  The Jump Gate network is reconfigured with the [[Teladi>>doc:Teladi Company]] home-world (Ianamus Zura) cut-off
359 359  )))
360 360  |(% colspan="1" %)(% colspan="1" %)
... ... @@ -378,7 +378,7 @@
378 378  2933
379 379  )))|(% colspan="1" %)(% colspan="1" %)
380 380  (((
381 -X2
368 +X2:
382 382  )))|(% colspan="1" %)(% colspan="1" %)
383 383  (((
384 384  The President's End massacre
... ... @@ -391,7 +391,7 @@
391 391  2933
392 392  )))|(% colspan="1" %)(% colspan="1" %)
393 393  (((
394 -X2
381 +X2:
395 395  )))|(% colspan="1" %)(% colspan="1" %)
396 396  (((
397 397  The Battle of Omicron Lyrae
... ... @@ -446,7 +446,7 @@
446 446  X3:TC
447 447  )))|(% colspan="1" %)(% colspan="1" %)
448 448  (((
449 -Relations with the [[Terrans>>doc:Terran Protectorate]] begin to cool
436 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
450 450  )))
451 451  |(% colspan="1" %)(% colspan="1" %)
452 452  (((
... ... @@ -498,7 +498,7 @@
498 498  X3:AP*
499 499  )))|(% colspan="1" %)(% colspan="1" %)
500 500  (((
501 -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]]
488 +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]]
502 502  )))
503 503  |(% colspan="1" %)(% colspan="1" %)
504 504  (((
... ... @@ -547,19 +547,6 @@
547 547  2952
548 548  )))|(% colspan="1" %)(% colspan="1" %)
549 549  (((
550 -X3:AP~*~*
551 -)))|(% colspan="1" %)(% colspan="1" %)
552 -(((
553 -[[Beryll Astrotech>>doc:XRWIKI.Beryll]] unleashes a new AGI threat on Sol from reverse engineered Xenon fighters
554 -)))
555 -|(% colspan="1" %)(% colspan="1" %)
556 -(((
557 -782
558 -)))|(% colspan="1" %)(% colspan="1" %)
559 -(((
560 -2952
561 -)))|(% colspan="1" %)(% colspan="1" %)
562 -(((
563 563  
564 564  )))|(% colspan="1" %)(% colspan="1" %)
565 565  (((
... ... @@ -567,19 +567,6 @@
567 567  )))
568 568  |(% colspan="1" %)(% colspan="1" %)
569 569  (((
570 -~~782
571 -)))|(% colspan="1" %)(% colspan="1" %)
572 -(((
573 -2952
574 -)))|(% colspan="1" %)(% colspan="1" %)
575 -(((
576 -
577 -)))|(% colspan="1" %)(% colspan="1" %)
578 -(((
579 -USC and ATF are reformed into the Terran Protectorate
580 -)))
581 -|(% colspan="1" %)(% colspan="1" %)
582 -(((
583 583  782
584 584  )))|(% colspan="1" %)(% colspan="1" %)
585 585  (((
... ... @@ -628,7 +628,7 @@
628 628  X:R
629 629  )))|(% colspan="1" %)(% colspan="1" %)
630 630  (((
631 -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
592 +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
632 632  )))
633 633  |(% colspan="1" %)(% colspan="1" %)
634 634  (((
... ... @@ -704,8 +704,6 @@
704 704  {{/layout-cell}}
705 705  
706 706  {{layout-cell}}
707 -
708 -
709 709  Legend
710 710  
711 711  |=(((
... ... @@ -730,13 +730,6 @@
730 730  (((
731 731  Prologue
732 732  )))
733 -|(% colspan="1" %)(% colspan="1" %)
734 -(((
735 -~*~*
736 -)))|(% colspan="1" %)(% colspan="1" %)
737 -(((
738 -Epilogue / Immediately after story events of game
739 -)))
740 740  |(((
741 741  X:Btf
742 742  )))|(((
... ... @@ -779,13 +779,6 @@
779 779  )))
780 780  |(% colspan="1" %)(% colspan="1" %)
781 781  (((
782 -X3:FL
783 -)))|(% colspan="1" %)(% colspan="1" %)
784 -(((
785 -X3: Farnham's Legacy (2021)
786 -)))
787 -|(% colspan="1" %)(% colspan="1" %)
788 -(((
789 789  X:R
790 790  )))|(% colspan="1" %)(% colspan="1" %)
791 791  (((
... ... @@ -810,7 +810,7 @@
810 810  (CoH)
811 811  )))|(% colspan="1" %)(% colspan="1" %)
812 812  (((
813 -X4: Foundations Cradle of Humanity DLC (2021)
758 +X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
814 814  )))
815 815  {{/layout-cell}}
816 816  {{/layout-section}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -102367647
1 +100466986
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/102367647/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466986/Timeline