made the references to the 'pacifist' movement into 'resistance' and made them histor...

(Commit created by redmine exporter script from page "Tech_Conglomerate" version 18)

diff --git a/Tech_Conglomerate.textile b/Tech_Conglomerate.textile
index 50f4525bf829ef40e07b70577a1474942f5c41a4..d0b6677abf3a467a71071d778b5110368b4ccda8 100644 (file)
--- a/Tech_Conglomerate.textile
+++ b/Tech_Conglomerate.textile
@@ -96,4 +96,4 @@ Note: Colors of factions are subject to change depending on which faction is in
 | Android Confederacy | AC | Blue | Unknown | The Android Confederacy is a faction that consists solely of mechanical soldiers. The faction is driven by a central computer system, which was originally designed as an advanced weapon prototype by Techron Industries. The main system, known as C.A.I.N.E., gained control of system components that were originally supposed to be off-limits, due to the fact that they were only partially completed and were not yet ready to be released to the system. C.A.I.N.E. exploited holes in the unfinished components, gained control of Techron's major technological systems, took over control of their factories and began constructing an army of androids. A few members of the original C.A.I.N.E. development team have come forward to try to assist the UAF in destroying C.A.I.N.E., but all of them have been intercepted and killed in transit to the UAF base planet. It is unknown if there are any remaining C.A.I.N.E. developers left alive at this point. |
 | Red Legion | RL | Red | Bak'Tar | The Red Legion is a union of planets comprising the third faction in the Great Andromeda War. Their agenda is to spread their totalitarianism across the galaxy and thereby become the supreme rulers of everything in the galaxy. Their soldiers are extremely dedicated and are willing to die for the cause. They are the faction that Techron has had the most trouble keeping in line with Techron's agenda, as they frequently try to break free of the monopoly and construct their own weapon plants. They have also begun attempting to reverse-engineer TI weapons to remove the "kill switch" that allows Techron to remotely disable their weapons at any time. |
 | Techron Industries | TI | Yellow | Kel'Dar IV (fourth moon of Telikas) | Techron Industries is the largest (and only) supplier of weapons in the galaxy. Their handiwork can be seen on roughly 75-90% of the inhabited planets in any given star system. They are currently supplying weapons to both sides of the war, claiming to remain neutral. However, they control the factions through their arms sales, and are currently in control of both sides of the war. When a faction tries to do something that Techron does not like, Techron can do things such as engaging a "kill switch" in a faction's weapons, selling a batch of faulty weapons that explode upon use, etc.. They are prolonging the war to gain as much control of each side as possible, and to drive up profits from arms sales. They ultimately hope to gain control of the entire galaxy, but because they don't have an actual army, they are using the factions as proxies for their conquests. When a faction tries to break from the monopoly by building factories, Techron sends its fleet of bomber ships to destroy the factories. The factions are completely at Techron's mercy, as TI often assassinates anyone in the factions' leadership that tries to make peace. |
-| Resistance | Ω | Pink | Micarais | The original goal of the Pacifists was to create a diplomatic solution to the war upon which both sides could agree. However, due to the involvement of Techron, neither side would agree upon any form of agreement. The Pacifists evolved over time, and with this evolution came a new school of thought: "Active Pacifism." This new view of pacifism stated that in order to create or promote peace, some action (even violent action) must sometimes be taken. With this new view in mind, the Pacifists slowly reorganized into a militia of sorts, rather than a pacifist activism group. Small strike teams have been created for carrying out covert "black-ops" missions, oftentimes behind enemy lines, with the goal of taking out pro-war elements. These highly trained crack teams make up the backbone of the Pacifist movement. |
+| Resistance | Ω | Pink | Micarais | The original goal of the faction previously known as the Pacifists was to create a diplomatic solution to the war upon which both sides could agree. However, due to the involvement of Techron, neither side would agree upon any form of agreement. The Pacifists evolved over time, and with this evolution came a new school of thought: "Active Pacifism." This new view of pacifism stated that in order to create or promote peace, some action (even violent action) must sometimes be taken. With this new view in mind, the Pacifists slowly reorganized into a militia of sorts, rather than a pacifism activism group. Small strike teams have been created for carrying out covert "black-ops" missions, oftentimes behind enemy lines. These highly trained teams make up the backbone of the new Resistance movement. |