Skip to Content

Changes for page Timeline

Last modified by Yann VIOGEAS on 2025/02/07 21:14
From version 58.1
edited by Daniel Turner
on 2021/12/16 23:40
Change comment: There is no comment for this version
To version 56.1
edited by Daniel Turner
on 2021/11/26 08:01
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -145,7 +145,7 @@
145 145  
146 146  )))|(% colspan="1" %)(% colspan="1" %)
147 147  (((
148 -Terraformer Conflict survivors relocate to the 4th planet in the Sonra System, named [[doc:Argon Prime]] after Nathan R. Gunne. The survivors begin to refer to themselves as Argon.
148 +Terraformer Conflict survivors relocate to the 4th planet in the Sonra System, named Argon Prime after Nathan R. Gunne. The survivors begin to refer to themselves as Argon.
149 149  )))
150 150  |(% colspan="1" %)(% colspan="1" %)
151 151  (((
... ... @@ -223,7 +223,7 @@
223 223  
224 224  )))|(% colspan="1" %)(% colspan="1" %)
225 225  (((
226 -The [[doc:Argon Federation]] is formed between the various former Terran colonies including the Free State of Solara and the Hatikvah Free League.
226 +The [[doc:Argon Federation]] is formed between the various former terran colonies including the Free State of Solara and the Hatikvah Free League.
227 227  )))
228 228  |(% colspan="1" %)(% colspan="1" %)
229 229  (((
... ... @@ -288,7 +288,7 @@
288 288  
289 289  )))|(% colspan="1" %)(% colspan="1" %)
290 290  (((
291 -First contact with the [[Teladi>>doc:Teladi Company]] is made, they subsequently join the Community of Planets.
291 +First contact with the [[Telad>>doc:Teladi Company]] is made, they subsequently join the Community of Planets.
292 292  )))
293 293  |(% colspan="1" %)(% colspan="1" %)
294 294  (((
... ... @@ -342,7 +342,7 @@
342 342  X:T
343 343  )))|(% colspan="1" %)(% colspan="1" %)
344 344  (((
345 -Arrival of [[doc:Earth]] Fleet test pilot Kyle Brennan and the //USC X// (Xperimental Shuttle) in the Jump Gate network after a Jump Drive test.
345 +Arrival of Earth Fleet test pilot Kyle Brennan and the //USC X// (Xperimental Shuttle) in the Jump Gate network after a Jump Drive test.
346 346  )))
347 347  |(% colspan="1" %)(% colspan="1" %)
348 348  (((
... ... @@ -384,14 +384,14 @@
384 384  
385 385  )))|(% colspan="1" %)(% colspan="1" %)
386 386  (((
387 -[[doc:XRWIKI.Terracorp]] is established by Kyle Brennan and Elena Kho to finance 'Jumpdrive' research to return to Earth.
387 +[[doc:XRWIKI.Terracorp]] is established by Kyle Brennan and Elena Kho to finance 'Jumpdrive' research to return to earth.
388 388  )))
389 389  |(% colspan="1" %)(% colspan="1" %)
390 390  (((
391 -748
391 +752
392 392  )))|(% colspan="1" %)(% colspan="1" %)
393 393  (((
394 -2918
394 +2922
395 395  )))|(% colspan="1" %)(% colspan="1" %)
396 396  (((
397 397  
... ... @@ -434,7 +434,7 @@
434 434  X3:R
435 435  )))|(% colspan="1" %)(% colspan="1" %)
436 436  (((
437 -The race to find Earth begins between the Yaki Syndicate and the Paranid Empire.
437 +The race to find Earth between the Yaki Syndicate and the Paranid Empire.
438 438  )))
439 439  |(% colspan="1" %)(% colspan="1" %)
440 440  (((
... ... @@ -464,7 +464,7 @@
464 464  )))
465 465  |(% colspan="1" %)(% colspan="1" %)
466 466  (((
467 -The Terran lost colony of Aldrin (same as the Free State of Solara) is rediscovered with terraformers and humans living in harmony in the system. Aldrin's Gates are re-opened leading to colonies including Megnir and [[doc:Segaris]] that had been razed during the First Terraformer Conflict.
467 +The Terran lost colony of Aldrin (same as the Free State of Solara) is rediscovered with Terraformers and Humans living in harmony in the system. Aldrin's Gates are re-opened leading to colonies including Megnir and [[doc:Segaris]] that had been razed during the First Terraformer Conflict.
468 468  )))
469 469  |(% colspan="1" %)(% colspan="1" %)
470 470  (((
... ... @@ -477,7 +477,7 @@
477 477  
478 478  )))|(% colspan="1" %)(% colspan="1" %)
479 479  (((
480 -Tensions build over AGI usage between the Terrans and the Community of Planets.
480 +Tensions Build over AGI usage between the Terrans and the Community of Planets.
481 481  )))
482 482  |(% colspan="1" %)(% colspan="1" %)
483 483  (((
... ... @@ -490,7 +490,7 @@
490 490  
491 491  )))|(% colspan="1" %)(% colspan="1" %)
492 492  (((
493 -[[doc:XRWIKI.Family Ryak]] is cut-off from the Jump Gate network leaving [[Family Zyarth>>doc:Zyarth Patriarchy]] bordering the Xenon. The latter's predicament allowed Family Zyarth to become self-sustaining and depose Rhonkar t’Ncct following the Jump Gate Realignment.
493 +[[Family Ryk>>doc:XRWIKI.Family Ryak]] is cut-off from the Jump Gate network leaving [[Family Zyarth>>doc:Zyarth Patriarchy]] bordering the Xenon. The latter's predicament allowed Family Zyarth to become self-sustaining and depose Rhonkar t’Ncct following the Jump Gate Realignment with Zyarth .
494 494  )))
495 495  |(% colspan="1" %)(% colspan="1" %)
496 496  (((
... ... @@ -503,7 +503,7 @@
503 503  
504 504  )))|(% colspan="1" %)(% colspan="1" %)
505 505  (((
506 -[[doc:XRWIKI.Plutarch Mining Corporation]] relocates from the Ore Belt to the recently discovered Albion System. Co-operation with [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]] facilitates the deployment of Trans-Orbital Accelerators in Albion based on Terran designs. JSS begins developing highway technology to supplant the Accelerators.
506 +[[doc:XRWIKI.Plutarch Mining Corporation]] relocates from the Ore Belt to the recently discovered Albion System. Co-operation with [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]] facilitates the deployment of Trans-Orbital Accelerators in Albion based on Terran designs. JSS begins developing Highway Technology to supplant the Accelerators.
507 507  )))
508 508  |(% colspan="1" %)(% colspan="1" %)
509 509  (((
... ... @@ -526,7 +526,7 @@
526 526  2946
527 527  )))|(% colspan="1" %)(% colspan="1" %)
528 528  (((
529 -**Second Terraformer Conflict:** The [[doc:XRWIKI.Beryll]] unleashes newly built terraformer drones against Sol
529 +**Second Terraformer Conflict:** The Beryll unleashes newly built terraformer drones against Sol
530 530  )))
531 531  |(% rowspan="2" %)(% rowspan="2" %)
532 532  (((
... ... @@ -625,7 +625,7 @@
625 625  )))
626 626  |(% colspan="1" %)(% colspan="1" %)
627 627  (((
628 -A treaty is signed between the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The [[Republic of Canterra>>doc:XRWIKI.Republic of Cantera]], bringing a formal end to the Terran Conflict (formally it had lasted for 29 years).
628 +A treaty is signed between the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The [[Republic of Canterra>>doc:XRWIKI.Republic of Cantera]], bringing a formal end to the Terran Conflict.
629 629  )))
630 630  |(% colspan="1" %)(% colspan="1" %)
631 631  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -106890338
1 +106890332
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890338/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890332/Timeline