Merge pull request #62 from BobPalmer/DEVELOP

1.7.x Compat Patch
UmbraSpaceIndustries · Aug 12, 2019 · 8f839b7 · 8f839b7
2 parents 4a99e23 + 6941111
commit 8f839b7
Show file tree

Hide file tree

Showing 60 changed files with 360 additions and 106 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg b/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg
@@ -1,9 +1,9 @@
 AGENT
 {
     name = Umbra Space Industries
-	title = Umbra Space Industries
+	title = #LOC_USI_agency_usi_title
 
-    description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation!
+    description = #LOC_USI_agency_usi_description
 
     logoURL = 000_USITools/Agency/USILogo
     logoScaledURL = 000_USITools/Agency/USILogo_SM

diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.2.0 - 2019.08.04
+------------------
+KSP 1.7.x Compatibility
+
 1.1.0 - 2019.02.05
 ------------------
 KSP 1.6.x Compatibility

diff --git a/FOR_RELEASE/GameData/000_USITools/Comms.cfg b/FOR_RELEASE/GameData/000_USITools/Comms.cfg
@@ -1,4 +1,4 @@
-@PART[*]:HAS[!MODULE[ModuleDataTransmitter],MODULE[ModuleCommand]]
+@PART[*]:HAS[!MODULE[ModuleDataTransmitter],@MODULE[ModuleCommand]]
 {
 	MODULE
 	{

diff --git a/FOR_RELEASE/GameData/000_USITools/Localization/en-us.cfg b/FOR_RELEASE/GameData/000_USITools/Localization/en-us.cfg
@@ -0,0 +1,9 @@
+Localization
+{
+	en-us
+	{
+		// Agency
+		#LOC_USI_agency_usi_title = Umbra Space Industries
+		#LOC_USI_agency_usi_description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation!
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg
@@ -18,10 +18,18 @@ RESOURCE_DEFINITION  //Hidden resource used to manage mass
     volume = 1
 }
 
-@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
 {
     MODULE
     {
         name = USI_ModuleFieldRepair
     }
 }
+
+@PART[*]:HAS[!MODULE[USI_ModuleRecycleBin],@RESOURCE[MaterialKits]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleRecycleBin
+    }
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":1,
+         "MINOR":2,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
+         "MINOR":7,
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":9
      }
  } 
diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version
@@ -3,13 +3,13 @@
   "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
   "VERSION": {
     "MAJOR": 7,
-    "MINOR": 12,
+    "MINOR": 13,
     "PATCH": 0
   },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
+         "MINOR":7,
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -18,7 +18,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":9
      }
 }
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.2.0 - 2019.08.04
+------------------
+KSP 1.7.x Compatibility
+
 1.1.0 - 2019.02.05
 ------------------
 KSP 1.6.x Compatibility

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/DepletedFuelTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/DepletedFuelTank.cfg
@@ -28,9 +28,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = -1
-title = Nuclear Waste Container
+title = #LOC_USI_C3_DepletedFuelTank_title
 manufacturer = USI - Logistics Division
-description = A specialized container for holding nuclear waste
+description = #LOC_USI_C3_DepletedFuelTank_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 0,1,0,0,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/DepletedFuelTank_Lg.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/DepletedFuelTank_Lg.cfg
@@ -29,9 +29,9 @@ entryCost = 7600
 cost = 30400
 category = none
 subcategory = -1
-title = Nuclear Waste Container (Large)
+title = #LOC_USI_C3_DepletedFuelTank_Lg_title
 manufacturer = USI - Logistics Division
-description = A large specialized container for holding nuclear waste
+description = #LOC_USI_C3_DepletedFuelTank_Lg_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 0,1,0,0,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Cluster (1.25m)
+title = #LOC_USI_C3_FlatRnd_01_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatRnd_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Cluster (2.5m)
+title = #LOC_USI_C3_FlatRnd_02_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatRnd_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Cluster (3.75m)
+title = #LOC_USI_C3_FlatRnd_03_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatRnd_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Cluster (5m)
+title = #LOC_USI_C3_FlatRnd_04_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatRnd_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Flat (1.25m)
+title = #LOC_USI_C3_FlatTank_01_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatTank_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Flat (2.5m)
+title = #LOC_USI_C3_FlatTank_02_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatTank_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Flat (3.75m)
+title = #LOC_USI_C3_FlatTank_03_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatTank_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg
@@ -31,9 +31,9 @@ entryCost = 7600
 cost = 95
 category = none
 subcategory = 0
-title = Kontainer Tank - Flat (5m)
+title = #LOC_USI_C3_FlatTank_04_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_FlatTank_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,0,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 490
 category = none
 subcategory = 0
-title = Kontainer (01.25m)
+title = #LOC_USI_C3_Kontainer_01_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 8000
 category = none
 subcategory = 0
-title = Kontainer (02.5m)
+title = #LOC_USI_C3_Kontainer_02_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 25740
 category = none
 subcategory = 0
-title = Kontainer (03.75m)
+title = #LOC_USI_C3_Kontainer_03_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 63360
 category = none
 subcategory = 0
-title = Kontainer (05.0m)
+title = #LOC_USI_C3_Kontainer_04_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_01.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = 0
-title = KIS Kontainer (01.25m)
+title = #LOC_USI_C3_Kontainer_KIS_01_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_KIS_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_02.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = 0
-title = KIS Kontainer (02.5m)
+title = #LOC_USI_C3_Kontainer_KIS_02_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_KIS_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_03.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = 0
-title = KIS Kontainer (03.75m)
+title = #LOC_USI_C3_Kontainer_KIS_03_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_KIS_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_04.cfg
@@ -35,9 +35,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = 0
-title = KIS Kontainer (05.0m)
+title = #LOC_USI_C3_Kontainer_KIS_04_title
 manufacturer = USI - Logistics Division
-description = Shipping container for transporting various goods
+description = #LOC_USI_C3_Kontainer_KIS_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_M.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_M.cfg
@@ -30,9 +30,9 @@ entryCost = 7600
 cost = 3800
 category = none
 subcategory = 0
-title = KIS Kontainer (Stow-Pak)
+title = #LOC_USI_C3_Kontainer_KIS_M_title
 manufacturer = USI - Logistics Division
-description = A radial stowage pack for KIS parts
+description = #LOC_USI_C3_Kontainer_KIS_M_description
 
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 attachRules = 1,1,1,1,0