Merge pull request #88 from BobPalmer/DEVELOP

Develop
UmbraSpaceIndustries · Feb 5, 2019 · 72d3aaf · 72d3aaf
2 parents 9a50019 + fa14205
commit 72d3aaf
Show file tree

Hide file tree

Showing 58 changed files with 2,302 additions and 236 deletions.
diff --git a/DynamicTanks/DynamicTanks/.vs/DynamicTanks/DesignTimeBuild/.dtbcache b/DynamicTanks/DynamicTanks/.vs/DynamicTanks/DesignTimeBuild/.dtbcache
diff --git a/DynamicTanks/DynamicTanks/.vs/DynamicTanks/v15/Server/sqlite3/db.lock b/DynamicTanks/DynamicTanks/.vs/DynamicTanks/v15/Server/sqlite3/db.lock
diff --git a/DynamicTanks/DynamicTanks/.vs/DynamicTanks/v15/Server/sqlite3/storage.ide b/DynamicTanks/DynamicTanks/.vs/DynamicTanks/v15/Server/sqlite3/storage.ide
diff --git a/DynamicTanks/DynamicTanks/DynamicTanks.csproj b/DynamicTanks/DynamicTanks/DynamicTanks.csproj
@@ -32,7 +32,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -42,11 +46,11 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>

diff --git a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg
@@ -1,16 +1,7 @@
-@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand]]
+@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand|KerbalSeat]]
 {
 	MODULE
 	{
 		name = ModuleLogisticsConsumer
 	}
 }
-
-@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[KerbalSeat]]
-{
-	MODULE
-	{
-		name = ModuleLogisticsConsumer
-	}
-}
-
diff --git a/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg b/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg
@@ -1,6 +1,7 @@
 AGENT
 {
     name = Umbra Space Industries
+	title = Umbra Space Industries
 
     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/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,15 @@
+1.1.0 - 2019.02.05
+------------------
+KSP 1.6.x Compatibility
+
+1.0.0 - 2018.11.20
+------------------
+KSP 1.5.0 Compatibility
+
+0.13.0 - 2018.06.22
+------------------
+KSP 1.4.4 Compatibility
+
 0.12.0 - 2018.03.13
 ------------------
 KSP 1.4.1 Compatibility

diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg
@@ -16,4 +16,12 @@ RESOURCE_DEFINITION  //Hidden resource used to manage mass
     isTweakable = false
     isVisible = false
     volume = 1
-}
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
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.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -8,24 +8,24 @@
          "ALLOW_PRE_RELEASE":false
      },
      "VERSION":{
-         "MAJOR":0,
-         "MINOR":12,
+         "MAJOR":1,
+         "MINOR":1,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":4,
-         "PATCH":1
+         "MINOR":6,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":4,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":4,
+         "MINOR":6,
          "PATCH":9
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,20 @@
+1.1.0 - 2019.02.05
+------------------
+KSP 1.6.x Compatibility
+
+1.0.1 - 2018.11.20
+------------------
+Fixed antimatter config name
+
+1.0.0 - 2018.10.20
+------------------
+KSP 1.5.0 Compatibility
+Normalized atmospheric resource harvesting values.
+
+0.11.0 - 2018.06.22
+------------------
+KSP 1.4.4 Compatibility
+
 0.10.0 - 2018.03.13
 -----------------
 KSP 1.4.1 Compatibility

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -8,24 +8,24 @@
          "ALLOW_PRE_RELEASE":false
      },
      "VERSION":{
-         "MAJOR":0,
-         "MINOR":10,
+         "MAJOR":1,
+         "MINOR":1,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":4,
-         "PATCH":1
+         "MINOR":6,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":4,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":4,
+         "MINOR":6,
          "PATCH":9
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -855,9 +855,9 @@ RESOURCE_DEFINITION
 {
 	name = CompressedAir
 	abbreviation = #LOC_CRP_CompressedAir_Abbreviation
-	displayName = #LOC_CompressedAir_DisplayName
+	displayName = #LOC_CRP_CompressedAir_DisplayName
 	density = 0.000001283
-	unitCost = 0.00015
+	unitCost = 0.00004
 	hsp = 2175
 	flowMode = STAGE_PRIORITY_FLOW
 	transfer = PUMP