M2X 1.8.6

Localization update
SuicidalInsanity · Aug 23, 2019 · e25f1f8 · e25f1f8
1 parent cf6733c
commit e25f1f8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 83 deletions.
diff --git a/Mk2Expansion/GameData/Mk2Expansion/Localization/en-us.cfg b/Mk2Expansion/GameData/Mk2Expansion/Localization/en-us.cfg
@@ -2,24 +2,7 @@ Localization
 {
   en-us
   {
-<<<<<<< HEAD
 	#LOC_M2X_Version = Mk2 Expansion 1.8.6
-=======
-	#LOC_M2X_Version = Mk2 Expansion 1.8
-
-	//Resources
-	#LOC_M2X_TankTypes_0_title = LiquidFuel
-	#LOC_M2X_TankTypes_1_title = LFO
-	#LOC_M2X_TankTypes_2_title = MonoPropellant
-	#LOC_M2X_TankTypes_3_title = LFO/MP
-	#LOC_M2X_TankTypes_4_title = Xenon
-	#LOC_M2X_TankTypes_5_title = Xenon/MP
-	#LOC_M2X_TankTypes_6_title = ElectricCharge
-	#LOC_M2X_TankTypes_7_title = Xenon
-	#LOC_M2X_TankTypes_8_title = Mono/Ec
-	#LOC_M2X_TankTypes_9_title = Xenon/Ec
-	#LOC_M2X_TankTypes_10_title = Xenon/Mono
->>>>>>> origin/master
 
     // CONFIG
     // MANUFACTURERS
@@ -382,14 +365,10 @@ Localization
     #LOC_M2X_RCSAS_description = Keeping a spaceplane steady as it hurls through the sky at mach 5 can be difficult at times. Rockets can rely on SAS torque wheels, but mk2 aircraft can either stuff some in a cargo bay or make do with a very limited selection of RCS thrusters. The SC-01 seeks to solve both problems.
     #LOC_M2X_RCSAS_tags = m2x cluster control dock maneuver manoeuvre react rendezvous rotate stab steer translate RCS fly gyro moment torque
 
-<<<<<<< HEAD
 	#LOC_TT_LFO = LF/O
 	#LOC_TT_LFOMP = LFO/MP
 	#LOC_TT_XenonMP = Xenon/MP
 	#LOC_TT_STECMP = Mono/Ec
 	#LOC_TT_STECXE = Xenon/Ec
 	#LOC_TT_STXEMP = Xenon/Mono
-}
-=======
-}
->>>>>>> origin/master
+}
diff --git a/Mk2Expansion/GameData/Mk2Expansion/Localization/ru.cfg b/Mk2Expansion/GameData/Mk2Expansion/Localization/ru.cfg
@@ -2,7 +2,6 @@ Localization
 {
   ru
   {
-<<<<<<< HEAD
 	#LOC_M2X_Version = Mk2 Expansion 1.8.6
 
     //Resources
@@ -12,22 +11,6 @@ Localization
 	#LOC_TT_STECMP = МТ/ЭЗ
 	#LOC_TT_STECXE = ГXe/ЭЗ
 	#LOC_TT_STXEMP = ГXe/МТ
-=======
-	#LOC_M2X_Version = Mk2 Expansion 1.8
-
-    //Resources
-	#LOC_M2X_TankTypes_0_title = ЖТ
-	#LOC_M2X_TankTypes_1_title = ЖТ/Ок
-	#LOC_M2X_TankTypes_2_title = Монотопливо
-	#LOC_M2X_TankTypes_3_title = ЖТ/Ок/МТ
-	#LOC_M2X_TankTypes_4_title = ГXe
-	#LOC_M2X_TankTypes_5_title = ГXe/MТ
-	#LOC_M2X_TankTypes_6_title = Электрозаряд
-	#LOC_M2X_TankTypes_7_title = ГXe
-	#LOC_M2X_TankTypes_8_title = МТ/ЭЗ
-	#LOC_M2X_TankTypes_9_title = ГXe/ЭЗ
-	#LOC_M2X_TankTypes_10_title = ГXe/МТ
->>>>>>> origin/master
 
     // CONFIG
     // MANUFACTURERS

diff --git a/Mk2Expansion/GameData/Mk2Expansion/Resources/TankTypes.cfg b/Mk2Expansion/GameData/Mk2Expansion/Resources/TankTypes.cfg
@@ -1,11 +1,7 @@
 B9_TANK_TYPE
 {
 	name = LiquidFuel
-<<<<<<< HEAD
 	title = #autoLOC_500999 // Liquid Fuel
-=======
-	title = #LOC_M2X_TankTypes_0_title // #LOC_M2X_TankTypes_0_title = LiquidFuel
->>>>>>> origin/master
 	tankMass = 0.0001
 	tankCost = 0.375
 	RESOURCE
@@ -18,11 +14,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = LFO
-<<<<<<< HEAD
 	title = #LOC_TT_LFO // LFO
-=======
-	title = #LOC_M2X_TankTypes_1_title // #LOC_M2X_TankTypes_1_title = LFO
->>>>>>> origin/master
 	tankMass = 0.000125
 	tankCost = 0.25
 
@@ -41,11 +33,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = MonoProp
-<<<<<<< HEAD
 	title = #autoLOC_501002 // Monopropellant
-=======
-	title = #LOC_M2X_TankTypes_2_title // #LOC_M2X_TankTypes_2_title = MonoPropellant
->>>>>>> origin/master
 	tankMass = 0.0004
 	tankCost = 0.75
 
@@ -59,11 +47,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = MissionSupport
-<<<<<<< HEAD
 	title = #LOC_TT_LFOMP // LFO/MP
-=======
-	title = #LOC_M2X_TankTypes_3_title // #LOC_M2X_TankTypes_3_title = LFO/MP
->>>>>>> origin/master
 	tankMass = 0.000262
 	tankCost = 0.5
 
@@ -86,11 +70,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = Xenon
-<<<<<<< HEAD
 	title = #autoLOC_501003 //Xenon Gas
-=======
-	title = #LOC_M2X_TankTypes_4_title // #LOC_M2X_TankTypes_4_title = Xenon
->>>>>>> origin/master
 	tankMass = 0.001
 	tankCost = 120.0
 
@@ -103,11 +83,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = XenonMP
-<<<<<<< HEAD
 	title = #LOC_TT_XenonMP // Xenon/MP
-=======
-	title = #LOC_M2X_TankTypes_5_title // #LOC_M2X_TankTypes_5_title = Xenon/MP
->>>>>>> origin/master
 	tankMass = 0.0008
 	tankCost = 100.0
 
@@ -125,11 +101,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = STEC
-<<<<<<< HEAD
 	title = #autoLOC_501004 // Electric Charge
-=======
-	title = #LOC_M2X_TankTypes_6_title // #LOC_M2X_TankTypes_6_title = ElectricCharge
->>>>>>> origin/master
 	tankMass = 0.0004
 	tankCost = 6.4
 
@@ -142,11 +114,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = STXE
-<<<<<<< HEAD
 	title = #autoLOC_501003 // xenon Gas
-=======
-	title = #LOC_M2X_TankTypes_7_title // #LOC_M2X_TankTypes_7_title = Xenon
->>>>>>> origin/master
 	tankMass = 0.0005
 	tankCost = 60.0
 
@@ -159,11 +127,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = STECMP
-<<<<<<< HEAD
 	title = #LOC_TT_STECMP // Mono/Ec
-=======
-	title = #LOC_M2X_TankTypes_8_title // #LOC_M2X_TankTypes_8_title = Mono/Ec
->>>>>>> origin/master
 	tankMass = 0.0008
 	tankCost = 7.15
 
@@ -181,11 +145,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = STECXE
-<<<<<<< HEAD
 	title = #LOC_TT_STECXE //Xenon/Ec
-=======
-	title = #LOC_M2X_TankTypes_9_title // #LOC_M2X_TankTypes_9_title = Xenon/Ec
->>>>>>> origin/master
 	tankMass = 0.0008
 	tankCost = 66.4
 
@@ -203,11 +163,7 @@ B9_TANK_TYPE
 B9_TANK_TYPE
 {
 	name = STXEMP
-<<<<<<< HEAD
 	title = #LOC_TT_STXEMP // Xenon/Mono
-=======
-	title = #LOC_M2X_TankTypes_10_title // #LOC_M2X_TankTypes_10_title = Xenon/Mono
->>>>>>> origin/master
 	tankMass = 0.0009
 	tankCost = 60.75