Code: Select all
# git diff -b -U0 HEAD^ HEAD
diff --git a/commands.txt b/commands.txt
index 7bbb688..c2c1d8c 100644
--- a/commands.txt
+++ b/commands.txt
@@ -44,3 +44,3 @@
- <t id="252">COMMAND_TYPE_NAV_52</t>
- <t id="253">COMMAND_TYPE_NAV_53</t>
- <t id="254">COMMAND_TYPE_NAV_54</t> : Move To Coordinates by Cycrow
+ <t id="252">COMMAND_TYPE_NAV_52</t> : Jump and Dock - Navigation Software ST1 by SpaceTycoon
+ <t id="253">COMMAND_TYPE_NAV_53</t> : Jump to Position - Navigation Software ST1 by SpaceTycoon
+ <t id="254">COMMAND_TYPE_NAV_54</t> : Move To Coordinates by Cycrow [color=yellow](conflict)[/color] Jump Gateless - Navigation Software ST1 by SpaceTycoon
@@ -96 +96 @@
- <t id="353">COMMAND_TYPE_FIGHT_53</t>
+ <t id="353">COMMAND_TYPE_FIGHT_53</t> : Ship Menu - Smart Turrets by Shimrod
@@ -117 +117 @@
- <t id="423">COMMAND_TYPE_TRADE_23</t>
+ <t id="423">COMMAND_TYPE_TRADE_23</t> : Supply Sector - Trade Software ST1 by SpaceTycoon
@@ -119,5 +119,5 @@
- <t id="425">COMMAND_TYPE_TRADE_25</t>
- <t id="426">COMMAND_TYPE_TRADE_26</t>
- <t id="427">COMMAND_TYPE_TRADE_27</t>
- <t id="428">COMMAND_TYPE_TRADE_28</t>
- <t id="429">COMMAND_TYPE_TRADE_29</t>
+ <t id="425">COMMAND_TYPE_TRADE_25</t> : Supply Factories - Trade Software ST1 by SpaceTycoon
+ <t id="426">COMMAND_TYPE_TRADE_26</t> : Supply with Resource - Trade Software ST1 by SpaceTycoon
+ <t id="427">COMMAND_TYPE_TRADE_27</t> : Sell Fabware for Best price - Trade Software ST1 by SpaceTycoon
+ <t id="428">COMMAND_TYPE_TRADE_28</t> : Sell Stationware for best price - Trade Software ST1 by SpaceTycoon
+ <t id="429">COMMAND_TYPE_TRADE_29</t> : Sell from Cargo for best price - Trade Software ST1 by SpaceTycoon
@@ -192 +192 @@
- <t id="546">COMMAND_TYPE_SPECIAL_46</t>
+ <t id="546">COMMAND_TYPE_SPECIAL_46</t> : Hive Shield - Hive Shield By BinaryBoy
@@ -203 +203 @@
- <t id="557">COMMAND_TYPE_SPECIAL_57</t>
+ <t id="557">COMMAND_TYPE_SPECIAL_57</t> : Deploy Placement Beacons - station placement assistance script by willyshop
@@ -402,3 +402,3 @@
- <t id="952">COMMAND_TYPE_TURRET_52</t>
- <t id="953">COMMAND_TYPE_TURRET_53</t>
- <t id="954">COMMAND_TYPE_TURRET_54</t>
+ <t id="952">COMMAND_TYPE_TURRET_52</t> : Offense Mode - Smart Turrets by Shimrod
+ <t id="953">COMMAND_TYPE_TURRET_53</t> : Attack My Target Mode - Smart Turrets by Shimrod
+ <t id="954">COMMAND_TYPE_TURRET_54</t> : Defense Mode - Smart Turrets by Shimrod
@@ -447 +447 @@
- <t id="1146">COMMAND_TYPE_STATION_46</t>
+ <t id="1146">COMMAND_TYPE_STATION_46</t> : Station Menu - Smart Turrets by Shimrod
@@ -511 +511 @@
- <t id="1259">COMMAND_TYPE_SHIP_59</t>
+ <t id="1259">COMMAND_TYPE_SHIP_59</t> : Main Guns - Smart Turrets by Shimrod
@@ -524 +524,3 @@
-IDs Available: 1300-2000, 6000+
+IDs Available: 1400-2000, 6000+
+
+[color=#880000]WARNING: Any custom commands between 1300-1400 will not work in Albion Prelude (these slots are not taken by the fleet command menu)[/color]
@@ -528,2 +530 @@
-1300: Cycrow, Cheat Package
-1301: Cycrow, Command Queueing
+[color=#880000]1301: Cycrow, Command Queueing
@@ -548,0 +550,3 @@
+[/color]
+1400: Cycrow, Cheat Package
+1555: Medevel, Rename Ships with Expression
diff --git a/links_mod.txt b/links_mod.txt
index c2d9f13..75b0239 100644
--- a/links_mod.txt
+++ b/links_mod.txt
@@ -16,0 +17 @@
+[2011-09-21] [url=http://forum.egosoft.com/viewtopic.php?p=3687763]Ranks for Xenon, Kha'ak, Pirates and Yaki[/url] by Commander SAMU ; Display reputation
@@ -19,0 +21 @@
+[2011-12-03] [url=http://forum.egosoft.com/viewtopic.php?t=310822]Unique Ships Fix[/url] by F.A.B.
@@ -55 +57,4 @@
-[2010-10-10] [url=http://forum.egosoft.com/viewtopic.php?t=275798]Advanced Weapon Research Mod (AWRM)[/url] By Roger L.S. Griffiths ; Terran weaponry redesign
+[2010-10-10] [url=http://forum.egosoft.com/viewtopic.php?t=275798]Advanced Weapon Research Mod (AWRM)[/url] by Roger L.S. Griffiths ; Terran weaponry redesign
+[2011-11-04] [url=http://forum.egosoft.com/viewtopic.php?t=309777]Awesomefied Beam Weapons[/url] by F.A.B.
+[2011-11-15] [url=http://forum.egosoft.com/viewtopic.php?t=310217]Awesomefied Small Lasers (Add-On Pack)[/url] by F.A.B.
+[2011-10-16] [url=http://forum.egosoft.com/viewtopic.php?t=307971]Aldrin asteroid pack[/url] by Zeron-mk7 ; altered model for the Aldrin asteroid plus additional asteroid models
@@ -57,0 +63 @@
+[2011-12-25] [url=http://forum.egosoft.com/viewtopic.php?t=313013]Better Visual Range And Blending for IE[/url] by F.A.B.
@@ -62 +68,3 @@
-[2010-05-21] [url=http://forum.egosoft.com/viewtopic.php?t=277481] Holy Asteroids Mod[/url] by TEKing66 ; Hollow asteroid models like in X2
+[2011-04-30] [url=http://forum.egosoft.com/viewtopic.php?t=300325]Gate pack[/url] by solek ; New Gate models (no modified tag)
+[2011-12-25] [url=http://forum.egosoft.com/viewtopic.php?t=313002]Greek Letters Replacement[/url] by F.A.B.
+[2010-05-21] [url=http://forum.egosoft.com/viewtopic.php?t=277481]Holy Asteroids Mod[/url] by TEKing66 ; Hollow asteroid models like in X2
@@ -69,0 +78 @@
+[2011-09-22] [url=http://forum.egosoft.com/viewtopic.php?t=307215]No Ring Gate Mod[/url] by cattafett ; Removes the ring from CW gates plus makes all gates larger
@@ -83,0 +93 @@
+[2011-04-28] [url=http://forum.egosoft.com/viewtopic.php?t=300329]XChange Guild Portals[/url] by OPR ; Increases the size of all Gates by 225%
@@ -100,0 +111 @@
+[2011-06-30] [url=http://forum.egosoft.com/viewtopic.php?t=302589]Main Menu scene Pack[/url] by Zeron-mk7 ; New start menu background images
@@ -120,0 +132 @@
+[2012-01-08] [url=http://forum.egosoft.com/viewtopic.php?t=314231]Enhanced Tracking[/url] by F.A.B. ; Changes number of objects shown by HUD
@@ -137,0 +150,3 @@
+[2011-05-04] [url=http://forum.egosoft.com/viewtopic.php?t=300688]New Player Headquarter[/url] by Zeron-mk7 ; Different model
+[2011-08-21] [url=http://forum.egosoft.com/viewtopic.php?t=304688]Pirate Base Pack[/url] by solek ; Different models
+[2011-08-21] [url=http://forum.egosoft.com/viewtopic.php?t=305073]Satellite Pack[/url] by Zeron-mk7 ; Different models
@@ -148 +163,2 @@
-[2010-03-02] [url=http://forum.egosoft.com/viewtopic.php?p=3165996]X-Tra Ship/Station Pack[/url] by Cadius
+[2012-01-08] [url=http://forum.egosoft.com/viewtopic.php?t=311183]Trading Station Mod[/url] by solek ; Replace 5 races trading station models (no modified tag)
+[2010-03-02] [url=http://forum.egosoft.com/viewtopic.php?t=308762]X-Tra Ship/Station Pack[/url] by Cadius
@@ -164,0 +181 @@
+[2011-07-16] [url=http://forum.egosoft.com/viewtopic.php?t=304158]X3 Rebalance Mod[/url] by Paul Wheeler and Mizuchi
@@ -176,0 +194,2 @@
+[i]X3AP was released 2011-12-15.[/i]
+[i]X3AP 1.0b has been seen 2011-12-20.[/i]
diff --git a/links_scr.txt b/links_scr.txt
index c68099e..7fadd72 100644
--- a/links_scr.txt
+++ b/links_scr.txt
@@ -11 +11 @@
-[2010-05-06] [url=http://forum.egosoft.com/viewtopic.php?t=276323]Abandoned Ship Spawner[/url]by corbinbird ; Changes/moves abandoned ships of start
+[2010-05-06] [url=http://forum.egosoft.com/viewtopic.php?t=276323]Abandoned Ship Spawner[/url] by corbinbird ; Changes/moves abandoned ships of start
@@ -39,0 +40 @@
+[2011-12-08] [url=http://forum.egosoft.com/viewtopic.php?t=311048]Yalamandis Corp. ship construction[/url] by Marvelous3175 ; Produces fully equipped and armed ships
@@ -43,0 +45 @@
+[2011-04-30] [url=http://forum.egosoft.com/viewtopic.php?p=3504935]Bounce[/url] by Litcube ; Player AI Autopilot Fix
@@ -63,0 +66 @@
+[2011-08-26] [url=http://forum.egosoft.com/viewtopic.php?t=306400]Missile Data Display[/url] by Gazz ; Display the missile data as a subtitle
@@ -87,0 +91 @@
+[2011-12-27] [url=http://forum.egosoft.com/viewtopic.php?t=307684]Rename ships with Expression (RSwE)[/url] by Medevel
@@ -110,0 +115 @@
+[2011-12-08] [url=http://forum.egosoft.com/viewtopic.php?t=311048]Yalamandis Corp. ship construction[/url] by Marvelous3175; produces fully equipped and armed ships
@@ -126,0 +132 @@
+[2011-11-04] [url=http://forum.egosoft.com/viewtopic.php?p=3722416]ADAMS - AAH[/url] by Jeff; adds a hotkey to send an apology to any target-able object.
@@ -134,0 +141 @@
+[2011-10-05] [url=http://forum.egosoft.com/viewtopic.php?t=308168]Set the course![/url] by Gazz ; set a ship's course via mouselook instead of a menu / map
@@ -158,0 +166 @@
+[2011-08-26] [url=http://forum.egosoft.com/viewtopic.php?t=306400]Missile Data Display[/url] by Gazz ; Display the missile data as a subtitle
@@ -184,0 +193,2 @@
+[2011-04-30] [url=http://forum.egosoft.com/viewtopic.php?t=300342]Navigation Software ST1[/url] by SpaceTycoon ; Free jump commands
+[2011-10-05] [url=http://forum.egosoft.com/viewtopic.php?t=308168]Set the course![/url] by Gazz ; set a ship's course via mouselook instead of a menu / map
@@ -237 +247 @@
-[2008-12-16] [url=http://forum.egosoft.com/viewtopic.php?t=219504]Factory Complex Constructor[/url] by Dusty ; Arrange / align stations with pinpoint accuracy
+[2008-12-16] [url=http://forum.egosoft.com/viewtopic.php?t=219504]Factory Complex Constructor (FCC)[/url] by Dusty ; Arrange / align stations with pinpoint accuracy
@@ -238,0 +249,2 @@
+[2011-07-24] [url=http://forum.egosoft.com/viewtopic.php?p=3642981#3642981]Factory Complex Constructor: Addon for stationary ships[/url] by Saetan ; this addon allows to move satellites, laser towers, etc. to be moved with the FCC.
+[2011-09-03] [url=http://forum.egosoft.com/viewtopic.php?t=306727]Hephaistos Corp. Station building service[/url] by X2-Illuminatus; A service that handles the purchase, transport and construction of stations for you
@@ -240,0 +253 @@
+[2012-01-04] [url=http://forum.egosoft.com/viewtopic.php?t=305639]Station Placement assistance [/url] by willyshop
@@ -277,0 +291 @@
+[2011-04-30] [url=http://forum.egosoft.com/viewtopic.php?t=300339]Trade Software ST1[/url] by SpaceTycoon ; Station trader that works for multiple stations
@@ -294,0 +309 @@
+[2011-08-25] [url=http://forum.egosoft.com/viewtopic.php?t=304686]Smart Turrets[/url] by Shimrod ; Similar to X2 AEGIS
diff --git a/page17.txt b/page17.txt
index 9dd8186..612c335 100644
--- a/page17.txt
+++ b/page17.txt
@@ -48,0 +49 @@
+340000--346000: Mechanis, Mechworks LTD
diff --git a/text.txt b/text.txt
index 465ebf0..2a2e7e4 100644
--- a/text.txt
+++ b/text.txt
@@ -48,0 +49 @@
+7004: Commander SAMU, Ranking XKPY
@@ -68,0 +70,3 @@
+7052: Gazz, MARS Fire Control (OOSR v2: TC vanilla data file)
+7053: Gazz, MARS Fire Control (Time of the Truth / ToT / TotT Mod)
+7054: Gazz, MARS Fire Control (X3 Rebalance Mod / XRM by paulwheeler)
@@ -69,0 +74 @@
+7073: Gazz, Missile Data Display
@@ -70,0 +76,2 @@
+7076: SpaceTycoon, Navigation Software ST1
+7077: SpaceTycoon, Trade Software ST1
@@ -94,0 +102,2 @@
+7336: X2-Illuminatus, Add stations
+7337: X2-Illuminatus, Hephaistos Corp. Station building service
@@ -173,0 +183 @@
+8367: Marvelous3175, Yalamandis Corp. ship construction
@@ -177,0 +188 @@
+8389: Litcube, Bounce
@@ -242,0 +254,8 @@
+8880: Phlt, New Horizons Mod
+8881: Phlt, New Horizons Mod
+8882: Phlt, New Horizons Mod
+8883: Phlt, New Horizons Mod
+8884: Phlt, New Horizons Mod
+8885: Phlt, New Horizons Mod
+8886: Phlt, New Horizons Mod [color=yellow](conflict)[/color] Medevel, Rename ships with Expression (RSwE)
+8887: Phlt, New Horizons Mod
@@ -257,0 +277 @@
+9050: Shimrod, Smart Turrets
@@ -264,0 +285 @@
+9433: willyshop, station placement assistance
@@ -281,0 +303 @@
+9609: Cycrow, Ware Manager
@@ -304,0 +327 @@
+9953: Mechanis, Mechworks LTD Ship Pack
@@ -326,0 +350 @@
+08367: Marvelous3175, Yalamandis Corp. ship construction
@@ -333,0 +358 @@
+09050: Shimrod, Smart Turrets
diff --git a/wares.txt b/wares.txt
index 5c90927..253aa15 100644
--- a/wares.txt
+++ b/wares.txt
@@ -20 +20 @@
-
+- Navigation Software ST1 by SpaceTycoon; 1,572cr
@@ -23 +23 @@
- -Taxi Logistics Software by SymTec; 2,472cr
+- Taxi Logistics Software by SymTec; 2,472cr
@@ -41 +41 @@
-- Bulk Transporter Upgrade by Al_Main [color=yellow](conflict)[/color] Teladi Information Service by ScRaT_GER; 158,203cr
+- Bulk Transporter Upgrade by Al_Main [color=yellow](conflict)[/color] Teladi Information Service by ScRaT_GER [color=yellow](conflict)[/color] Trade Software ST1 by SpaceTycoon; 158,203cr
@@ -106,0 +107 @@
+Ship task 9050--9070: Shimrod, Smart Turrets
diff --git a/wingcmd.txt b/wingcmd.txt
index 6164b7e..345ae6b 100644
--- a/wingcmd.txt
+++ b/wingcmd.txt
@@ -96 +96 @@
- <t id="353">COMMAND_WING_TYPE_FIGHT_53</t>
+ <t id="353">COMMAND_WING_TYPE_FIGHT_53</t> : Wing Menu - Smart Turrets by Shimrod