Changes for page Timeline
Last modified by Daniel Turner on 2025/09/10 16:00
From version 13.1
edited by Daniel Turner
on 2020/11/19 11:31
on 2020/11/19 11:31
Change comment:
There is no comment for this version
To version 14.1
edited by Daniel Turner
on 2020/11/19 11:50
on 2020/11/19 11:50
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
-
... ... @@ -93,7 +93,7 @@ 93 93 94 94 )))|(% colspan="1" %)(% colspan="1" %) 95 95 ((( 96 -The Earth Jump Gate is destroyed To protect Earth96 +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 ((( ... ... @@ -158,7 +158,7 @@ 158 158 159 159 )))|(% colspan="1" %)(% colspan="1" %) 160 160 ((( 161 -Xenon destroy the spaceport "Antigone", Antigone Memorial is named in its honour 161 +[[doc:Xenon]] destroy the spaceport "Antigone", Antigone Memorial is named in its honour 162 162 ))) 163 163 |(% colspan="1" %)(% colspan="1" %) 164 164 ((( ... ... @@ -236,7 +236,7 @@ 236 236 237 237 )))|(% colspan="1" %)(% colspan="1" %) 238 238 ((( 239 -First contact with Teladi 239 +First contact with [[Teladi>>doc:Teladi Company]] 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 -Xenon ship enters Sol using a Gateless Jumpdrive 265 +[[doc:Xenon]] ship enters Sol using a Gateless Jumpdrive 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 -Evolution of the Xenon 278 +Evolution of the [[doc:Xenon]] 279 279 ))) 280 280 |(% colspan="1" %)(% colspan="1" %) 281 281 ((( ... ... @@ -301,7 +301,7 @@ 301 301 302 302 )))|(% colspan="1" %)(% colspan="1" %) 303 303 ((( 304 -First contact with the Kha'ak 304 +First contact with the [[Kha'ak>>doc:Kha'ak]] 305 305 ))) 306 306 |(% colspan="1" %)(% colspan="1" %) 307 307 ((( ... ... @@ -353,7 +353,7 @@ 353 353 X3:TC 354 354 )))|(% colspan="1" %)(% colspan="1" %) 355 355 ((( 356 -Relations with the Terrans begin to cool 356 +Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool 357 357 ))) 358 358 |(% colspan="1" %)(% colspan="1" %) 359 359 ((( ... ... @@ -418,7 +418,7 @@ 418 418 X3:AP 419 419 )))|(% colspan="1" %)(% colspan="1" %) 420 420 ((( 421 - 421 +Plutarch gains influence over the Albion system 422 422 ))) 423 423 |(% colspan="1" %)(% colspan="1" %) 424 424 ((( ... ... @@ -457,7 +457,7 @@ 457 457 458 458 )))|(% colspan="1" %)(% colspan="1" %) 459 459 ((( 460 -The Alliance of the Word is established 460 +The [[doc:Alliance of the Word]] is established 461 461 ))) 462 462 |(% colspan="1" %)(% colspan="1" %) 463 463 ((( ... ... @@ -474,6 +474,19 @@ 474 474 ))) 475 475 |(% colspan="1" %)(% colspan="1" %) 476 476 ((( 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 +((( 477 477 820 478 478 )))|(% colspan="1" %)(% colspan="1" %) 479 479 ((( ... ... @@ -515,7 +515,7 @@ 515 515 |((( 516 516 NT 517 517 )))|((( 518 -New Time 531 +New Time (years since removing Earth from Argon history) 519 519 ))) 520 520 |((( 521 521 EY
- Confluence.Code.ConfluencePageClass[0]
-
- id
-
... ... @@ -1,1 +1,1 @@ 1 -1004669 581 +100466961 - url
-
... ... @@ -1,1 +1,1 @@ 1 -https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/1004669 58/Timeline1 +https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466961/Timeline