Skip to Content

Changes for page Timeline

Last modified by Daniel Turner on 2025/09/10 16:00
From version 23.1
edited by Daniel Turner
on 2020/11/20 08:27
Change comment: There is no comment for this version
To version 17.1
edited by Daniel Turner
on 2020/11/19 12:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -119,36 +119,10 @@
119 119  
120 120  )))|(% colspan="1" %)(% colspan="1" %)
121 121  (((
122 -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]]
123 123  )))
124 124  |(% colspan="1" %)(% colspan="1" %)
125 125  (((
126 -103
127 -)))|(% colspan="1" %)(% colspan="1" %)
128 -(((
129 -2273
130 -)))|(% colspan="1" %)(% colspan="1" %)
131 -(((
132 -
133 -)))|(% colspan="1" %)(% colspan="1" %)
134 -(((
135 -Terraformer Conflict survivors relocate to the 4th planet in the Sonra System, named Argon Prime after Nathan R. Gunne
136 -)))
137 -|(% colspan="1" %)(% colspan="1" %)
138 -(((
139 -103
140 -)))|(% colspan="1" %)(% colspan="1" %)
141 -(((
142 -2273
143 -)))|(% colspan="1" %)(% colspan="1" %)
144 -(((
145 -
146 -)))|(% colspan="1" %)(% colspan="1" %)
147 -(((
148 -The [[doc:Argon Federation]] is established
149 -)))
150 -|(% colspan="1" %)(% colspan="1" %)
151 -(((
152 152  130
153 153  )))|(% colspan="1" %)(% colspan="1" %)
154 154  (((
... ... @@ -197,7 +197,7 @@
197 197  
198 198  )))|(% colspan="1" %)(% colspan="1" %)
199 199  (((
200 -The [[doc:Argon Federation]] begins expanding throughout the Jump Gate network
174 +Foundation of the Federation
201 201  )))
202 202  |(% colspan="1" %)(% colspan="1" %)
203 203  (((
... ... @@ -262,7 +262,7 @@
262 262  
263 263  )))|(% colspan="1" %)(% colspan="1" %)
264 264  (((
265 -First contact with the [[Teladi>>doc:Teladi Company]]
239 +First contact with [[Teladi>>doc:Teladi Company]]
266 266  )))
267 267  |(% colspan="1" %)(% colspan="1" %)
268 268  (((
... ... @@ -324,9 +324,7 @@
324 324  2912
325 325  )))|(% colspan="1" %)(% colspan="1" %)
326 326  (((
327 -X:Btf /
328 -
329 -X:T
301 +X:Btf / X:T
330 330  )))|(% colspan="1" %)(% colspan="1" %)
331 331  (((
332 332  Arrival of USC X and Kyle Brennan
... ... @@ -333,19 +333,6 @@
333 333  )))
334 334  |(% colspan="1" %)(% colspan="1" %)
335 335  (((
336 -742
337 -)))|(% colspan="1" %)(% colspan="1" %)
338 -(((
339 -2912
340 -)))|(% colspan="1" %)(% colspan="1" %)
341 -(((
342 -
343 -)))|(% colspan="1" %)(% colspan="1" %)
344 -(((
345 -The Jump Gate network is reconfigured with the [[Teladi>>doc:Teladi Company]] home-world (Ianamus Zura) cut-off
346 -)))
347 -|(% colspan="1" %)(% colspan="1" %)
348 -(((
349 349  763
350 350  )))|(% colspan="1" %)(% colspan="1" %)
351 351  (((
... ... @@ -404,32 +404,6 @@
404 404  2934
405 405  )))|(% colspan="1" %)(% colspan="1" %)
406 406  (((
407 -X3:R
408 -)))|(% colspan="1" %)(% colspan="1" %)
409 -(((
410 -The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jump Gate Network
411 -)))
412 -|(% colspan="1" %)(% colspan="1" %)
413 -(((
414 -764
415 -)))|(% colspan="1" %)(% colspan="1" %)
416 -(((
417 -2934
418 -)))|(% colspan="1" %)(% colspan="1" %)
419 -(((
420 -
421 -)))|(% colspan="1" %)(% colspan="1" %)
422 -(((
423 -The Earth Jump Gate is relocated to the Asteroid Belt
424 -)))
425 -|(% colspan="1" %)(% colspan="1" %)
426 -(((
427 -764
428 -)))|(% colspan="1" %)(% colspan="1" %)
429 -(((
430 -2934
431 -)))|(% colspan="1" %)(% colspan="1" %)
432 -(((
433 433  X3:TC
434 434  )))|(% colspan="1" %)(% colspan="1" %)
435 435  (((
... ... @@ -450,19 +450,6 @@
450 450  )))
451 451  |(% colspan="1" %)(% colspan="1" %)
452 452  (((
453 -764
454 -)))|(% colspan="1" %)(% colspan="1" %)
455 -(((
456 -2934
457 -)))|(% colspan="1" %)(% colspan="1" %)
458 -(((
459 -X3:TC
460 -)))|(% colspan="1" %)(% colspan="1" %)
461 -(((
462 -The Xenon Hub is discovered
463 -)))
464 -|(% colspan="1" %)(% colspan="1" %)
465 -(((
466 466  770
467 467  )))|(% colspan="1" %)(% colspan="1" %)
468 468  (((
... ... @@ -485,7 +485,7 @@
485 485  X3:AP*
486 486  )))|(% colspan="1" %)(% colspan="1" %)
487 487  (((
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]]
408 +The Terran Conflict
489 489  )))
490 490  |(% colspan="1" %)(% colspan="1" %)
491 491  (((
... ... @@ -511,7 +511,7 @@
511 511  X3:AP
512 512  )))|(% colspan="1" %)(% colspan="1" %)
513 513  (((
514 -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
515 515  )))
516 516  |(% colspan="1" %)(% colspan="1" %)
517 517  (((
... ... @@ -541,19 +541,6 @@
541 541  )))
542 542  |(% colspan="1" %)(% colspan="1" %)
543 543  (((
544 -782
545 -)))|(% colspan="1" %)(% colspan="1" %)
546 -(((
547 -2952
548 -)))|(% colspan="1" %)(% colspan="1" %)
549 -(((
550 -X:R*
551 -)))|(% colspan="1" %)(% colspan="1" %)
552 -(((
553 -[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system
554 -)))
555 -|(% colspan="1" %)(% colspan="1" %)
556 -(((
557 557  801
558 558  )))|(% colspan="1" %)(% colspan="1" %)
559 559  (((
... ... @@ -589,7 +589,7 @@
589 589  X:R
590 590  )))|(% colspan="1" %)(% colspan="1" %)
591 591  (((
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
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
593 593  )))
594 594  |(% colspan="1" %)(% colspan="1" %)
595 595  (((
... ... @@ -628,7 +628,7 @@
628 628  X4:F
629 629  )))|(% colspan="1" %)(% colspan="1" %)
630 630  (((
631 -Boso Ta escapes Split capture and steals a Terran Science Station
538 +Boso Ta escapes Split capture
632 632  )))
633 633  |(% colspan="1" %)(% colspan="1" %)
634 634  (((
... ... @@ -638,9 +638,7 @@
638 638  2995
639 639  )))|(% colspan="1" %)(% colspan="1" %)
640 640  (((
641 -X4:F
642 -
643 -(SV)
548 +X4:F (SV)
644 644  )))|(% colspan="1" %)(% colspan="1" %)
645 645  (((
646 646  The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
... ... @@ -656,7 +656,7 @@
656 656  X4:F
657 657  )))|(% colspan="1" %)(% colspan="1" %)
658 658  (((
659 -The [[doc:Hatikvah Free League]] breaks away from illicit dealings 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
660 660  )))
661 661  
662 662  
... ... @@ -682,13 +682,6 @@
682 682  )))|(((
683 683  Earth Years /AD/CE
684 684  )))
685 -|(% colspan="1" %)(% colspan="1" %)
686 -(((
687 -*
688 -)))|(% colspan="1" %)(% colspan="1" %)
689 -(((
690 -Prologue
691 -)))
692 692  |(((
693 693  X:Btf
694 694  )))|(((
... ... @@ -724,6 +724,13 @@
724 724  )))
725 725  |(% colspan="1" %)(% colspan="1" %)
726 726  (((
625 +X3:AP*
626 +)))|(% colspan="1" %)(% colspan="1" %)
627 +(((
628 +X3: AP (Prologue)
629 +)))
630 +|(% colspan="1" %)(% colspan="1" %)
631 +(((
727 727  X3:AP
728 728  )))|(% colspan="1" %)(% colspan="1" %)
729 729  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466986
1 +100466979
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466986/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466979/Timeline