Changes for page Timeline

Last modified by Yann VIOGEAS on 2025/02/07 21:14

From version 65.1
edited by Daniel Turner
on 2021/12/20 10:35
Change comment: There is no comment for this version
To version 60.1
edited by Daniel Turner
on 2021/12/17 07:03
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -34,7 +34,7 @@
34 34  
35 35  )))|(% colspan="1" %)(% colspan="1" %)
36 36  (((
37 -The United Space Command (USC) is established to consolidate the Earth's science and military spacecraft under one organisation, it serves as the government of Sol until its dissolution and merger into the [[doc:Terran Protectorate]].
37 +The United Space Command (USC) is established to consolidate the Earth's science and military spacecraft under one organisation, it serves as the government of Sol until its dissolution and merger into the Terran Protectorate.
38 38  )))
39 39  |(((
40 40  -124
... ... @@ -44,7 +44,7 @@
44 44  (((
45 45  
46 46  )))|(((
47 -The flight of the //USC Winterblossom// to explore the Jump Gate network begins lead by René Farnham.\\
47 +The flight of the //Winterblossom// to explore the Jump Gate network begins lead by René Farnham.\\
48 48  )))
49 49  |(% colspan="1" %)(% colspan="1" %)
50 50  (((
... ... @@ -57,7 +57,7 @@
57 57  
58 58  )))|(% colspan="1" %)(% colspan="1" %)
59 59  (((
60 -The //USC Winterblossom// is recalled to Sol bringing a contracted end to its mission.
60 +The //Winterblossom// is recalled to Sol bringing a contracted end to its mission.
61 61  )))
62 62  |(% colspan="1" %)(% colspan="1" %)
63 63  (((
... ... @@ -93,7 +93,7 @@
93 93  
94 94  )))|(% colspan="1" %)(% colspan="1" %)
95 95  (((
96 -**First Terraformer Conflict:** The Second Terraformer Fleet, having been corrupted by disgruntled terraformer scientist Martin Winters' corruption of the termination code, begins destroying the worlds they were created to build. They then set about achieving their new goal of eliminating all biological life.
96 +**The First Terraformer Conflict:** The Second Terraformer Fleet, having been corrupted by disgruntled terraformer scientist Martin Winters' corruption of the termination code, begins destroying the worlds they were created to build. They then set about achieving their new goal of eliminating all biological life.
97 97  )))
98 98  |(% colspan="1" %)(% colspan="1" %)
99 99  (((
... ... @@ -106,10 +106,23 @@
106 106  
107 107  )))|(% colspan="1" %)(% colspan="1" %)
108 108  (((
109 -The Earth Jumpgate is destroyed by Nathan R Gunne's fleet lead by the //USC Dragonfire// to protect Earth (By X4 its remains orbit [[doc:Mars]]) trapping the rogue terraformers in the X-Universe. This ends the First Terraformer Conflict
109 +The Earth Jump Gate is destroyed by Nathan R Gunne's fleet lead by the //USC Dragonfire// to protect Earth (By X4 its remains orbit [[doc:Mars]]) trapping the rogue terraformers in the X-Universe.
110 110  )))
111 111  |(% colspan="1" %)(% colspan="1" %)
112 112  (((
113 +-23
114 +)))|(% colspan="1" %)(% colspan="1" %)
115 +(((
116 +2147
117 +)))|(% colspan="1" %)(% colspan="1" %)
118 +(((
119 +
120 +)))|(% colspan="1" %)(% colspan="1" %)
121 +(((
122 +The First Terraformer Conflict ends.
123 +)))
124 +|(% colspan="1" %)(% colspan="1" %)
125 +(((
113 113  0
114 114  )))|(% colspan="1" %)(% colspan="1" %)
115 115  (((
... ... @@ -171,7 +171,7 @@
171 171  
172 172  )))|(% colspan="1" %)(% colspan="1" %)
173 173  (((
174 -**First Xenon Conflict:** [[doc:Xenon]] destroy the superstation "Antigone", The sector [[doc:Antigone Memorial]] and the [[doc:Antigone Republic]] is named in its honour.
187 +**First Xenon Conflict:** [[doc:Xenon]] destroy the superstation "Antigone", The sector [[doc:Antigone Memorial]] and The [[doc:Antigone Republic]] is named in its honour.
175 175  )))
176 176  |(% colspan="1" %)(% colspan="1" %)
177 177  (((
... ... @@ -184,7 +184,7 @@
184 184  
185 185  )))|(% colspan="1" %)(% colspan="1" %)
186 186  (((
187 -The Free State of Solara is established in reaction to the effects of the First Xenon Conflict (Solara refers to the star that the planetoid Aldrin orbits).
200 +The Free State of Solara is established in reaction to the effects of the First Xenon Conflict. Solara refers to the star that the planetoid Aldrin orbits.
188 188  )))
189 189  |(% colspan="1" %)(% colspan="1" %)
190 190  (((
... ... @@ -197,7 +197,7 @@
197 197  
198 198  )))|(% colspan="1" %)(% colspan="1" %)
199 199  (((
200 -The [[doc:Hatikvah Free League]] is established by Christiane Hatikvah, also in reaction to the effects of the First Xenon Conflict. The organisation promotes itself on pacifist and relaxed ideals.
213 +The [[doc:Hatikvah Free League]] is established also in reaction to the effects of the First Xenon Conflict.
201 201  )))
202 202  |(% colspan="1" %)(% colspan="1" %)
203 203  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -**Boron Campaign:** Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split.
252 +**The Boron Campaign:** Split Patriarchy invade Boron space. Argon Federation aligns with Boron, Paranid align with Split.
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -262,7 +262,7 @@
262 262  
263 263  )))|(% colspan="1" %)(% colspan="1" %)
264 264  (((
265 -The Free State of Solara opts to sever its Jumpgate connection with the Argon Federation in the wake of post-Boron Campaign scarcity. The colonies early disconnection from the Federation means they are closer to the Terrans culturally, this is pronounced with their re-connection to the network in 764NT.
278 +The Free State of Solara opts to sever its jumpgate connection with the Argon Federation in the wake of post-Boron Campaign scarcity. The colonies early disconnection from the Federation means they are closer to the Terrans culturally, this is pronounced with their reconnection to the network in 764NT.
266 266  )))
267 267  |(% colspan="1" %)(% colspan="1" %)
268 268  (((
... ... @@ -275,7 +275,7 @@
275 275  
276 276  )))|(% colspan="1" %)(% colspan="1" %)
277 277  (((
278 -First contact with the [[Teladi>>doc:Teladi Company]] is made, they subsequently join the Community of Planets and become the leading economic power.
291 +First contact with the [[Teladi>>doc:Teladi Company]] is made, they subsequently join the Community of Planets.
279 279  )))
280 280  |(% colspan="1" %)(% colspan="1" %)
281 281  (((
... ... @@ -329,7 +329,7 @@
329 329  X:T
330 330  )))|(% colspan="1" %)(% colspan="1" %)
331 331  (((
332 -Arrival of [[doc:Earth]] Fleet test pilot Kyle Brennan and the //USC X// (Xperimental Shuttle) in the Jumpgate network after a Jump Drive test.
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.
333 333  )))
334 334  |(% colspan="1" %)(% colspan="1" %)
335 335  (((
... ... @@ -337,7 +337,7 @@
337 337  )))
338 338  |(% colspan="1" %)(% colspan="1" %)
339 339  (((
340 -**Second Xenon Conflict:** The Xenon are ejected from the North-Western region of the old Jump Gate network after their M0 class superweapon was destroyed.
353 +**Second Xenon Conflict:** The Xenon are ejected from the North-Western region of the old Jump Gate network.
341 341  )))
342 342  |(% colspan="1" %)(% colspan="1" %)
343 343  (((
... ... @@ -344,7 +344,7 @@
344 344  
345 345  )))|(% colspan="1" %)(% colspan="1" %)
346 346  (((
347 -The Jumpgate network is reconfigured. Notably, the Teladi homeworld [[doc:Ianamus Zura]] is reconnected to the network.
360 +The Jump Gate network is reconfigured. Notably, the Teladi homeworld [[doc:Ianamus Zura]] is reconnected to the network.
348 348  )))
349 349  |(% colspan="1" %)(% colspan="1" %)
350 350  (((
... ... @@ -351,7 +351,7 @@
351 351  
352 352  )))|(% colspan="1" %)(% colspan="1" %)
353 353  (((
354 -Rhonkar t’Ncct deposes Chin t’Thhg to become Patriarch of All Split. Family Chin's territories are annexed by the emergent Family Rhonkar. Rhonkar leads the Split Families for 40 years until the Jumpgate Shutdown.
367 +Rhonkar t’Ncct deposes Chin t’Thhg to become Patriarch of All Split. Family Chin's territories are annexed by the emergent Family Rhonkar. Rhonkar leads the Split Families for 40 years until the Jump Gate Shutdown.
355 355  )))
356 356  |(% rowspan="2" %)(% rowspan="2" %)
357 357  (((
... ... @@ -397,7 +397,7 @@
397 397  
398 398  )))|(% colspan="1" %)(% colspan="1" %)
399 399  (((
400 -First contact with the [[Kha'ak>>doc:Kha'ak]] is made by the Paranid Empire.
413 +First contact with the [[Kha'ak>>doc:Kha'ak]].
401 401  )))
402 402  |(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)(% class="highlight-green" data-highlight-colour="green" rowspan="2" %)
403 403  (((
... ... @@ -404,7 +404,7 @@
404 404  X2
405 405  )))|(% colspan="1" %)(% colspan="1" %)
406 406  (((
407 -**The President's End Massacre:** Kha'ak forces decimate the entirety of the system in their first interactions with the Argon.
420 +The President's End massacre: Kha'ak forces decimate the entirety of the system
408 408  )))
409 409  |(% colspan="1" %)(% colspan="1" %)
410 410  (((
... ... @@ -447,7 +447,7 @@
447 447  )))
448 448  |(% colspan="1" %)(% colspan="1" %)
449 449  (((
450 -The Xenon Hub is discovered by Bala Gi and Julian Gardna-Brennan. The device is capable of realigning jumpgates in pairs to its 6 gates.
463 +The Xenon Hub is discovered by Bala Gi and Julian Brennan. The device is capable of realigning jumpgates in pairs to its 6 gates.
451 451  )))
452 452  |(% colspan="1" %)(% colspan="1" %)
453 453  (((
... ... @@ -494,19 +494,6 @@
494 494  )))
495 495  |(% colspan="1" %)(% colspan="1" %)
496 496  (((
497 -772
498 -)))|(% colspan="1" %)(% colspan="1" %)
499 -(((
500 -2942
501 -)))|(% colspan="1" %)(% colspan="1" %)
502 -(((
503 -
504 -)))|(% colspan="1" %)(% colspan="1" %)
505 -(((
506 -Badlands Colony established as the de facto base of the [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] in Albion
507 -)))
508 -|(% colspan="1" %)(% colspan="1" %)
509 -(((
510 510  774
511 511  )))|(% colspan="1" %)(% colspan="1" %)
512 512  (((
... ... @@ -543,19 +543,8 @@
543 543  X3:AP
544 544  )))|(% colspan="1" %)(% colspan="1" %)
545 545  (((
546 -Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology that had been reverse engineered by [[JSS>>doc:XRWIKI.Jonferson Space Systems]].
546 +Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[JSS>>doc:XRWIKI.Jonferson Space Systems]].
547 547  )))
548 -|(((
549 -779
550 -)))|(((
551 -2949
552 -)))|(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)(% class="highlight-yellow" colspan="1" data-highlight-colour="yellow" %)
553 -(((
554 -XR*
555 -)))|(% colspan="1" %)(% colspan="1" %)
556 -(((
557 -**Plutarch's Coup:** [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] declares war on the [[doc:Argon Federation]] over control over the Albion system.
558 -)))
559 559  |(% colspan="1" %)(% colspan="1" %)
560 560  (((
561 561  780
... ... @@ -567,7 +567,7 @@
567 567  X3:FL
568 568  )))|(% colspan="1" %)(% colspan="1" %)
569 569  (((
570 -Warp instability occurs with increasing numbers of systems, like Albion, becoming inaccessible. Jump drives become far less reliable with ships disappearing from known space. Governments seeking to preserve the resilience of their systems deploy Trans-Orbital Accelerators.
559 +Warp Instability occurs with increasing numbers of systems like Albion becoming inaccessible. Jump drives become far less reliable with ships disappearing from known space. Governments seeking to preserve the resilience of their systems deploy Trans-Orbital Accelerators.
571 571  )))
572 572  |(% colspan="1" %)(% colspan="1" %)
573 573  (((
... ... @@ -606,7 +606,7 @@
606 606  X:R*
607 607  )))|(% colspan="1" %)(% colspan="1" %)
608 608  (((
609 -**Plutarch's Accession:** [[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system. The remains of the Argon Government and Argon Navy form the [[doc:XRWIKI.Heart of Albion]].
598 +[[PMC>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system. The remains of the Argon Government and Argon Navy form the [[doc:XRWIKI.Heart of Albion]].
610 610  )))
611 611  |(% colspan="1" %)(% colspan="1" %)
612 612  (((
... ... @@ -653,7 +653,7 @@
653 653  X4:F*
654 654  )))|(% colspan="1" %)(% colspan="1" %)
655 655  (((
656 -**Paranid Civil War:** A schism erupts between the original [[doc:Godrealm of the Paranid]] and the defecting [[doc:Holy Order of the Pontifex]] because the latter established a new Pontifex during the Jumpgate Shutdown. Economies are subsequently built on war profiteering.
645 +The Paranid Civil war erupts between the original [[doc:Godrealm of the Paranid]] and the defecting [[doc:Holy Order of the Pontifex]] because the latter established a new pontifex during the jumpgate shutdown. Economies are subsequently built on war profiteering.
657 657  )))
658 658  |(% colspan="1" %)(% colspan="1" %)
659 659  (((
... ... @@ -688,7 +688,7 @@
688 688  X4:F
689 689  )))|(% colspan="1" %)(% colspan="1" %)
690 690  (((
691 -Boso Ta escapes Split capture and steals a Terran science station.
680 +Boso Ta escapes Split capture and steals a Terran Science Station.
692 692  )))
693 693  |(% colspan="1" %)(% colspan="1" %)
694 694  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -106890684
1 +106890345
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890684/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106890345/Timeline