Merge pull request #80 from BobPalmer/DEVELOP

Develop
UmbraSpaceIndustries · Nov 14, 2015 · 20fad92 · 20fad92
2 parents 092b3df + c61922a
commit 20fad92
Show file tree

Hide file tree

Showing 20 changed files with 241 additions and 2,362 deletions.
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,12 @@
+0.4.7 - 2015.11.14
+------------------
+Merged MKS and MKS-L resources into CRP
+
+0.4.6 - 2015.11.09
+------------------
+Added OSE/MKS-L common resources (Dirt, MaterialKits, ExoticMinerals, RareMetals)
+KSP 1.0.5 Compatibility
+
 0.4.5 - 2015.10.16
 ------------------
 Fixed density LqdDeteurium and LqdTritium

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":5,
+         "PATCH":7,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":4
+         "PATCH":5
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":4
+         "PATCH":5
      }
  }