Changes for page Timeline

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

From version 18.1
edited by Daniel Turner
on 2020/11/20 07:28
Change comment: There is no comment for this version
To version 24.1
edited by Daniel Turner
on 2020/11/20 08:34
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -119,10 +119,36 @@
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 Terraformer Conflict's survivors
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 +(((
126 126  130
127 127  )))|(% colspan="1" %)(% colspan="1" %)
128 128  (((
... ... @@ -171,7 +171,7 @@
171 171  
172 172  )))|(% colspan="1" %)(% colspan="1" %)
173 173  (((
174 -Foundation of the Federation
200 +The [[doc:Argon Federation]] begins expanding throughout the Jump Gate network
175 175  )))
176 176  |(% colspan="1" %)(% colspan="1" %)
177 177  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -First contact with [[Teladi>>doc:Teladi Company]]
265 +First contact with the [[Teladi>>doc:Teladi Company]]
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -298,7 +298,9 @@
298 298  2912
299 299  )))|(% colspan="1" %)(% colspan="1" %)
300 300  (((
301 -X:Btf / X:T
327 +X:Btf /
328 +
329 +X:T
302 302  )))|(% colspan="1" %)(% colspan="1" %)
303 303  (((
304 304  Arrival of USC X and Kyle Brennan
... ... @@ -305,6 +305,19 @@
305 305  )))
306 306  |(% colspan="1" %)(% colspan="1" %)
307 307  (((
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 +(((
308 308  763
309 309  )))|(% colspan="1" %)(% colspan="1" %)
310 310  (((
... ... @@ -363,6 +363,32 @@
363 363  2934
364 364  )))|(% colspan="1" %)(% colspan="1" %)
365 365  (((
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 +(((
366 366  X3:TC
367 367  )))|(% colspan="1" %)(% colspan="1" %)
368 368  (((
... ... @@ -383,6 +383,19 @@
383 383  )))
384 384  |(% colspan="1" %)(% colspan="1" %)
385 385  (((
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 +(((
386 386  770
387 387  )))|(% colspan="1" %)(% colspan="1" %)
388 388  (((
... ... @@ -405,7 +405,7 @@
405 405  X3:AP*
406 406  )))|(% colspan="1" %)(% colspan="1" %)
407 407  (((
408 -The Terran Conflict
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]]
409 409  )))
410 410  |(% colspan="1" %)(% colspan="1" %)
411 411  (((
... ... @@ -431,7 +431,7 @@
431 431  X3:AP
432 432  )))|(% colspan="1" %)(% colspan="1" %)
433 433  (((
434 -Plutarch gains influence over the Albion system
514 +Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
435 435  )))
436 436  |(% colspan="1" %)(% colspan="1" %)
437 437  (((
... ... @@ -461,6 +461,19 @@
461 461  )))
462 462  |(% colspan="1" %)(% colspan="1" %)
463 463  (((
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 +(((
464 464  801
465 465  )))|(% colspan="1" %)(% colspan="1" %)
466 466  (((
... ... @@ -496,7 +496,7 @@
496 496  X:R
497 497  )))|(% colspan="1" %)(% colspan="1" %)
498 498  (((
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
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>>doc:XRWIKI.Republic of Cantera]], bringing an end to the Terran Conflict
500 500  )))
501 501  |(% colspan="1" %)(% colspan="1" %)
502 502  (((
... ... @@ -545,7 +545,9 @@
545 545  2995
546 546  )))|(% colspan="1" %)(% colspan="1" %)
547 547  (((
548 -X4:F (SV)
641 +X4:F
642 +
643 +(SV)
549 549  )))|(% colspan="1" %)(% colspan="1" %)
550 550  (((
551 551  The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
... ... @@ -561,7 +561,7 @@
561 561  X4:F
562 562  )))|(% colspan="1" %)(% colspan="1" %)
563 563  (((
564 -The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with Argon Federation Support
659 +The [[doc:Hatikvah Free League]] breaks away from illicit dealings with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] support
565 565  )))
566 566  
567 567  
... ... @@ -587,6 +587,13 @@
587 587  )))|(((
588 588  Earth Years /AD/CE
589 589  )))
685 +|(% colspan="1" %)(% colspan="1" %)
686 +(((
687 +*
688 +)))|(% colspan="1" %)(% colspan="1" %)
689 +(((
690 +Prologue
691 +)))
590 590  |(((
591 591  X:Btf
592 592  )))|(((
... ... @@ -622,13 +622,6 @@
622 622  )))
623 623  |(% colspan="1" %)(% colspan="1" %)
624 624  (((
625 -X3:AP*
626 -)))|(% colspan="1" %)(% colspan="1" %)
627 -(((
628 -X3: AP (Prologue)
629 -)))
630 -|(% colspan="1" %)(% colspan="1" %)
631 -(((
632 632  X3:AP
633 633  )))|(% colspan="1" %)(% colspan="1" %)
634 634  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466981
1 +101548377
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466981/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/101548377/Timeline