Changes for page Timeline

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

From version 27.1
edited by Daniel Turner
on 2021/03/13 02:54
Change comment: There is no comment for this version
To version 20.1
edited by Daniel Turner
on 2020/11/20 08:06
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
... ... @@ -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  (((
... ... @@ -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  (((
... ... @@ -158,7 +158,7 @@
158 158  
159 159  )))|(% colspan="1" %)(% colspan="1" %)
160 160  (((
161 -Argon make first contact with the Paranid
135 +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
161 +[[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  (((
... ... @@ -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  (((
... ... @@ -210,7 +210,7 @@
210 210  
211 211  )))|(% colspan="1" %)(% colspan="1" %)
212 212  (((
213 -Argon make first contact with the Boron
187 +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
200 +The Boron Campaign
227 227  )))
228 228  |(% colspan="1" %)(% colspan="1" %)
229 229  (((
... ... @@ -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  (((
... ... @@ -404,36 +404,10 @@
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  (((
436 -Relations with the [[Terrans>>doc:Terran Protectorate]] begin to cool
384 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
437 437  )))
438 438  |(% colspan="1" %)(% colspan="1" %)
439 439  (((
... ... @@ -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 Protectorate]]and their Argon cousins, The Community of Planets later joins in support of the [[doc:Argon Federation]]
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]]
489 489  )))
490 490  |(% colspan="1" %)(% colspan="1" %)
491 491  (((
... ... @@ -534,19 +534,6 @@
534 534  2952
535 535  )))|(% colspan="1" %)(% colspan="1" %)
536 536  (((
537 -X3:AP~*~*
538 -)))|(% colspan="1" %)(% colspan="1" %)
539 -(((
540 -[[Beryll Astrotech>>doc:XRWIKI.Beryll]] unleashes a new AGI threat on Sol from reverse engineered Xenon fighters
541 -)))
542 -|(% colspan="1" %)(% colspan="1" %)
543 -(((
544 -782
545 -)))|(% colspan="1" %)(% colspan="1" %)
546 -(((
547 -2952
548 -)))|(% colspan="1" %)(% colspan="1" %)
549 -(((
550 550  
551 551  )))|(% colspan="1" %)(% colspan="1" %)
552 552  (((
... ... @@ -554,19 +554,6 @@
554 554  )))
555 555  |(% colspan="1" %)(% colspan="1" %)
556 556  (((
557 -~~782
558 -)))|(% colspan="1" %)(% colspan="1" %)
559 -(((
560 -2952
561 -)))|(% colspan="1" %)(% colspan="1" %)
562 -(((
563 -
564 -)))|(% colspan="1" %)(% colspan="1" %)
565 -(((
566 -USC and ATF are reformed into the Terran Protectorate
567 -)))
568 -|(% colspan="1" %)(% colspan="1" %)
569 -(((
570 570  782
571 571  )))|(% colspan="1" %)(% colspan="1" %)
572 572  (((
... ... @@ -615,7 +615,7 @@
615 615  X:R
616 616  )))|(% colspan="1" %)(% colspan="1" %)
617 617  (((
618 -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
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
619 619  )))
620 620  |(% colspan="1" %)(% colspan="1" %)
621 621  (((
... ... @@ -682,7 +682,7 @@
682 682  X4:F
683 683  )))|(% colspan="1" %)(% colspan="1" %)
684 684  (((
685 -The [[doc:Hatikvah Free League]] breaks away from illicit dealings with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] support
594 +The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
686 686  )))
687 687  
688 688  
... ... @@ -691,8 +691,6 @@
691 691  {{/layout-cell}}
692 692  
693 693  {{layout-cell}}
694 -
695 -
696 696  Legend
697 697  
698 698  |=(((
... ... @@ -717,13 +717,6 @@
717 717  (((
718 718  Prologue
719 719  )))
720 -|(% colspan="1" %)(% colspan="1" %)
721 -(((
722 -~*~*
723 -)))|(% colspan="1" %)(% colspan="1" %)
724 -(((
725 -Epilogue / Immediately after story events of game
726 -)))
727 727  |(((
728 728  X:Btf
729 729  )))|(((
... ... @@ -790,7 +790,7 @@
790 790  (CoH)
791 791  )))|(% colspan="1" %)(% colspan="1" %)
792 792  (((
793 -X4: Foundations Cradle of Humanity DLC (2021)
693 +X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
794 794  )))
795 795  {{/layout-cell}}
796 796  {{/layout-section}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -102367645
1 +100466983
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/102367645/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466983/Timeline