Changes for page Timeline

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

From version 52.1
edited by Daniel Turner
on 2021/11/04 07:15
Change comment: There is no comment for this version
To version 53.1
edited by Daniel Turner
on 2021/11/04 07:31
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -329,13 +329,13 @@
329 329  (((
330 330  A sole (% class="confluence-link" %)enon[[x>>doc:Xenon]](%%) ship enters [[doc:Sol]] using a "Gateless Jumpdrive". Terran engineers begin reverse-engineering the drive for the //USC X.//
331 331  )))
332 -|(% colspan="1" %)(% colspan="1" %)
332 +|(% rowspan="5" %)(% rowspan="5" %)
333 333  (((
334 334  742
335 -)))|(% colspan="1" %)(% colspan="1" %)
335 +)))|(% rowspan="5" %)(% rowspan="5" %)
336 336  (((
337 337  2912
338 -)))|(% colspan="1" %)(% colspan="1" %)
338 +)))|(% class="highlight-green" data-highlight-colour="green" rowspan="3" %)(% class="highlight-green" data-highlight-colour="green" rowspan="3" %)
339 339  (((
340 340  X:Btf /
341 341  
... ... @@ -346,27 +346,14 @@
346 346  )))
347 347  |(% colspan="1" %)(% colspan="1" %)
348 348  (((
349 -742
350 -)))|(% colspan="1" %)(% colspan="1" %)
349 +Arrival of Elena Kho and //USC Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X.//
350 +)))
351 +|(% colspan="1" %)(% colspan="1" %)
351 351  (((
352 -2912
353 -)))|(% colspan="1" %)(% colspan="1" %)
354 -(((
355 -X:Btf /
356 -
357 -X:T
358 -)))|(% colspan="1" %)(% colspan="1" %)
359 -(((
360 -Arrival of Elena Kho and  //USC Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X.//
353 +**Second Xenon Conflict:** The Xenon are ejected from the North-Western region of the old Jump Gate network.
361 361  )))
362 362  |(% colspan="1" %)(% colspan="1" %)
363 363  (((
364 -742
365 -)))|(% colspan="1" %)(% colspan="1" %)
366 -(((
367 -2912
368 -)))|(% colspan="1" %)(% colspan="1" %)
369 -(((
370 370  
371 371  )))|(% colspan="1" %)(% colspan="1" %)
372 372  (((
... ... @@ -374,21 +374,15 @@
374 374  )))
375 375  |(% colspan="1" %)(% colspan="1" %)
376 376  (((
377 -742
378 -)))|(% colspan="1" %)(% colspan="1" %)
379 -(((
380 -2912
381 -)))|(% colspan="1" %)(% colspan="1" %)
382 -(((
383 383  
384 384  )))|(% colspan="1" %)(% colspan="1" %)
385 385  (((
386 386  Rhonkar t’Ncct deposes Chin t’Thhg to become Patriarch of All Split. Family Chin's territories are annexed by the emergent Family Rhonkar. Rhonkar leads the Split Families for 40 years until the Jump Gate Shutdown.
387 387  )))
388 -|(% colspan="1" %)(% colspan="1" %)
369 +|(% rowspan="2" %)(% rowspan="2" %)
389 389  (((
390 390  743
391 -)))|(% colspan="1" %)(% colspan="1" %)
372 +)))|(% rowspan="2" %)(% rowspan="2" %)
392 392  (((
393 393  2913
394 394  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -400,12 +400,6 @@
400 400  )))
401 401  |(% colspan="1" %)(% colspan="1" %)
402 402  (((
403 -743
404 -)))|(% colspan="1" %)(% colspan="1" %)
405 -(((
406 -2913
407 -)))|(% colspan="1" %)(% colspan="1" %)
408 -(((
409 409  
410 410  )))|(% colspan="1" %)(% colspan="1" %)
411 411  (((
... ... @@ -424,10 +424,10 @@
424 424  (((
425 425  Work begins on assembling the Torus Aeternal, the immense defence and logistics ring protecting Earth from any possible threats.
426 426  )))
427 -|(% colspan="1" %)(% colspan="1" %)
402 +|(% rowspan="3" %)(% rowspan="3" %)
428 428  (((
429 429  763
430 -)))|(% colspan="1" %)(% colspan="1" %)
405 +)))|(% rowspan="3" %)(% rowspan="3" %)
431 431  (((
432 432  2933
433 433  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -437,14 +437,8 @@
437 437  (((
438 438  First contact with the [[Kha'ak>>doc:Kha'ak]].
439 439  )))
440 -|(% colspan="1" %)(% colspan="1" %)
415 +|(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)
441 441  (((
442 -763
443 -)))|(% colspan="1" %)(% colspan="1" %)
444 -(((
445 -2933
446 -)))|(% colspan="1" %)(% colspan="1" %)
447 -(((
448 448  X2
449 449  )))|(% colspan="1" %)(% colspan="1" %)
450 450  (((
... ... @@ -452,24 +452,15 @@
452 452  )))
453 453  |(% colspan="1" %)(% colspan="1" %)
454 454  (((
455 -763
456 -)))|(% colspan="1" %)(% colspan="1" %)
457 -(((
458 -2933
459 -)))|(% colspan="1" %)(% colspan="1" %)
460 -(((
461 -X2
462 -)))|(% colspan="1" %)(% colspan="1" %)
463 -(((
464 464  The Battle of Omicron Lyrae: An immense Kha'ak fleet and planet killer ship attempts to raze Omicron Lyrae.
465 465  )))
466 -|(% colspan="1" %)(% colspan="1" %)
426 +|(% rowspan="7" %)(% rowspan="7" %)
467 467  (((
468 468  764
469 -)))|(% colspan="1" %)(% colspan="1" %)
429 +)))|(% rowspan="7" %)(% rowspan="7" %)
470 470  (((
471 471  2934
472 -)))|(% colspan="1" %)(% colspan="1" %)
432 +)))|(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)
473 473  (((
474 474  X3:R
475 475  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -478,38 +478,17 @@
478 478  )))
479 479  |(% colspan="1" %)(% colspan="1" %)
480 480  (((
481 -764
482 -)))|(% colspan="1" %)(% colspan="1" %)
483 -(((
484 -2934
485 -)))|(% colspan="1" %)(% colspan="1" %)
486 -(((
487 -X3:R
488 -)))|(% colspan="1" %)(% colspan="1" %)
489 -(((
490 490  The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jump Gate network. The Earth Government is invited to join the Argon Federation, Earth declines.
491 491  )))
492 492  |(% colspan="1" %)(% colspan="1" %)
493 493  (((
494 -764
495 -)))|(% colspan="1" %)(% colspan="1" %)
496 -(((
497 -2934
498 -)))|(% colspan="1" %)(% colspan="1" %)
499 -(((
500 500  
501 501  )))|(% colspan="1" %)(% colspan="1" %)
502 502  (((
503 503  The Earth Jump Gate is relocated to the [[doc:Asteroid Belt]] to protect Earth.
504 504  )))
505 -|(% colspan="1" %)(% colspan="1" %)
450 +|(% class="highlight-green" data-highlight-colour="green" rowspan="4" %)(% class="highlight-green" data-highlight-colour="green" rowspan="4" %)
506 506  (((
507 -764
508 -)))|(% colspan="1" %)(% colspan="1" %)
509 -(((
510 -2934
511 -)))|(% colspan="1" %)(% colspan="1" %)
512 -(((
513 513  X3:TC
514 514  )))|(% colspan="1" %)(% colspan="1" %)
515 515  (((
... ... @@ -517,41 +517,14 @@
517 517  )))
518 518  |(% colspan="1" %)(% colspan="1" %)
519 519  (((
520 -764
521 -)))|(% colspan="1" %)(% colspan="1" %)
522 -(((
523 -2934
524 -)))|(% colspan="1" %)(% colspan="1" %)
525 -(((
526 -X3:TC
527 -)))|(% colspan="1" %)(% colspan="1" %)
528 -(((
529 529  **Operation Final Fury:** The Argon Navy wipes out all known [[Kha'ak>>doc:Kha'ak]] hives. Attacks become far more infrequent.
530 530  )))
531 531  |(% colspan="1" %)(% colspan="1" %)
532 532  (((
533 -764
534 -)))|(% colspan="1" %)(% colspan="1" %)
535 -(((
536 -2934
537 -)))|(% colspan="1" %)(% colspan="1" %)
538 -(((
539 -X3:TC
540 -)))|(% colspan="1" %)(% colspan="1" %)
541 -(((
542 542  The Xenon Hub is discovered by Bala Gi and Julian Brennan. The device is capable of realigning jumpgates in pairs to its 6 gates.
543 543  )))
544 544  |(% colspan="1" %)(% colspan="1" %)
545 545  (((
546 -764
547 -)))|(% colspan="1" %)(% colspan="1" %)
548 -(((
549 -2934
550 -)))|(% colspan="1" %)(% colspan="1" %)
551 -(((
552 -X3:TC
553 -)))|(% colspan="1" %)(% colspan="1" %)
554 -(((
555 555  The Terran lost colony of Aldrin (same as the Free State of Solara) is rediscovered with Terraformers and Humans living in harmony in the system. Aldrin's Gates are re-opened leading to colonies including Megnir and [[doc:Segaris]] that had been razed during the First Terraformer Conflict.
556 556  )))
557 557  |(% colspan="1" %)(% colspan="1" %)
... ... @@ -599,7 +599,7 @@
599 599  )))|(% colspan="1" %)(% colspan="1" %)
600 600  (((
601 601  2944
602 -)))|(% colspan="1" %)(% colspan="1" %)
514 +)))|(% class="highlight-yellow" data-highlight-colour="yellow" rowspan="2" %)(% class="highlight-yellow" data-highlight-colour="yellow" rowspan="2" %)
603 603  (((
604 604  X3:AP*
605 605  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -606,27 +606,18 @@
606 606  (((
607 607  **Terran Conflict:** War begins between the [[Terrans >>doc:Terran Protectorate]]and their Argon cousins over the latter's continued usage of AGI. The remainder of the Community of Planets later joins in support of the [[doc:Argon Federation]].
608 608  )))
609 -|(% colspan="1" %)(% colspan="1" %)
521 +|(% rowspan="2" %)(% rowspan="2" %)
610 610  (((
611 611  778
612 -)))|(% colspan="1" %)(% colspan="1" %)
524 +)))|(% rowspan="2" %)(% rowspan="2" %)
613 613  (((
614 614  2948
615 615  )))|(% colspan="1" %)(% colspan="1" %)
616 616  (((
617 -X3:AP*
618 -)))|(% colspan="1" %)(% colspan="1" %)
619 -(((
620 620  The destruction of the Torus Aeternal occurs escalating the Terran Conflict. The vast majority of its remains are recycled during the Jump Gate Shutdown.
621 621  )))
622 -|(% colspan="1" %)(% colspan="1" %)
531 +|(% class="highlight-green" colspan="1" data-highlight-colour="green" %)(% class="highlight-green" colspan="1" data-highlight-colour="green" %)
623 623  (((
624 -778
625 -)))|(% colspan="1" %)(% colspan="1" %)
626 -(((
627 -2948
628 -)))|(% colspan="1" %)(% colspan="1" %)
629 -(((
630 630  X3:AP
631 631  )))|(% colspan="1" %)(% colspan="1" %)
632 632  (((
... ... @@ -638,7 +638,7 @@
638 638  )))|(% colspan="1" %)(% colspan="1" %)
639 639  (((
640 640  2950
641 -)))|(% colspan="1" %)(% colspan="1" %)
544 +)))|(% class="highlight-green" colspan="1" data-highlight-colour="green" %)(% class="highlight-green" colspan="1" data-highlight-colour="green" %)
642 642  (((
643 643  X3:FL
644 644  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -677,7 +677,7 @@
677 677  )))|(% colspan="1" %)(% colspan="1" %)
678 678  (((
679 679  2952
680 -)))|(% colspan="1" %)(% colspan="1" %)
583 +)))|(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)
681 681  (((
682 682  X:R*
683 683  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -697,13 +697,13 @@
697 697  (((
698 698  The [[doc:Alliance of the Word]] is established.
699 699  )))
700 -|(% colspan="1" %)(% colspan="1" %)
603 +|(% rowspan="3" %)(% rowspan="3" %)
701 701  (((
702 702  803
703 -)))|(% colspan="1" %)(% colspan="1" %)
606 +)))|(% rowspan="3" %)(% rowspan="3" %)
704 704  (((
705 705  2973
706 -)))|(% colspan="1" %)(% colspan="1" %)
609 +)))|(% class="highlight-green" data-highlight-colour="green" rowspan="3" %)(% class="highlight-green" data-highlight-colour="green" rowspan="3" %)
707 707  (((
708 708  X:R
709 709  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -712,28 +712,10 @@
712 712  )))
713 713  |(% colspan="1" %)(% colspan="1" %)
714 714  (((
715 -803
716 -)))|(% colspan="1" %)(% colspan="1" %)
717 -(((
718 -2973
719 -)))|(% colspan="1" %)(% colspan="1" %)
720 -(((
721 -X:R
722 -)))|(% colspan="1" %)(% colspan="1" %)
723 -(((
724 724  A treaty is signed between the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The [[Republic of Canterra>>doc:XRWIKI.Republic of Cantera]], bringing a formal end to the Terran Conflict.
725 725  )))
726 726  |(% colspan="1" %)(% colspan="1" %)
727 727  (((
728 -803
729 -)))|(% colspan="1" %)(% colspan="1" %)
730 -(((
731 -2973
732 -)))|(% colspan="1" %)(% colspan="1" %)
733 -(((
734 -X:R
735 -)))|(% colspan="1" %)(% colspan="1" %)
736 -(((
737 737  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.
738 738  )))
739 739  |(% colspan="1" %)(% colspan="1" %)
... ... @@ -742,7 +742,7 @@
742 742  )))|(% colspan="1" %)(% colspan="1" %)
743 743  (((
744 744  ~~2985
745 -)))|(% colspan="1" %)(% colspan="1" %)
630 +)))|(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)
746 746  (((
747 747  X4:F*
748 748  )))|(% colspan="1" %)(% colspan="1" %)
... ... @@ -762,13 +762,13 @@
762 762  (((
763 763  **The Gate Network Stabilises**
764 764  )))
765 -|(% colspan="1" %)(% colspan="1" %)
650 +|(% rowspan="3" %)(% rowspan="3" %)
766 766  (((
767 767  825
768 -)))|(% colspan="1" %)(% colspan="1" %)
653 +)))|(% rowspan="3" %)(% rowspan="3" %)
769 769  (((
770 770  2995
771 -)))|(% colspan="1" %)(% colspan="1" %)
656 +)))|(% class="highlight-green" colspan="1" data-highlight-colour="green" %)(% class="highlight-green" colspan="1" data-highlight-colour="green" %)
772 772  (((
773 773  X4:F
774 774  
... ... @@ -777,14 +777,8 @@
777 777  (((
778 778  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]].
779 779  )))
780 -|(% colspan="1" %)(% colspan="1" %)
665 +|(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)
781 781  (((
782 -825
783 -)))|(% colspan="1" %)(% colspan="1" %)
784 -(((
785 -2995
786 -)))|(% colspan="1" %)(% colspan="1" %)
787 -(((
788 788  X4:F
789 789  )))|(% colspan="1" %)(% colspan="1" %)
790 790  (((
... ... @@ -792,15 +792,6 @@
792 792  )))
793 793  |(% colspan="1" %)(% colspan="1" %)
794 794  (((
795 -825
796 -)))|(% colspan="1" %)(% colspan="1" %)
797 -(((
798 -2995
799 -)))|(% colspan="1" %)(% colspan="1" %)
800 -(((
801 -X4:F
802 -)))|(% colspan="1" %)(% colspan="1" %)
803 -(((
804 804  The [[doc:Hatikvah Free League]] breaks away from illicit dealings with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] support.
805 805  )))
806 806  
... ... @@ -932,6 +932,20 @@
932 932  (((
933 933  X4: Foundations //Cradle of Humanity// DLC (2021)
934 934  )))
805 +|(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)
806 +(((
807 +
808 +)))|(% colspan="1" %)(% colspan="1" %)
809 +(((
810 +Prologue/Epilogue
811 +)))
812 +|(% class="highlight-green" colspan="1" data-highlight-colour="green" %)(% class="highlight-green" colspan="1" data-highlight-colour="green" %)
813 +(((
814 +
815 +)))|(% colspan="1" %)(% colspan="1" %)
816 +(((
817 +Game
818 +)))
935 935  {{/layout-cell}}
936 936  {{/layout-section}}
937 937  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -106332693
1 +106332694
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106332693/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106332694/Timeline