Skip to Content

Changes for page Timeline

Last modified by Daniel Turner on 2025/09/10 16:00
From version 19.1
edited by Daniel Turner
on 2020/11/20 07:52
Change comment: There is no comment for this version
To version 18.1
edited by Daniel Turner
on 2020/11/20 07:28
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
... ... @@ -407,7 +407,7 @@
407 407  X3:AP*
408 408  )))|(% colspan="1" %)(% colspan="1" %)
409 409  (((
410 -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
411 411  )))
412 412  |(% colspan="1" %)(% colspan="1" %)
413 413  (((
... ... @@ -433,7 +433,7 @@
433 433  X3:AP
434 434  )))|(% colspan="1" %)(% colspan="1" %)
435 435  (((
436 -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
437 437  )))
438 438  |(% colspan="1" %)(% colspan="1" %)
439 439  (((
... ... @@ -463,19 +463,6 @@
463 463  )))
464 464  |(% colspan="1" %)(% colspan="1" %)
465 465  (((
466 -782
467 -)))|(% colspan="1" %)(% colspan="1" %)
468 -(((
469 -2952
470 -)))|(% colspan="1" %)(% colspan="1" %)
471 -(((
472 -X:R*
473 -)))|(% colspan="1" %)(% colspan="1" %)
474 -(((
475 -[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system
476 -)))
477 -|(% colspan="1" %)(% colspan="1" %)
478 -(((
479 479  801
480 480  )))|(% colspan="1" %)(% colspan="1" %)
481 481  (((
... ... @@ -511,7 +511,7 @@
511 511  X:R
512 512  )))|(% colspan="1" %)(% colspan="1" %)
513 513  (((
514 -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
515 515  )))
516 516  |(% colspan="1" %)(% colspan="1" %)
517 517  (((
... ... @@ -560,9 +560,7 @@
560 560  2995
561 561  )))|(% colspan="1" %)(% colspan="1" %)
562 562  (((
563 -X4:F
564 -
565 -(SV)
548 +X4:F (SV)
566 566  )))|(% colspan="1" %)(% colspan="1" %)
567 567  (((
568 568  The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
... ... @@ -578,7 +578,7 @@
578 578  X4:F
579 579  )))|(% colspan="1" %)(% colspan="1" %)
580 580  (((
581 -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
582 582  )))
583 583  
584 584  
... ... @@ -604,13 +604,6 @@
604 604  )))|(((
605 605  Earth Years /AD/CE
606 606  )))
607 -|(% colspan="1" %)(% colspan="1" %)
608 -(((
609 -*
610 -)))|(% colspan="1" %)(% colspan="1" %)
611 -(((
612 -Prologue
613 -)))
614 614  |(((
615 615  X:Btf
616 616  )))|(((
... ... @@ -646,6 +646,13 @@
646 646  )))
647 647  |(% colspan="1" %)(% colspan="1" %)
648 648  (((
625 +X3:AP*
626 +)))|(% colspan="1" %)(% colspan="1" %)
627 +(((
628 +X3: AP (Prologue)
629 +)))
630 +|(% colspan="1" %)(% colspan="1" %)
631 +(((
649 649  X3:AP
650 650  )))|(% colspan="1" %)(% colspan="1" %)
651 651  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466982
1 +100466981
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466982/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466981/Timeline