Changes for page Timeline

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

From version 20.1
edited by Daniel Turner
on 2020/11/20 08:06
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
... ... @@ -307,19 +307,6 @@
307 307  )))
308 308  |(% colspan="1" %)(% colspan="1" %)
309 309  (((
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 -(((
323 323  763
324 324  )))|(% colspan="1" %)(% colspan="1" %)
325 325  (((
... ... @@ -329,7 +329,7 @@
329 329  
330 330  )))|(% colspan="1" %)(% colspan="1" %)
331 331  (((
332 -First contact with the [[Kha'ak>>doc:Kha'ak]]
304 +First contact with the Kha'ak
333 333  )))
334 334  |(% colspan="1" %)(% colspan="1" %)
335 335  (((
... ... @@ -381,7 +381,7 @@
381 381  X3:TC
382 382  )))|(% colspan="1" %)(% colspan="1" %)
383 383  (((
384 -Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
356 +Relations with the Terrans begin to cool
385 385  )))
386 386  |(% colspan="1" %)(% colspan="1" %)
387 387  (((
... ... @@ -420,7 +420,7 @@
420 420  X3:AP*
421 421  )))|(% colspan="1" %)(% colspan="1" %)
422 422  (((
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]]
395 +The Terran Conflict
424 424  )))
425 425  |(% colspan="1" %)(% colspan="1" %)
426 426  (((
... ... @@ -446,7 +446,7 @@
446 446  X3:AP
447 447  )))|(% colspan="1" %)(% colspan="1" %)
448 448  (((
449 -Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
421 +
450 450  )))
451 451  |(% colspan="1" %)(% colspan="1" %)
452 452  (((
... ... @@ -476,19 +476,6 @@
476 476  )))
477 477  |(% colspan="1" %)(% colspan="1" %)
478 478  (((
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 -(((
492 492  801
493 493  )))|(% colspan="1" %)(% colspan="1" %)
494 494  (((
... ... @@ -498,7 +498,7 @@
498 498  
499 499  )))|(% colspan="1" %)(% colspan="1" %)
500 500  (((
501 -The [[doc:Alliance of the Word]] is established
460 +The Alliance of the Word is established
502 502  )))
503 503  |(% colspan="1" %)(% colspan="1" %)
504 504  (((
... ... @@ -515,19 +515,6 @@
515 515  )))
516 516  |(% colspan="1" %)(% colspan="1" %)
517 517  (((
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 -(((
531 531  820
532 532  )))|(% colspan="1" %)(% colspan="1" %)
533 533  (((
... ... @@ -541,19 +541,6 @@
541 541  )))
542 542  |(% colspan="1" %)(% colspan="1" %)
543 543  (((
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 -(((
557 557  825
558 558  )))|(% colspan="1" %)(% colspan="1" %)
559 559  (((
... ... @@ -563,37 +563,9 @@
563 563  X4:F
564 564  )))|(% colspan="1" %)(% colspan="1" %)
565 565  (((
566 -Boso Ta escapes Split capture and steals a Terran Science Station
499 +
567 567  )))
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
577 577  
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 -
597 597  
598 598  
599 599  
... ... @@ -610,7 +610,7 @@
610 610  |(((
611 611  NT
612 612  )))|(((
613 -New Time (years since removing Earth from Argon history)
518 +New Time
614 614  )))
615 615  |(((
616 616  EY
... ... @@ -617,13 +617,6 @@
617 617  )))|(((
618 618  Earth Years /AD/CE
619 619  )))
620 -|(% colspan="1" %)(% colspan="1" %)
621 -(((
622 -*
623 -)))|(% colspan="1" %)(% colspan="1" %)
624 -(((
625 -Prologue
626 -)))
627 627  |(((
628 628  X:Btf
629 629  )))|(((
... ... @@ -659,6 +659,13 @@
659 659  )))
660 660  |(% colspan="1" %)(% colspan="1" %)
661 661  (((
560 +X3:AP*
561 +)))|(% colspan="1" %)(% colspan="1" %)
562 +(((
563 +X3: AP (Prologue)
564 +)))
565 +|(% colspan="1" %)(% colspan="1" %)
566 +(((
662 662  X3:AP
663 663  )))|(% colspan="1" %)(% colspan="1" %)
664 664  (((
... ... @@ -678,20 +678,6 @@
678 678  (((
679 679  X4: Foundations (2018)
680 680  )))
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 -)))
695 695  {{/layout-cell}}
696 696  {{/layout-section}}
697 697  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466983
1 +100466957
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466983/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466957/Timeline