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

...	...	@@ -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", The sector Antigone Memorial and The [[doc:Antigone Republic]] 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,36 @@
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	+(((
	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	+(((
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
	278	+[[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
	291	+Evolution of the [[doc:Xenon]]
253	253	)))
254	254	|(% colspan="1" %)(% colspan="1" %)
255	255	(((
...	...	@@ -259,7 +259,9 @@
259	259	2912
260	260	)))|(% colspan="1" %)(% colspan="1" %)
261	261	(((
262		-X:Btf / X:T
	301	+X:Btf /
	302	+
	303	+X:T
263	263	)))|(% colspan="1" %)(% colspan="1" %)
264	264	(((
265	265	Arrival of USC X and Kyle Brennan
...	...	@@ -275,7 +275,7 @@
275	275
276	276	)))|(% colspan="1" %)(% colspan="1" %)
277	277	(((
278		-First contact with the Kha'ak
	319	+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
	371	+Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
331	331	)))
332	332	|(% colspan="1" %)(% colspan="1" %)
333	333	(((
...	...	@@ -366,7 +366,7 @@
366	366	X3:AP*
367	367	)))|(% colspan="1" %)(% colspan="1" %)
368	368	(((
369		-The Terran Conflict
	410	+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]]
370	370	)))
371	371	|(% colspan="1" %)(% colspan="1" %)
372	372	(((
...	...	@@ -392,7 +392,7 @@
392	392	X3:AP
393	393	)))|(% colspan="1" %)(% colspan="1" %)
394	394	(((
395		-
	436	+Highways near completion in Albion based on Terran Trans-Orbital Accelerator technology reverse engineered by [[Jonferco (JSS)>>doc:XRWIKI.Jonferson Space Systems]]
396	396	)))
397	397	|(% colspan="1" %)(% colspan="1" %)
398	398	(((
...	...	@@ -422,6 +422,19 @@
422	422	)))
423	423	|(% colspan="1" %)(% colspan="1" %)
424	424	(((
	466	+782
	467	+)))|(% colspan="1" %)(% colspan="1" %)
	468	+(((
	469	+2952
	470	+)))|(% colspan="1" %)(% colspan="1" %)
	471	+(((
	472	+X:R*
	473	+)))|(% colspan="1" %)(% colspan="1" %)
	474	+(((
	475	+[[Plutarch Mining Corporation (PMC)>>doc:XRWIKI.Plutarch Mining Corporation]] takes control of the Albion system
	476	+)))
	477	+|(% colspan="1" %)(% colspan="1" %)
	478	+(((
425	425	801
426	426	)))|(% colspan="1" %)(% colspan="1" %)
427	427	(((
...	...	@@ -431,7 +431,7 @@
431	431
432	432	)))|(% colspan="1" %)(% colspan="1" %)
433	433	(((
434		-The Alliance of the Word is established
	488	+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	(((
	505	+803
	506	+)))|(% colspan="1" %)(% colspan="1" %)
	507	+(((
	508	+2973
	509	+)))|(% colspan="1" %)(% colspan="1" %)
	510	+(((
	511	+X:R
	512	+)))|(% colspan="1" %)(% colspan="1" %)
	513	+(((
	514	+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
	515	+)))
	516	+|(% colspan="1" %)(% colspan="1" %)
	517	+(((
451	451	820
452	452	)))|(% colspan="1" %)(% colspan="1" %)
453	453	(((
...	...	@@ -461,6 +461,19 @@
461	461	)))
462	462	|(% colspan="1" %)(% colspan="1" %)
463	463	(((
	531	+820
	532	+)))|(% colspan="1" %)(% colspan="1" %)
	533	+(((
	534	+2990
	535	+)))|(% colspan="1" %)(% colspan="1" %)
	536	+(((
	537	+
	538	+)))|(% colspan="1" %)(% colspan="1" %)
	539	+(((
	540	+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
	541	+)))
	542	+|(% colspan="1" %)(% colspan="1" %)
	543	+(((
464	464	825
465	465	)))|(% colspan="1" %)(% colspan="1" %)
466	466	(((
...	...	@@ -470,9 +470,37 @@
470	470	X4:F
471	471	)))|(% colspan="1" %)(% colspan="1" %)
472	472	(((
473		-
	553	+Boso Ta escapes Split capture and steals a Terran Science Station
474	474	)))
	555	+|(% colspan="1" %)(% colspan="1" %)
	556	+(((
	557	+825
	558	+)))|(% colspan="1" %)(% colspan="1" %)
	559	+(((
	560	+2995
	561	+)))|(% colspan="1" %)(% colspan="1" %)
	562	+(((
	563	+X4:F
475	475
	565	+(SV)
	566	+)))|(% colspan="1" %)(% colspan="1" %)
	567	+(((
	568	+The remains of the [[Free Families Fleet>>doc:Free Families]] is destroyed by the [[Zyarth Patriarchy>>doc:Zyarth Patriarcy]] in Fires of Defeat/Victory
	569	+)))
	570	+|(% colspan="1" %)(% colspan="1" %)
	571	+(((
	572	+825
	573	+)))|(% colspan="1" %)(% colspan="1" %)
	574	+(((
	575	+2995
	576	+)))|(% colspan="1" %)(% colspan="1" %)
	577	+(((
	578	+X4:F
	579	+)))|(% colspan="1" %)(% colspan="1" %)
	580	+(((
	581	+The [[doc:Hatikvah Free League]] breaks away from dealing with the [[doc:Scale Plate Pact]] with [[doc:Argon Federation]] Support
	582	+)))
	583	+
476	476
477	477
478	478
...	...	@@ -489,7 +489,7 @@
489	489	|(((
490	490	NT
491	491	)))|(((
492		-New Time
	600	+New Time (years since removing Earth from Argon history)
493	493	)))
494	494	|(((
495	495	EY
...	...	@@ -496,6 +496,13 @@
496	496	)))|(((
497	497	Earth Years /AD/CE
498	498	)))
	607	+|(% colspan="1" %)(% colspan="1" %)
	608	+(((
	609	+*
	610	+)))|(% colspan="1" %)(% colspan="1" %)
	611	+(((
	612	+Prologue
	613	+)))
499	499	|(((
500	500	X:Btf
501	501	)))|(((
...	...	@@ -531,13 +531,6 @@
531	531	)))
532	532	|(% colspan="1" %)(% colspan="1" %)
533	533	(((
534		-X3:AP*
535		-)))|(% colspan="1" %)(% colspan="1" %)
536		-(((
537		-X3: AP (Prologue)
538		-)))
539		-|(% colspan="1" %)(% colspan="1" %)
540		-(((
541	541	X3:AP
542	542	)))|(% colspan="1" %)(% colspan="1" %)
543	543	(((
...	...	@@ -557,6 +557,20 @@
557	557	(((
558	558	X4: Foundations (2018)
559	559	)))
	668	+|(% colspan="1" %)(% colspan="1" %)
	669	+(((
	670	+(SV)
	671	+)))|(% colspan="1" %)(% colspan="1" %)
	672	+(((
	673	+X4: Foundations Split Vendetta DLC (2020)
	674	+)))
	675	+|(% colspan="1" %)(% colspan="1" %)
	676	+(((
	677	+(CoH)
	678	+)))|(% colspan="1" %)(% colspan="1" %)
	679	+(((
	680	+X4: Foundations Cradle of Humanity DLC (Q1 2021(anticipated))
	681	+)))
560	560	{{/layout-cell}}
561	561	{{/layout-section}}
562	562	{{/layout}}

Confluence.Code.ConfluencePageClass[0]

id

...	...	@@ -1,1 +1,1 @@
1		-100466956
	1	+100466982

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/100466982/Timeline