Changes for page Timeline
Last modified by Daniel Turner on 2025/09/10 16:00
From version 53.1
edited by Daniel Turner
on 2021/11/04 07:31
on 2021/11/04 07:31
Change comment:
There is no comment for this version
To version 55.1
edited by Daniel Turner
on 2021/11/21 11:55
on 2021/11/21 11:55
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -70,7 +70,7 @@ 70 70 71 71 )))|(% colspan="1" %)(% colspan="1" %) 72 72 ((( 73 -Terraformer Project begins. 73 +Terraformer Project begins, 3 fleets are launched from Sol to make planets in the Jumpgate Network appropriate for human settlement. 74 74 ))) 75 75 |((( 76 76 -71 ... ... @@ -93,7 +93,7 @@ 93 93 94 94 )))|(% colspan="1" %)(% colspan="1" %) 95 95 ((( 96 -The First Terraformer Conflict: The Second Terraformer Fleet having been corrupted by Martin Winters begins destroying the worlds they were created to build. They then set about their new goal of eliminating all biological life. 96 +**The First Terraformer Conflict:** The Second Terraformer Fleet having been corrupted by Martin Winters begins destroying the worlds they were created to build. They then set about their new goal of eliminating all biological life. 97 97 ))) 98 98 |(% colspan="1" %)(% colspan="1" %) 99 99 ((( ... ... @@ -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 ((( ... ... @@ -275,7 +275,7 @@ 275 275 276 276 )))|(% colspan="1" %)(% colspan="1" %) 277 277 ((( 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 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. 279 279 ))) 280 280 |(% colspan="1" %)(% colspan="1" %) 281 281 ((( ... ... @@ -314,7 +314,7 @@ 314 314 315 315 )))|(% colspan="1" %)(% colspan="1" %) 316 316 ((( 317 -The [[Yaki Syndicate>>doc:Yaki]] forms 317 +The [[Yaki Syndicate>>doc:Yaki]] forms. 318 318 ))) 319 319 |(% colspan="1" %)(% colspan="1" %) 320 320 ((( ... ... @@ -327,7 +327,7 @@ 327 327 328 328 )))|(% colspan="1" %)(% colspan="1" %) 329 329 ((( 330 -A sole (% class="confluence-link" %)enon[[ x>>doc:Xenon]](%%) ship enters [[doc:Sol]] using a "Gateless Jumpdrive". Terran engineers begin reverse-engineering the drive for the //USC X.//330 +A sole (% class="confluence-link" %)enon[[X>>doc:Xenon]](%%) ship enters [[doc:Sol]] using a "Gateless Jumpdrive". Terran engineers begin reverse-engineering the drive for the //USC X.// 331 331 ))) 332 332 |(% rowspan="5" %)(% rowspan="5" %) 333 333 ((( ... ... @@ -421,7 +421,7 @@ 421 421 ))) 422 422 |(% colspan="1" %)(% colspan="1" %) 423 423 ((( 424 -The Battle of Omicron Lyrae: An immense Kha'ak fleet and planet killer ship attempts to raze Omicron Lyrae. 424 +**The Battle of Omicron Lyrae:** An immense Kha'ak fleet and planet killer ship attempts to raze Omicron Lyrae. 425 425 ))) 426 426 |(% rowspan="7" %)(% rowspan="7" %) 427 427 ((( ... ... @@ -438,7 +438,7 @@ 438 438 ))) 439 439 |(% colspan="1" %)(% colspan="1" %) 440 440 ((( 441 -The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jump Gate network. The Earth Government is invited to join the Argon Federation, Earth declines.441 +**Reunion:** The Paranid Empire constructs a Jump Gate to reconnect Earth to the Jumpgate network. The Earth Government is invited to join the Argon Federation and the Community of Planets, Earth declines. 442 442 ))) 443 443 |(% colspan="1" %)(% colspan="1" %) 444 444 ((( ... ... @@ -445,7 +445,7 @@ 445 445 446 446 )))|(% colspan="1" %)(% colspan="1" %) 447 447 ((( 448 -The Earth Jump Gate is relocated to the [[doc:Asteroid Belt]] to protect Earth.448 +The Earth Jumpgate is relocated to the [[doc:Asteroid Belt]] to protect Earth. 449 449 ))) 450 450 |(% class="highlight-green" data-highlight-colour="green" rowspan="4" %)(% class="highlight-green" data-highlight-colour="green" rowspan="4" %) 451 451 ((( ... ... @@ -511,7 +511,7 @@ 511 511 )))|(% colspan="1" %)(% colspan="1" %) 512 512 ((( 513 513 2944 514 -)))|(% class="highlight-yellow" data-highlight-colour="yellow" rowspan=" 2" %)(% class="highlight-yellow" data-highlight-colour="yellow" rowspan="2" %)514 +)))|(% class="highlight-yellow" data-highlight-colour="yellow" rowspan="3" %)(% class="highlight-yellow" data-highlight-colour="yellow" rowspan="3" %) 515 515 ((( 516 516 X3:AP* 517 517 )))|(% colspan="1" %)(% colspan="1" %) ... ... @@ -518,6 +518,16 @@ 518 518 ((( 519 519 **Terran Conflict:** War begins between the [[Terrans >>doc:Terran Protectorate]]and their Argon cousins over the latter's continued usage of AGI. The remainder of the Community of Planets later joins in support of the [[doc:Argon Federation]]. 520 520 ))) 521 +|(% colspan="1" %)(% colspan="1" %) 522 +((( 523 +776 524 +)))|(% colspan="1" %)(% colspan="1" %) 525 +((( 526 +2946 527 +)))|(% colspan="1" %)(% colspan="1" %) 528 +((( 529 +**Second Terraformer Conflict:** The Beryll unleashes newly built terraformer drones against Sol 530 +))) 521 521 |(% rowspan="2" %)(% rowspan="2" %) 522 522 ((( 523 523 778 ... ... @@ -559,7 +559,7 @@ 559 559 560 560 )))|(% colspan="1" %)(% colspan="1" %) 561 561 ((( 562 -**The Jump Gate Shutdown**572 +**The Jumpgate Shutdown** 563 563 ))) 564 564 |(% colspan="1" %)(% colspan="1" %) 565 565 ((( ... ... @@ -611,7 +611,7 @@ 611 611 X:R 612 612 )))|(% colspan="1" %)(% colspan="1" %) 613 613 ((( 614 -The Jump Gates reopen and realign connecting unstable pockets of the former JumpGate network in an unpredictable manner.624 +The Jumpgates reopen and realign connecting unstable pockets of the former Jumpgate network in an unpredictable manner. 615 615 ))) 616 616 |(% colspan="1" %)(% colspan="1" %) 617 617 (((
- Confluence.Code.ConfluencePageClass[0]
-
- id
-
... ... @@ -1,1 +1,1 @@ 1 -106 3326941 +106889537 - url
-
... ... @@ -1,1 +1,1 @@ 1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106 332694/Timeline1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/106889537/Timeline