Skip to Content

Changes for page Timeline

Last modified by Daniel Turner on 2025/09/10 16:00
From version 11.1
edited by Daniel Turner
on 2020/11/19 11:24
Change comment: There is no comment for this version
To version 14.1
edited by Daniel Turner
on 2020/11/19 11:50
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 jlight of the Winterblossom
34 +The flight 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
122 +Earth is removed from the history of the conflict's survivors who go on to from the [[doc:Argon Federation]]
123 123  )))
124 124  |(% colspan="1" %)(% colspan="1" %)
125 125  (((
... ... @@ -149,6 +149,19 @@
149 149  )))
150 150  |(% colspan="1" %)(% colspan="1" %)
151 151  (((
152 +215
153 +)))|(% colspan="1" %)(% colspan="1" %)
154 +(((
155 +2385
156 +)))|(% colspan="1" %)(% colspan="1" %)
157 +(((
158 +
159 +)))|(% colspan="1" %)(% colspan="1" %)
160 +(((
161 +[[doc:Xenon]] destroy the spaceport "Antigone", Antigone Memorial is named in its honour
162 +)))
163 +|(% colspan="1" %)(% colspan="1" %)
164 +(((
152 152  241
153 153  )))|(% colspan="1" %)(% colspan="1" %)
154 154  (((
... ... @@ -158,7 +158,7 @@
158 158  
159 159  )))|(% colspan="1" %)(% colspan="1" %)
160 160  (((
161 -Foundation of the Argon Federation
174 +Foundation of the Federation
162 162  )))
163 163  |(% colspan="1" %)(% colspan="1" %)
164 164  (((
... ... @@ -223,10 +223,23 @@
223 223  
224 224  )))|(% colspan="1" %)(% colspan="1" %)
225 225  (((
226 -First contact with Teladi
239 +First contact with [[Teladi>>doc:Teladi Company]]
227 227  )))
228 228  |(% colspan="1" %)(% colspan="1" %)
229 229  (((
243 +589
244 +)))|(% colspan="1" %)(% colspan="1" %)
245 +(((
246 +2759
247 +)))|(% colspan="1" %)(% colspan="1" %)
248 +(((
249 +
250 +)))|(% colspan="1" %)(% colspan="1" %)
251 +(((
252 +Credits become the currency of the X universe
253 +)))
254 +|(% colspan="1" %)(% colspan="1" %)
255 +(((
230 230  735
231 231  )))|(% colspan="1" %)(% colspan="1" %)
232 232  (((
... ... @@ -236,7 +236,7 @@
236 236  
237 237  )))|(% colspan="1" %)(% colspan="1" %)
238 238  (((
239 -Xenon ship enters Sol using a Gateless Jumpdrive
265 +[[doc:Xenon]] ship enters Sol using a Gateless Jumpdrive
240 240  )))
241 241  |(% colspan="1" %)(% colspan="1" %)
242 242  (((
... ... @@ -249,7 +249,7 @@
249 249  
250 250  )))|(% colspan="1" %)(% colspan="1" %)
251 251  (((
252 -Evolution of the Xenon
278 +Evolution of the [[doc:Xenon]]
253 253  )))
254 254  |(% colspan="1" %)(% colspan="1" %)
255 255  (((
... ... @@ -275,7 +275,7 @@
275 275  
276 276  )))|(% colspan="1" %)(% colspan="1" %)
277 277  (((
278 -First contact with the Kha'ak
304 +First contact with the [[Kha'ak>>doc:Kha'ak]]
279 279  )))
280 280  |(% colspan="1" %)(% colspan="1" %)
281 281  (((
... ... @@ -327,7 +327,7 @@
327 327  X3:TC
328 328  )))|(% colspan="1" %)(% colspan="1" %)
329 329  (((
330 -Relations with the Terrans begin to cool
356 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
331 331  )))
332 332  |(% colspan="1" %)(% colspan="1" %)
333 333  (((
... ... @@ -392,7 +392,7 @@
392 392  X3:AP
393 393  )))|(% colspan="1" %)(% colspan="1" %)
394 394  (((
395 -
421 +Plutarch gains influence over the Albion system
396 396  )))
397 397  |(% colspan="1" %)(% colspan="1" %)
398 398  (((
... ... @@ -431,7 +431,7 @@
431 431  
432 432  )))|(% colspan="1" %)(% colspan="1" %)
433 433  (((
434 -The Alliance of the Word is established
460 +The [[doc:Alliance of the Word]] is established
435 435  )))
436 436  |(% colspan="1" %)(% colspan="1" %)
437 437  (((
... ... @@ -448,6 +448,19 @@
448 448  )))
449 449  |(% colspan="1" %)(% colspan="1" %)
450 450  (((
477 +803
478 +)))|(% colspan="1" %)(% colspan="1" %)
479 +(((
480 +2973
481 +)))|(% colspan="1" %)(% colspan="1" %)
482 +(((
483 +X:R
484 +)))|(% colspan="1" %)(% colspan="1" %)
485 +(((
486 +A treaty is signed between the remnants of the Argon Government, Heart of Albion and Canterran Republic, bringing an end to the Terran Conflict
487 +)))
488 +|(% colspan="1" %)(% colspan="1" %)
489 +(((
451 451  820
452 452  )))|(% colspan="1" %)(% colspan="1" %)
453 453  (((
... ... @@ -489,7 +489,7 @@
489 489  |(((
490 490  NT
491 491  )))|(((
492 -New Time
531 +New Time (years since removing Earth from Argon history)
493 493  )))
494 494  |(((
495 495  EY
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -100466956
1 +100466961
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466956/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466961/Timeline