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

...	...	@@ -6,7 +6,7 @@
6	6	|=(((
7	7	NT
8	8	)))|=(((
9		-EY
	9	+CE
10	10	)))|=(% colspan="1" %)(% colspan="1" %)
11	11	(((
12	12	X-Game
...	...	@@ -16,58 +16,45 @@
16	16	|(((
17	17	-128
18	18	)))|(((
19		-2042
	19	+
20	20	)))|(% colspan="1" %)(% colspan="1" %)
21	21	(((
22	22
23	23	)))|(((
24		-Earth scientists create Jump Gates
	24	+Earth Scientists Create Jumpgates
25	25	)))
26	26	|(((
27	27	-124
28	28	)))|(((
29		-2046
	29	+
30	30	)))|(% colspan="1" %)(% colspan="1" %)
31	31	(((
32	32
33	33	)))|(((
34		-The flight of the Winterblossom
	34	+The Flight of the Winterblossom
35	35	)))
36	36	|(% colspan="1" %)(% colspan="1" %)
37	37	(((
38		--118
	38	+-104
39	39	)))|(% colspan="1" %)(% colspan="1" %)
40	40	(((
41		-2052
42		-)))|(% colspan="1" %)(% colspan="1" %)
43		-(((
44	44
45	45	)))|(% colspan="1" %)(% colspan="1" %)
46	46	(((
47		-USC established
48		-)))
49		-|(% colspan="1" %)(% colspan="1" %)
50		-(((
51		--104
52		-)))|(% colspan="1" %)(% colspan="1" %)
53		-(((
54		-2066
55		-)))|(% colspan="1" %)(% colspan="1" %)
56		-(((
57	57
58	58	)))|(% colspan="1" %)(% colspan="1" %)
59	59	(((
60		-Terraformer Project begins
	47	+Terraformer Project Begins
61	61	)))
62	62	|(((
63	63	-71
64	64	)))|(((
65		-2099
	52	+
66	66	)))|(% colspan="1" %)(% colspan="1" %)
67	67	(((
68	68
69	69	)))|(((
70		-Terraformer Project is terminated
	57	+Terraformer Project is Terminated
71	71	)))
72	72	|(% colspan="1" %)(% colspan="1" %)
73	73	(((
...	...	@@ -74,7 +74,7 @@
74	74	-25
75	75	)))|(% colspan="1" %)(% colspan="1" %)
76	76	(((
77		-2145
	64	+
78	78	)))|(% colspan="1" %)(% colspan="1" %)
79	79	(((
80	80
...	...	@@ -84,32 +84,6 @@
84	84	)))
85	85	|(% colspan="1" %)(% colspan="1" %)
86	86	(((
87		--23
88		-)))|(% colspan="1" %)(% colspan="1" %)
89		-(((
90		-2147
91		-)))|(% colspan="1" %)(% colspan="1" %)
92		-(((
93		-
94		-)))|(% colspan="1" %)(% colspan="1" %)
95		-(((
96		-The Earth Jump Gate is destroyed to protect Earth
97		-)))
98		-|(% colspan="1" %)(% colspan="1" %)
99		-(((
100		--23
101		-)))|(% colspan="1" %)(% colspan="1" %)
102		-(((
103		-2147
104		-)))|(% colspan="1" %)(% colspan="1" %)
105		-(((
106		-
107		-)))|(% colspan="1" %)(% colspan="1" %)
108		-(((
109		-The Terraformer Conflict ends
110		-)))
111		-|(% colspan="1" %)(% colspan="1" %)
112		-(((
113	113	0
114	114	)))|(% colspan="1" %)(% colspan="1" %)
115	115	(((
...	...	@@ -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 who go on to from the [[doc:Argon Federation]]
	83	+
123	123	)))
124	124	|(% colspan="1" %)(% colspan="1" %)
125	125	(((
...	...	@@ -126,48 +126,22 @@
126	126	130
127	127	)))|(% colspan="1" %)(% colspan="1" %)
128	128	(((
129		-2300
130		-)))|(% colspan="1" %)(% colspan="1" %)
131		-(((
132	132
133	133	)))|(% colspan="1" %)(% colspan="1" %)
134	134	(((
135		-First contact with the Paranid
136		-)))
137		-|(% colspan="1" %)(% colspan="1" %)
138		-(((
139		-202
140		-)))|(% colspan="1" %)(% colspan="1" %)
141		-(((
142		-2372
143		-)))|(% colspan="1" %)(% colspan="1" %)
144		-(((
145	145
146	146	)))|(% colspan="1" %)(% colspan="1" %)
147	147	(((
148		-Goner Sect is formed on the belief that Earth still exists
	96	+First Contact with the Paranid
149	149	)))
150	150	|(% colspan="1" %)(% colspan="1" %)
151	151	(((
152		-215
	100	+241
153	153	)))|(% colspan="1" %)(% colspan="1" %)
154	154	(((
155		-2385
156		-)))|(% colspan="1" %)(% colspan="1" %)
157		-(((
158	158
159	159	)))|(% colspan="1" %)(% colspan="1" %)
160	160	(((
161		-[[doc:Xenon]] destroy the spaceport "Antigone", Antigone Memorial is named in its honour
162		-)))
163		-|(% colspan="1" %)(% colspan="1" %)
164		-(((
165		-241
166		-)))|(% colspan="1" %)(% colspan="1" %)
167		-(((
168		-2491
169		-)))|(% colspan="1" %)(% colspan="1" %)
170		-(((
171	171
172	172	)))|(% colspan="1" %)(% colspan="1" %)
173	173	(((
...	...	@@ -178,13 +178,13 @@
178	178	323
179	179	)))|(% colspan="1" %)(% colspan="1" %)
180	180	(((
181		-2493
	116	+
182	182	)))|(% colspan="1" %)(% colspan="1" %)
183	183	(((
184	184
185	185	)))|(% colspan="1" %)(% colspan="1" %)
186	186	(((
187		-First contact with the Boron
	122	+First Contact with the Boron
188	188	)))
189	189	|(% colspan="1" %)(% colspan="1" %)
190	190	(((
...	...	@@ -191,7 +191,7 @@
191	191	324
192	192	)))|(% colspan="1" %)(% colspan="1" %)
193	193	(((
194		-2494
	129	+
195	195	)))|(% colspan="1" %)(% colspan="1" %)
196	196	(((
197	197
...	...	@@ -204,7 +204,7 @@
204	204	328
205	205	)))|(% colspan="1" %)(% colspan="1" %)
206	206	(((
207		-2498
	142	+
208	208	)))|(% colspan="1" %)(% colspan="1" %)
209	209	(((
210	210
...	...	@@ -217,7 +217,7 @@
217	217	514
218	218	)))|(% colspan="1" %)(% colspan="1" %)
219	219	(((
220		-2684
	155	+
221	221	)))|(% colspan="1" %)(% colspan="1" %)
222	222	(((
223	223
...	...	@@ -230,39 +230,26 @@
230	230	550
231	231	)))|(% colspan="1" %)(% colspan="1" %)
232	232	(((
233		-2720
	168	+
234	234	)))|(% colspan="1" %)(% colspan="1" %)
235	235	(((
236	236
237	237	)))|(% colspan="1" %)(% colspan="1" %)
238	238	(((
239		-First contact with [[Teladi>>doc:Teladi Company]]
	174	+First Contact with Teladi
240	240	)))
241	241	|(% colspan="1" %)(% colspan="1" %)
242	242	(((
243		-589
	178	+742
244	244	)))|(% colspan="1" %)(% colspan="1" %)
245	245	(((
246		-2759
247		-)))|(% colspan="1" %)(% colspan="1" %)
248		-(((
249	249
250	250	)))|(% colspan="1" %)(% colspan="1" %)
251	251	(((
252		-Credits become the currency of the X universe
253		-)))
254		-|(% colspan="1" %)(% colspan="1" %)
255		-(((
256		-735
257		-)))|(% colspan="1" %)(% colspan="1" %)
258		-(((
259		-2905
260		-)))|(% colspan="1" %)(% colspan="1" %)
261		-(((
262	262
263	263	)))|(% colspan="1" %)(% colspan="1" %)
264	264	(((
265		-[[doc:Xenon]] ship enters Sol using a Gateless Jumpdrive
	187	+Evolution of the Xenon
266	266	)))
267	267	|(% colspan="1" %)(% colspan="1" %)
268	268	(((
...	...	@@ -269,22 +269,9 @@
269	269	742
270	270	)))|(% colspan="1" %)(% colspan="1" %)
271	271	(((
272		-2912
273		-)))|(% colspan="1" %)(% colspan="1" %)
274		-(((
275	275
276	276	)))|(% colspan="1" %)(% colspan="1" %)
277	277	(((
278		-Evolution of the [[doc:Xenon]]
279		-)))
280		-|(% colspan="1" %)(% colspan="1" %)
281		-(((
282		-742
283		-)))|(% colspan="1" %)(% colspan="1" %)
284		-(((
285		-2912
286		-)))|(% colspan="1" %)(% colspan="1" %)
287		-(((
288	288	X:Btf / X:T
289	289	)))|(% colspan="1" %)(% colspan="1" %)
290	290	(((
...	...	@@ -301,7 +301,7 @@
301	301
302	302	)))|(% colspan="1" %)(% colspan="1" %)
303	303	(((
304		-First contact with the [[Kha'ak>>doc:Kha'ak]]
	213	+First contact with the Kha'ak
305	305	)))
306	306	|(% colspan="1" %)(% colspan="1" %)
307	307	(((
...	...	@@ -340,7 +340,7 @@
340	340	X3:R
341	341	)))|(% colspan="1" %)(% colspan="1" %)
342	342	(((
343		-The race to find Earth
	252	+The Race To Find Earth
344	344	)))
345	345	|(% colspan="1" %)(% colspan="1" %)
346	346	(((
...	...	@@ -353,7 +353,7 @@
353	353	X3:TC
354	354	)))|(% colspan="1" %)(% colspan="1" %)
355	355	(((
356		-Relations with the [[Terrans>>doc:Terran Faction 1]] begin to cool
	265	+Relations with the Terrans 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		-Plutarch gains influence over the Albion system
	330	+
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 [[doc:Alliance of the Word]] is established
	369	+The Alliance of the Word is Established
461	461	)))
462	462	|(% colspan="1" %)(% colspan="1" %)
463	463	(((
...	...	@@ -474,19 +474,6 @@
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		-(((
490	490	820
491	491	)))|(% colspan="1" %)(% colspan="1" %)
492	492	(((
...	...	@@ -528,12 +528,12 @@
528	528	|(((
529	529	NT
530	530	)))|(((
531		-New Time (years since removing Earth from Argon history)
	427	+New Time
532	532	)))
533	533	|(((
534		-EY
	430	+CE
535	535	)))|(((
536		-Earth Years /AD/CE
	432	+Common era / AD / Earth Time
537	537	)))
538	538	|(((
539	539	X:Btf

Confluence.Code.ConfluencePageClass[0]

id

...	...	@@ -1,1 +1,1 @@
1		-100466961
	1	+100466951

url

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