Changes for page Timeline

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

From version 20.1
edited by Daniel Turner
on 2020/11/20 08:06
Change comment: There is no comment for this version
To version 16.1
edited by Daniel Turner
on 2020/11/19 12:06
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -298,9 +298,7 @@
298 298  2912
299 299  )))|(% colspan="1" %)(% colspan="1" %)
300 300  (((
301 -X:Btf /
302 -
303 -X:T
301 +X:Btf / X:T
304 304  )))|(% colspan="1" %)(% colspan="1" %)
305 305  (((
306 306  Arrival of USC X and Kyle Brennan
... ... @@ -307,19 +307,6 @@
307 307  )))
308 308  |(% colspan="1" %)(% colspan="1" %)
309 309  (((
310 -742
311 -)))|(% colspan="1" %)(% colspan="1" %)
312 -(((
313 -2912
314 -)))|(% colspan="1" %)(% colspan="1" %)
315 -(((
316 -
317 -)))|(% colspan="1" %)(% colspan="1" %)
318 -(((
319 -The Jump Gate network is reconfigured with the [[Teladi>>doc:Teladi Company]] home-world (Ianamus Zura) cut-off
320 -)))
321 -|(% colspan="1" %)(% colspan="1" %)
322 -(((
323 323  763
324 324  )))|(% colspan="1" %)(% colspan="1" %)
325 325  (((
... ... @@ -420,7 +420,7 @@
420 420  X3:AP*
421 421  )))|(% colspan="1" %)(% colspan="1" %)
422 422  (((
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]]
408 +The Terran Conflict
424 424  )))
425 425  |(% colspan="1" %)(% colspan="1" %)
426 426  (((
... ... @@ -446,7 +446,7 @@
446 446  X3:AP
447 447  )))|(% colspan="1" %)(% colspan="1" %)
448 448  (((
449 -Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
434 +Plutarch gains influence over the Albion system
450 450  )))
451 451  |(% colspan="1" %)(% colspan="1" %)
452 452  (((
... ... @@ -476,19 +476,6 @@
476 476  )))
477 477  |(% colspan="1" %)(% colspan="1" %)
478 478  (((
479 -782
480 -)))|(% colspan="1" %)(% colspan="1" %)
481 -(((
482 -2952
483 -)))|(% colspan="1" %)(% colspan="1" %)
484 -(((
485 -X:R*
486 -)))|(% colspan="1" %)(% colspan="1" %)
487 -(((
488 -[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system
489 -)))
490 -|(% colspan="1" %)(% colspan="1" %)
491 -(((
492 492  801
493 493  )))|(% colspan="1" %)(% colspan="1" %)
494 494  (((
... ... @@ -524,7 +524,7 @@
524 524  X:R
525 525  )))|(% colspan="1" %)(% colspan="1" %)
526 526  (((
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
499 +A treaty is signed between the remnants of the Argon Government, Heart of Albion and Canterran Republic, bringing an end to the Terran Conflict
528 528  )))
529 529  |(% colspan="1" %)(% colspan="1" %)
530 530  (((
... ... @@ -563,7 +563,7 @@
563 563  X4:F
564 564  )))|(% colspan="1" %)(% colspan="1" %)
565 565  (((
566 -Boso Ta escapes Split capture and steals a Terran Science Station
538 +Boso Ta escapes Split capture
567 567  )))
568 568  |(% colspan="1" %)(% colspan="1" %)
569 569  (((
... ... @@ -573,9 +573,7 @@
573 573  2995
574 574  )))|(% colspan="1" %)(% colspan="1" %)
575 575  (((
576 -X4:F
577 -
578 -(SV)
548 +X4:F (SV)
579 579  )))|(% colspan="1" %)(% colspan="1" %)
580 580  (((
581 581  The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
... ... @@ -591,7 +591,7 @@
591 591  X4:F
592 592  )))|(% colspan="1" %)(% colspan="1" %)
593 593  (((
594 -The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
564 +The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with Argon Federation Support
595 595  )))
596 596  
597 597  
... ... @@ -617,13 +617,6 @@
617 617  )))|(((
618 618  Earth Years /AD/CE
619 619  )))
620 -|(% colspan="1" %)(% colspan="1" %)
621 -(((
622 -*
623 -)))|(% colspan="1" %)(% colspan="1" %)
624 -(((
625 -Prologue
626 -)))
627 627  |(((
628 628  X:Btf
629 629  )))|(((
... ... @@ -659,6 +659,13 @@
659 659  )))
660 660  |(% colspan="1" %)(% colspan="1" %)
661 661  (((
625 +X3:AP*
626 +)))|(% colspan="1" %)(% colspan="1" %)
627 +(((
628 +X3: AP (Prologue)
629 +)))
630 +|(% colspan="1" %)(% colspan="1" %)
631 +(((
662 662  X3:AP
663 663  )))|(% colspan="1" %)(% colspan="1" %)
664 664  (((
... ... @@ -685,13 +685,6 @@
685 685  (((
686 686  X4: Foundations Split Vendetta DLC (2020)
687 687  )))
688 -|(% colspan="1" %)(% colspan="1" %)
689 -(((
690 -(CoH)
691 -)))|(% colspan="1" %)(% colspan="1" %)
692 -(((
693 -X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
694 -)))
695 695  {{/layout-cell}}
696 696  {{/layout-section}}
697 697  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466983
1 +100466963
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466983/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466963/Timeline