Changes for page Timeline

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

From version 36.1
edited by Daniel Turner
on 2021/05/29 08:40
Change comment: There is no comment for this version
To version 37.1
edited by Daniel Turner
on 2021/05/29 08:52
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -292,6 +292,32 @@
292 292  )))
293 293  |(% colspan="1" %)(% colspan="1" %)
294 294  (((
295 +725
296 +)))|(% colspan="1" %)(% colspan="1" %)
297 +(((
298 +2895
299 +)))|(% colspan="1" %)(% colspan="1" %)
300 +(((
301 +
302 +)))|(% colspan="1" %)(% colspan="1" %)
303 +(((
304 +The [[Yaki Syndicate>>doc:Yaki]] forms
305 +)))
306 +|(% colspan="1" %)(% colspan="1" %)
307 +(((
308 +725
309 +)))|(% colspan="1" %)(% colspan="1" %)
310 +(((
311 +2895
312 +)))|(% colspan="1" %)(% colspan="1" %)
313 +(((
314 +
315 +)))|(% colspan="1" %)(% colspan="1" %)
316 +(((
317 +A prototype Xenon 'Jumpship' enters the Sol system. Terran engineers begin reverse-engineering the technology.
318 +)))
319 +|(% colspan="1" %)(% colspan="1" %)
320 +(((
295 295  735
296 296  )))|(% colspan="1" %)(% colspan="1" %)
297 297  (((
... ... @@ -329,7 +329,7 @@
329 329  X:T
330 330  )))|(% colspan="1" %)(% colspan="1" %)
331 331  (((
332 -Arrival of Kyle Brennan and //USC X// (Xperimental Shuttle) in the Jump Gate network after a Jump Drive test.
358 +Arrival of 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  (((
... ... @@ -342,7 +342,7 @@
342 342  
343 343  )))|(% colspan="1" %)(% colspan="1" %)
344 344  (((
345 -Arrival of Elena Kho and //Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X.//
371 +Arrival of Elena Kho and  //USC Getsu Fune //in the Jump Gate network in search of Kyle Brennan and the //USC X.//
346 346  )))
347 347  |(% colspan="1" %)(% colspan="1" %)
348 348  (((
... ... @@ -368,7 +368,7 @@
368 368  
369 369  )))|(% colspan="1" %)(% colspan="1" %)
370 370  (((
371 -[[doc:XRWIKI.Terracorp]] is established by Kyle Brennan and Elena Kho to finance research to return to earth.
397 +[[doc:XRWIKI.Terracorp]] is established by Kyle Brennan and Elena Kho to finance 'Jumpdrive' research to return to earth.
372 372  )))
373 373  |(% colspan="1" %)(% colspan="1" %)
374 374  (((
... ... @@ -502,6 +502,19 @@
502 502  )))
503 503  |(% colspan="1" %)(% colspan="1" %)
504 504  (((
531 +~~770
532 +)))|(% colspan="1" %)(% colspan="1" %)
533 +(((
534 +~~2940
535 +)))|(% colspan="1" %)(% colspan="1" %)
536 +(((
537 +
538 +)))|(% colspan="1" %)(% colspan="1" %)
539 +(((
540 +[[Family Zyarth>>doc:Zyarth Patriarchy]] and [[Family Ryk>>doc:XRWIKI.Family Ryak]] are cut-off from the Jump Gate Network.
541 +)))
542 +|(% colspan="1" %)(% colspan="1" %)
543 +(((
505 505  774
506 506  )))|(% colspan="1" %)(% colspan="1" %)
507 507  (((
... ... @@ -576,7 +576,7 @@
576 576  
577 577  )))|(% colspan="1" %)(% colspan="1" %)
578 578  (((
579 -USC and ATF are reformed into the Terran Protectorate.
618 +USC and ATF are reformed into the [[doc:Terran Protectorate]].
580 580  )))
581 581  |(% colspan="1" %)(% colspan="1" %)
582 582  (((
Confluence.Code.ConfluencePageClass[0]
id
... ... @@ -1,1 +1,1 @@
1 -103284802
1 +103284803
url
... ... @@ -1,1 +1,1 @@
1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/103284802/Timeline
1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/103284803/Timeline