Changes for page Timeline

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • Confluence.Code.ConfluencePageClass[0]

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 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	(((
...	...	@@ -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", The sector Antigone Memorial and The [[doc:Antigone Republic]] 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	(((
...	...	@@ -253,6 +253,19 @@
253	253	)))
254	254	|(% colspan="1" %)(% colspan="1" %)
255	255	(((
	256	+~~608
	257	+)))|(% colspan="1" %)(% colspan="1" %)
	258	+(((
	259	+~~2778
	260	+)))|(% colspan="1" %)(% colspan="1" %)
	261	+(((
	262	+
	263	+)))|(% colspan="1" %)(% colspan="1" %)
	264	+(((
	265	+The [[doc:Hatikvah Free League]] is established
	266	+)))
	267	+|(% colspan="1" %)(% colspan="1" %)
	268	+(((
256	256	735
257	257	)))|(% colspan="1" %)(% colspan="1" %)
258	258	(((
...	...	@@ -262,7 +262,7 @@
262	262
263	263	)))|(% colspan="1" %)(% colspan="1" %)
264	264	(((
265		-Xenon ship enters Sol using a Gateless Jumpdrive
	278	+[[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
	291	+Evolution of the [[doc:Xenon]]
279	279	)))
280	280	|(% colspan="1" %)(% colspan="1" %)
281	281	(((
...	...	@@ -285,7 +285,9 @@
285	285	2912
286	286	)))|(% colspan="1" %)(% colspan="1" %)
287	287	(((
288		-X:Btf / X:T
	301	+X:Btf /
	302	+
	303	+X:T
289	289	)))|(% colspan="1" %)(% colspan="1" %)
290	290	(((
291	291	Arrival of USC X and Kyle Brennan
...	...	@@ -292,6 +292,19 @@
292	292	)))
293	293	|(% colspan="1" %)(% colspan="1" %)
294	294	(((
	310	+742
	311	+)))|(% colspan="1" %)(% colspan="1" %)
	312	+(((
	313	+2912
	314	+)))|(% colspan="1" %)(% colspan="1" %)
	315	+(((
	316	+
	317	+)))|(% colspan="1" %)(% colspan="1" %)
	318	+(((
	319	+The Jump Gate network is reconfigured with the [[Teladi>>doc:Teladi Company]] home-world (Ianamus Zura) cut-off
	320	+)))
	321	+|(% colspan="1" %)(% colspan="1" %)
	322	+(((
295	295	763
296	296	)))|(% colspan="1" %)(% colspan="1" %)
297	297	(((
...	...	@@ -301,7 +301,7 @@
301	301
302	302	)))|(% colspan="1" %)(% colspan="1" %)
303	303	(((
304		-First contact with the Kha'ak
	332	+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
	384	+Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
357	357	)))
358	358	|(% colspan="1" %)(% colspan="1" %)
359	359	(((
...	...	@@ -392,7 +392,7 @@
392	392	X3:AP*
393	393	)))|(% colspan="1" %)(% colspan="1" %)
394	394	(((
395		-The Terran Conflict
	423	+The Terran Conflict begins between the [[Terrans >>doc:Terran Faction 1]]and their Argon cousins, The Community of Planets later joins in support of the [[doc:Argon Federation]]
396	396	)))
397	397	|(% colspan="1" %)(% colspan="1" %)
398	398	(((
...	...	@@ -418,7 +418,7 @@
418	418	X3:AP
419	419	)))|(% colspan="1" %)(% colspan="1" %)
420	420	(((
421		-
	449	+Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
422	422	)))
423	423	|(% colspan="1" %)(% colspan="1" %)
424	424	(((
...	...	@@ -448,6 +448,19 @@
448	448	)))
449	449	|(% colspan="1" %)(% colspan="1" %)
450	450	(((
	479	+782
	480	+)))|(% colspan="1" %)(% colspan="1" %)
	481	+(((
	482	+2952
	483	+)))|(% colspan="1" %)(% colspan="1" %)
	484	+(((
	485	+X:R*
	486	+)))|(% colspan="1" %)(% colspan="1" %)
	487	+(((
	488	+[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system
	489	+)))
	490	+|(% colspan="1" %)(% colspan="1" %)
	491	+(((
451	451	801
452	452	)))|(% colspan="1" %)(% colspan="1" %)
453	453	(((
...	...	@@ -457,7 +457,7 @@
457	457
458	458	)))|(% colspan="1" %)(% colspan="1" %)
459	459	(((
460		-The Alliance of the Word is established
	501	+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	(((
	518	+803
	519	+)))|(% colspan="1" %)(% colspan="1" %)
	520	+(((
	521	+2973
	522	+)))|(% colspan="1" %)(% colspan="1" %)
	523	+(((
	524	+X:R
	525	+)))|(% colspan="1" %)(% colspan="1" %)
	526	+(((
	527	+A treaty is signed between the remnants of the [[doc:XRWIKI.Argon Government]], [[Heart of Albion >>doc:XRWIKI.Heart of Albion]]and The Republic of Canterra, bringing an end to the Terran Conflict
	528	+)))
	529	+|(% colspan="1" %)(% colspan="1" %)
	530	+(((
477	477	820
478	478	)))|(% colspan="1" %)(% colspan="1" %)
479	479	(((
...	...	@@ -487,6 +487,19 @@
487	487	)))
488	488	|(% colspan="1" %)(% colspan="1" %)
489	489	(((
	544	+820
	545	+)))|(% colspan="1" %)(% colspan="1" %)
	546	+(((
	547	+2990
	548	+)))|(% colspan="1" %)(% colspan="1" %)
	549	+(((
	550	+
	551	+)))|(% colspan="1" %)(% colspan="1" %)
	552	+(((
	553	+Paranid Civil war begins between the [[doc:Godrealm of the Paranid]] and the [[doc:Holy Order of the Pontifex]] after each faction establishes their own Pontifex during The Jump Gate Shutdown
	554	+)))
	555	+|(% colspan="1" %)(% colspan="1" %)
	556	+(((
490	490	825
491	491	)))|(% colspan="1" %)(% colspan="1" %)
492	492	(((
...	...	@@ -496,9 +496,37 @@
496	496	X4:F
497	497	)))|(% colspan="1" %)(% colspan="1" %)
498	498	(((
499		-
	566	+Boso Ta escapes Split capture and steals a Terran Science Station
500	500	)))
	568	+|(% colspan="1" %)(% colspan="1" %)
	569	+(((
	570	+825
	571	+)))|(% colspan="1" %)(% colspan="1" %)
	572	+(((
	573	+2995
	574	+)))|(% colspan="1" %)(% colspan="1" %)
	575	+(((
	576	+X4:F
501	501
	578	+(SV)
	579	+)))|(% colspan="1" %)(% colspan="1" %)
	580	+(((
	581	+The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
	582	+)))
	583	+|(% colspan="1" %)(% colspan="1" %)
	584	+(((
	585	+825
	586	+)))|(% colspan="1" %)(% colspan="1" %)
	587	+(((
	588	+2995
	589	+)))|(% colspan="1" %)(% colspan="1" %)
	590	+(((
	591	+X4:F
	592	+)))|(% colspan="1" %)(% colspan="1" %)
	593	+(((
	594	+The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
	595	+)))
	596	+
502	502
503	503
504	504
...	...	@@ -515,7 +515,7 @@
515	515	|(((
516	516	NT
517	517	)))|(((
518		-New Time
	613	+New Time (years since removing Earth from Argon history)
519	519	)))
520	520	|(((
521	521	EY
...	...	@@ -522,6 +522,13 @@
522	522	)))|(((
523	523	Earth Years /AD/CE
524	524	)))
	620	+|(% colspan="1" %)(% colspan="1" %)
	621	+(((
	622	+*
	623	+)))|(% colspan="1" %)(% colspan="1" %)
	624	+(((
	625	+Prologue
	626	+)))
525	525	|(((
526	526	X:Btf
527	527	)))|(((
...	...	@@ -557,13 +557,6 @@
557	557	)))
558	558	|(% colspan="1" %)(% colspan="1" %)
559	559	(((
560		-X3:AP*
561		-)))|(% colspan="1" %)(% colspan="1" %)
562		-(((
563		-X3: AP (Prologue)
564		-)))
565		-|(% colspan="1" %)(% colspan="1" %)
566		-(((
567	567	X3:AP
568	568	)))|(% colspan="1" %)(% colspan="1" %)
569	569	(((
...	...	@@ -583,6 +583,20 @@
583	583	(((
584	584	X4: Foundations (2018)
585	585	)))
	681	+|(% colspan="1" %)(% colspan="1" %)
	682	+(((
	683	+(SV)
	684	+)))|(% colspan="1" %)(% colspan="1" %)
	685	+(((
	686	+X4: Foundations Split Vendetta DLC (2020)
	687	+)))
	688	+|(% colspan="1" %)(% colspan="1" %)
	689	+(((
	690	+(CoH)
	691	+)))|(% colspan="1" %)(% colspan="1" %)
	692	+(((
	693	+X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
	694	+)))
586	586	{{/layout-cell}}
587	587	{{/layout-section}}
588	588	{{/layout}}

Confluence.Code.ConfluencePageClass[0]

id

...	...	@@ -1,1 +1,1 @@
1		-100466958
	1	+100466983

url

...	...	@@ -1,1 +1,1 @@
1		-https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466958/Timeline
	1	+https://www.egosoft.com:8444/confluence/wiki/spaces/X4WIKI/pages/100466983/Timeline