Merge pull request #3 from BobPalmer/master

RI
BobPalmer · Apr 17, 2016 · e738155 · e738155
2 parents 9a7e7a0 + 62f9da6
commit e738155
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 23 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,13 @@
+0.7.1 - 2016.4.16
+-----------------
+Compatibility fixes for KSP 1.1
+
+0.7.0 - 2016.03.29
+------------------
+Compatibility with KSP 1.1
+Moved out DynamicTanks DLL to ART
+Info text / GUI text for Power Distributors, Couplers, and Warehouses (thanks bennord!)
+
 0.6.3 - 2016.03.02
 ------------------
 Logistics pulls are now restricted to warehouses

diff --git a/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll b/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/Flags/CatFlag.png b/FOR_RELEASE/GameData/000_USITools/Flags/CatFlag.png
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":0,
-         "MINOR":6,
-         "PATCH":3,
+         "MINOR":7,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.5.0 - 2016.03.29
+------------------
+Compatibility with KSP 1.1
+Lowered cost of Supplies, Mulch and Fertilizer
+
 0.4.9 - 2016.02.01
 ------------------
 Added Hydrates as a resource and also to the resource map (represents regolith with captive water)

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":4,
-         "PATCH":9,
+         "MINOR":5,
+         "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -119,7 +119,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 15
+   unitCost = 2.5
    isTweakable = true
 }
 
@@ -129,7 +129,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 5
+   unitCost = 2
    isTweakable = true
 }
 
@@ -139,7 +139,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 2.5
+   unitCost = 0
    isTweakable = true
 }
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/SubPack/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/SubPack/CHANGELOG.txt
@@ -1,3 +1,11 @@
+0.1.1 - 2016.04.16
+------------------
+Compatibility Update
+
+0.1.0 - 2016.03.29	
+-----------
+Compatibility with KSP 1.1
+
 0.0.3 - 2016.03.02
 ------------------
 Dependency Updates

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/SubPack/SubPack.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/SubPack/SubPack.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":0,
-         "PATCH":3,
+         "MINOR":1,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  }