Changes for page Timeline

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

From version 11.1
edited by Daniel Turner
on 2020/11/19 11:24
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
... ... @@ -31,7 +31,7 @@
31 31  (((
32 32  
33 33  )))|(((
34 -The jlight of the Winterblossom
34 +The flight of the Winterblossom
35 35  )))
36 36  |(% colspan="1" %)(% colspan="1" %)
37 37  (((
... ... @@ -93,7 +93,7 @@
93 93  
94 94  )))|(% colspan="1" %)(% colspan="1" %)
95 95  (((
96 -The Earth Jump Gate is destroyed To protect Earth
96 +The Earth Jump Gate is destroyed to protect Earth
97 97  )))
98 98  |(% colspan="1" %)(% colspan="1" %)
99 99  (((
... ... @@ -119,7 +119,7 @@
119 119  
120 120  )))|(% colspan="1" %)(% colspan="1" %)
121 121  (((
122 -Earth is removed from the history of the 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  (((
... ... @@ -149,6 +149,19 @@
149 149  )))
150 150  |(% colspan="1" %)(% colspan="1" %)
151 151  (((
152 +215
153 +)))|(% colspan="1" %)(% colspan="1" %)
154 +(((
155 +2385
156 +)))|(% colspan="1" %)(% colspan="1" %)
157 +(((
158 +
159 +)))|(% colspan="1" %)(% colspan="1" %)
160 +(((
161 +[[doc:Xenon]] destroy the spaceport "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
162 +)))
163 +|(% colspan="1" %)(% colspan="1" %)
164 +(((
152 152  241
153 153  )))|(% colspan="1" %)(% colspan="1" %)
154 154  (((
... ... @@ -158,7 +158,7 @@
158 158  
159 159  )))|(% colspan="1" %)(% colspan="1" %)
160 160  (((
161 -Foundation of the Argon Federation
174 +Foundation of the Federation
162 162  )))
163 163  |(% colspan="1" %)(% colspan="1" %)
164 164  (((
... ... @@ -223,10 +223,36 @@
223 223  
224 224  )))|(% colspan="1" %)(% colspan="1" %)
225 225  (((
226 -First contact with Teladi
239 +First contact with [[Teladi>>doc:Teladi Company]]
227 227  )))
228 228  |(% colspan="1" %)(% colspan="1" %)
229 229  (((
243 +589
244 +)))|(% colspan="1" %)(% colspan="1" %)
245 +(((
246 +2759
247 +)))|(% colspan="1" %)(% colspan="1" %)
248 +(((
249 +
250 +)))|(% colspan="1" %)(% colspan="1" %)
251 +(((
252 +Credits become the currency of the X universe
253 +)))
254 +|(% colspan="1" %)(% colspan="1" %)
255 +(((
256 +~~608
257 +)))|(% colspan="1" %)(% colspan="1" %)
258 +(((
259 +~~2778
260 +)))|(% colspan="1" %)(% colspan="1" %)
261 +(((
262 +
263 +)))|(% colspan="1" %)(% colspan="1" %)
264 +(((
265 +The [[doc:Hatikvah Free League]] is established
266 +)))
267 +|(% colspan="1" %)(% colspan="1" %)
268 +(((
230 230  735
231 231  )))|(% colspan="1" %)(% colspan="1" %)
232 232  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -Xenon ship enters Sol using a Gateless Jumpdrive
278 +[[doc:Xenon]] ship enters Sol using a Gateless Jumpdrive
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -249,7 +249,7 @@
249 249  
250 250  )))|(% colspan="1" %)(% colspan="1" %)
251 251  (((
252 -Evolution of the Xenon
291 +Evolution of the [[doc:Xenon]]
253 253  )))
254 254  |(% colspan="1" %)(% colspan="1" %)
255 255  (((
... ... @@ -259,7 +259,9 @@
259 259  2912
260 260  )))|(% colspan="1" %)(% colspan="1" %)
261 261  (((
262 -X:Btf / X:T
301 +X:Btf /
302 +
303 +X:T
263 263  )))|(% colspan="1" %)(% colspan="1" %)
264 264  (((
265 265  Arrival of USC X and Kyle Brennan
... ... @@ -266,6 +266,19 @@
266 266  )))
267 267  |(% colspan="1" %)(% colspan="1" %)
268 268  (((
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 +(((
269 269  763
270 270  )))|(% colspan="1" %)(% colspan="1" %)
271 271  (((
... ... @@ -275,7 +275,7 @@
275 275  
276 276  )))|(% colspan="1" %)(% colspan="1" %)
277 277  (((
278 -First contact with the Kha'ak
332 +First contact with the [[Kha'ak>>doc:Kha'ak]]
279 279  )))
280 280  |(% colspan="1" %)(% colspan="1" %)
281 281  (((
... ... @@ -327,7 +327,7 @@
327 327  X3:TC
328 328  )))|(% colspan="1" %)(% colspan="1" %)
329 329  (((
330 -Relations with the Terrans begin to cool
384 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
331 331  )))
332 332  |(% colspan="1" %)(% colspan="1" %)
333 333  (((
... ... @@ -366,7 +366,7 @@
366 366  X3:AP*
367 367  )))|(% colspan="1" %)(% colspan="1" %)
368 368  (((
369 -The Terran Conflict
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]]
370 370  )))
371 371  |(% colspan="1" %)(% colspan="1" %)
372 372  (((
... ... @@ -392,7 +392,7 @@
392 392  X3:AP
393 393  )))|(% colspan="1" %)(% colspan="1" %)
394 394  (((
395 -
449 +Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
396 396  )))
397 397  |(% colspan="1" %)(% colspan="1" %)
398 398  (((
... ... @@ -422,6 +422,19 @@
422 422  )))
423 423  |(% colspan="1" %)(% colspan="1" %)
424 424  (((
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 +(((
425 425  801
426 426  )))|(% colspan="1" %)(% colspan="1" %)
427 427  (((
... ... @@ -431,7 +431,7 @@
431 431  
432 432  )))|(% colspan="1" %)(% colspan="1" %)
433 433  (((
434 -The Alliance of the Word is established
501 +The [[doc:Alliance of the Word]] is established
435 435  )))
436 436  |(% colspan="1" %)(% colspan="1" %)
437 437  (((
... ... @@ -448,6 +448,19 @@
448 448  )))
449 449  |(% colspan="1" %)(% colspan="1" %)
450 450  (((
518 +803
519 +)))|(% colspan="1" %)(% colspan="1" %)
520 +(((
521 +2973
522 +)))|(% colspan="1" %)(% colspan="1" %)
523 +(((
524 +X:R
525 +)))|(% colspan="1" %)(% colspan="1" %)
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
528 +)))
529 +|(% colspan="1" %)(% colspan="1" %)
530 +(((
451 451  820
452 452  )))|(% colspan="1" %)(% colspan="1" %)
453 453  (((
... ... @@ -461,6 +461,19 @@
461 461  )))
462 462  |(% colspan="1" %)(% colspan="1" %)
463 463  (((
544 +820
545 +)))|(% colspan="1" %)(% colspan="1" %)
546 +(((
547 +2990
548 +)))|(% colspan="1" %)(% colspan="1" %)
549 +(((
550 +
551 +)))|(% colspan="1" %)(% colspan="1" %)
552 +(((
553 +Paranid Civil war begins between the [[doc:Godrealm of the Paranid]] and the [[doc:Holy Order of the Pontifex]] after each faction establishes their own Pontifex during The Jump Gate Shutdown
554 +)))
555 +|(% colspan="1" %)(% colspan="1" %)
556 +(((
464 464  825
465 465  )))|(% colspan="1" %)(% colspan="1" %)
466 466  (((
... ... @@ -470,9 +470,37 @@
470 470  X4:F
471 471  )))|(% colspan="1" %)(% colspan="1" %)
472 472  (((
473 -
566 +Boso Ta escapes Split capture and steals a Terran Science Station
474 474  )))
568 +|(% colspan="1" %)(% colspan="1" %)
569 +(((
570 +825
571 +)))|(% colspan="1" %)(% colspan="1" %)
572 +(((
573 +2995
574 +)))|(% colspan="1" %)(% colspan="1" %)
575 +(((
576 +X4:F
475 475  
578 +(SV)
579 +)))|(% colspan="1" %)(% colspan="1" %)
580 +(((
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
582 +)))
583 +|(% colspan="1" %)(% colspan="1" %)
584 +(((
585 +825
586 +)))|(% colspan="1" %)(% colspan="1" %)
587 +(((
588 +2995
589 +)))|(% colspan="1" %)(% colspan="1" %)
590 +(((
591 +X4:F
592 +)))|(% colspan="1" %)(% colspan="1" %)
593 +(((
594 +The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
595 +)))
596 +
476 476  
477 477  
478 478  
... ... @@ -489,7 +489,7 @@
489 489  |(((
490 490  NT
491 491  )))|(((
492 -New Time
613 +New Time (years since removing Earth from Argon history)
493 493  )))
494 494  |(((
495 495  EY
... ... @@ -496,6 +496,13 @@
496 496  )))|(((
497 497  Earth Years /AD/CE
498 498  )))
620 +|(% colspan="1" %)(% colspan="1" %)
621 +(((
622 +*
623 +)))|(% colspan="1" %)(% colspan="1" %)
624 +(((
625 +Prologue
626 +)))
499 499  |(((
500 500  X:Btf
501 501  )))|(((
... ... @@ -531,13 +531,6 @@
531 531  )))
532 532  |(% colspan="1" %)(% colspan="1" %)
533 533  (((
534 -X3:AP*
535 -)))|(% colspan="1" %)(% colspan="1" %)
536 -(((
537 -X3: AP (Prologue)
538 -)))
539 -|(% colspan="1" %)(% colspan="1" %)
540 -(((
541 541  X3:AP
542 542  )))|(% colspan="1" %)(% colspan="1" %)
543 543  (((
... ... @@ -557,6 +557,20 @@
557 557  (((
558 558  X4: Foundations (2018)
559 559  )))
681 +|(% colspan="1" %)(% colspan="1" %)
682 +(((
683 +(SV)
684 +)))|(% colspan="1" %)(% colspan="1" %)
685 +(((
686 +X4: Foundations Split Vendetta DLC (2020)
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 +)))
560 560  {{/layout-cell}}
561 561  {{/layout-section}}
562 562  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466956
1 +100466983
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466956/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466983/Timeline