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 12.1
edited by Daniel Turner
on 2020/11/19 11:30
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 flight of the Winterblossom
34 +The jlight 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 who go on to from the [[doc:Argon Federation]]
122 +Earth is removed from the history of the conflict's survivors
123 123  )))
124 124  |(% colspan="1" %)(% colspan="1" %)
125 125  (((
... ... @@ -158,7 +158,7 @@
158 158  
159 159  )))|(% colspan="1" %)(% colspan="1" %)
160 160  (((
161 -[[doc:Xenon]] destroy the spaceport "Antigone", The sector Antigone Memorial and The [[doc:Antigone Republic]] is named in its honour
161 +Xenon destroy the spaceport "Antigone", Antigone Memorial is named in its honour
162 162  )))
163 163  |(% colspan="1" %)(% colspan="1" %)
164 164  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -First contact with [[Teladi>>doc:Teladi Company]]
239 +First contact with Teladi
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -253,19 +253,6 @@
253 253  )))
254 254  |(% colspan="1" %)(% colspan="1" %)
255 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 -(((
269 269  735
270 270  )))|(% colspan="1" %)(% colspan="1" %)
271 271  (((
... ... @@ -275,7 +275,7 @@
275 275  
276 276  )))|(% colspan="1" %)(% colspan="1" %)
277 277  (((
278 -[[doc:Xenon]] ship enters Sol using a Gateless Jumpdrive
265 +Xenon ship enters Sol using a Gateless Jumpdrive
279 279  )))
280 280  |(% colspan="1" %)(% colspan="1" %)
281 281  (((
... ... @@ -288,7 +288,7 @@
288 288  
289 289  )))|(% colspan="1" %)(% colspan="1" %)
290 290  (((
291 -Evolution of the [[doc:Xenon]]
278 +Evolution of the Xenon
292 292  )))
293 293  |(% colspan="1" %)(% colspan="1" %)
294 294  (((
... ... @@ -298,9 +298,7 @@
298 298  2912
299 299  )))|(% colspan="1" %)(% colspan="1" %)
300 300  (((
301 -X:Btf /
302 -
303 -X:T
288 +X:Btf / X:T
304 304  )))|(% colspan="1" %)(% colspan="1" %)
305 305  (((
306 306  Arrival of USC X and Kyle Brennan
... ... @@ -316,7 +316,7 @@
316 316  
317 317  )))|(% colspan="1" %)(% colspan="1" %)
318 318  (((
319 -First contact with the [[Kha'ak>>doc:Kha'ak]]
304 +First contact with the Kha'ak
320 320  )))
321 321  |(% colspan="1" %)(% colspan="1" %)
322 322  (((
... ... @@ -368,7 +368,7 @@
368 368  X3:TC
369 369  )))|(% colspan="1" %)(% colspan="1" %)
370 370  (((
371 -Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
356 +Relations with the Terrans begin to cool
372 372  )))
373 373  |(% colspan="1" %)(% colspan="1" %)
374 374  (((
... ... @@ -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]]
395 +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]]
421 +
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  (((
... ... @@ -485,7 +485,7 @@
485 485  
486 486  )))|(% colspan="1" %)(% colspan="1" %)
487 487  (((
488 -The [[doc:Alliance of the Word]] is established
460 +The Alliance of the Word is established
489 489  )))
490 490  |(% colspan="1" %)(% colspan="1" %)
491 491  (((
... ... @@ -502,19 +502,6 @@
502 502  )))
503 503  |(% colspan="1" %)(% colspan="1" %)
504 504  (((
505 -803
506 -)))|(% colspan="1" %)(% colspan="1" %)
507 -(((
508 -2973
509 -)))|(% colspan="1" %)(% colspan="1" %)
510 -(((
511 -X:R
512 -)))|(% colspan="1" %)(% colspan="1" %)
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
515 -)))
516 -|(% colspan="1" %)(% colspan="1" %)
517 -(((
518 518  820
519 519  )))|(% colspan="1" %)(% colspan="1" %)
520 520  (((
... ... @@ -528,19 +528,6 @@
528 528  )))
529 529  |(% colspan="1" %)(% colspan="1" %)
530 530  (((
531 -820
532 -)))|(% colspan="1" %)(% colspan="1" %)
533 -(((
534 -2990
535 -)))|(% colspan="1" %)(% colspan="1" %)
536 -(((
537 -
538 -)))|(% colspan="1" %)(% colspan="1" %)
539 -(((
540 -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
541 -)))
542 -|(% colspan="1" %)(% colspan="1" %)
543 -(((
544 544  825
545 545  )))|(% colspan="1" %)(% colspan="1" %)
546 546  (((
... ... @@ -550,37 +550,9 @@
550 550  X4:F
551 551  )))|(% colspan="1" %)(% colspan="1" %)
552 552  (((
553 -Boso Ta escapes Split capture and steals a Terran Science Station
499 +
554 554  )))
555 -|(% colspan="1" %)(% colspan="1" %)
556 -(((
557 -825
558 -)))|(% colspan="1" %)(% colspan="1" %)
559 -(((
560 -2995
561 -)))|(% colspan="1" %)(% colspan="1" %)
562 -(((
563 -X4:F
564 564  
565 -(SV)
566 -)))|(% colspan="1" %)(% colspan="1" %)
567 -(((
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
569 -)))
570 -|(% colspan="1" %)(% colspan="1" %)
571 -(((
572 -825
573 -)))|(% colspan="1" %)(% colspan="1" %)
574 -(((
575 -2995
576 -)))|(% colspan="1" %)(% colspan="1" %)
577 -(((
578 -X4:F
579 -)))|(% colspan="1" %)(% colspan="1" %)
580 -(((
581 -The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
582 -)))
583 -
584 584  
585 585  
586 586  
... ... @@ -597,7 +597,7 @@
597 597  |(((
598 598  NT
599 599  )))|(((
600 -New Time (years since removing Earth from Argon history)
518 +New Time
601 601  )))
602 602  |(((
603 603  EY
... ... @@ -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  (((
560 +X3:AP*
561 +)))|(% colspan="1" %)(% colspan="1" %)
562 +(((
563 +X3: AP (Prologue)
564 +)))
565 +|(% colspan="1" %)(% colspan="1" %)
566 +(((
649 649  X3:AP
650 650  )))|(% colspan="1" %)(% colspan="1" %)
651 651  (((
... ... @@ -665,20 +665,6 @@
665 665  (((
666 666  X4: Foundations (2018)
667 667  )))
668 -|(% colspan="1" %)(% colspan="1" %)
669 -(((
670 -(SV)
671 -)))|(% colspan="1" %)(% colspan="1" %)
672 -(((
673 -X4: Foundations Split Vendetta DLC (2020)
674 -)))
675 -|(% colspan="1" %)(% colspan="1" %)
676 -(((
677 -(CoH)
678 -)))|(% colspan="1" %)(% colspan="1" %)
679 -(((
680 -X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
681 -)))
682 682  {{/layout-cell}}
683 683  {{/layout-section}}
684 684  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466982
1 +100466957
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/100466957/Timeline