Merge remote-tracking branch 'origin/DEVELOP'

# Conflicts: # GameData/UmbraSpaceIndustries/FTT/CTT.cfg
UmbraSpaceIndustries · Nov 17, 2015 · 244165b · 244165b
2 parents ea940c0 + 64def64
commit 244165b
Show file tree

Hide file tree

Showing 235 changed files with 4,242 additions and 678 deletions.
diff --git a/GameData/000_USITools/Agency/USIAgency.cfg → ...ameData/000_USITools/Agency/USIAgency.cfg b/GameData/000_USITools/Agency/USIAgency.cfg → ...ameData/000_USITools/Agency/USIAgency.cfg
diff --git a/GameData/000_USITools/Agency/USILogo.png → .../GameData/000_USITools/Agency/USILogo.png b/GameData/000_USITools/Agency/USILogo.png → .../GameData/000_USITools/Agency/USILogo.png
diff --git a/GameData/000_USITools/Agency/USILogo_SM.png → ...meData/000_USITools/Agency/USILogo_SM.png b/GameData/000_USITools/Agency/USILogo_SM.png → ...meData/000_USITools/Agency/USILogo_SM.png
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -0,0 +1,18 @@
+0.5.3 - 2015.11.09
+------------------
+KSP 1.0.5 Compatibility
+
+0.5.2 - 2015.10.16
+------------------
+Moved out reactors and tanks to the USI_Core repo
+
+0.5.1 - 2015.10.06
+-------------------
+Consolidated tanks and added alternate textures
+
+0.5.0 - 2015.10.06
+------------------
+Merged nuke reactors and kontainers into the core USI mod
+Increased LH2 amnount in all containers
+Added containers for Karborundum, Xenon, and Argon
+Increased nuke output and mass
diff --git a/GameData/000_USITools/DynamicTanks.dll → ...SE/GameData/000_USITools/DynamicTanks.dll b/GameData/000_USITools/DynamicTanks.dll → ...SE/GameData/000_USITools/DynamicTanks.dll
diff --git a/GameData/000_USITools/Flags/USI-LD.png → ...SE/GameData/000_USITools/Flags/USI-LD.png b/GameData/000_USITools/Flags/USI-LD.png → ...SE/GameData/000_USITools/Flags/USI-LD.png
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/GameData/000_USITools/USI.version → ...SE/GameData/000_USITools/USITools.version b/GameData/000_USITools/USI.version → ...SE/GameData/000_USITools/USITools.version
@@ -1,31 +1,31 @@
 {
      "NAME":"USI Tools",
-	 "URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/GameData/000_USITools/USI.version"
-	 "DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases"
+	 "URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/GameData/UmbraSpaceIndustries/USICore.version",
+	 "DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases",
      "GITHUB":{
          "USERNAME":"BobPalmer",
          "REPOSITORY":"UmbraSpaceIndustries",
-         "ALLOW_PRE_RELEASE":false,
+         "ALLOW_PRE_RELEASE":false
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":4,
-         "PATCH":1,
+         "MINOR":5,
+         "PATCH":3,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":2
+         "PATCH":5
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
          "MINOR":0,
          "PATCH":0
-     }
+     },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":2
+         "PATCH":5
      }
  } 
diff --git a/GameData/CommunityResourcePack/Asteroid.cfg → ...meData/CommunityResourcePack/Asteroid.cfg b/GameData/CommunityResourcePack/Asteroid.cfg → ...meData/CommunityResourcePack/Asteroid.cfg
diff --git a/...nityResourcePack/AsteroidScannerSetup.cfg → ...nityResourcePack/AsteroidScannerSetup.cfg b/...nityResourcePack/AsteroidScannerSetup.cfg → ...nityResourcePack/AsteroidScannerSetup.cfg
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -0,0 +1,22 @@
+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
+
+0.4.4 - 2015.07.29
+------------------
+Various HSP/flow changes 
+
+0.4.3 - 2015.07.06
+------------------
+Moved the Karborundum band around the sun out a bit.
+Various HST configs
+Fixed an issue with the cost of RocketParts
diff --git a/GameData/CommunityResourcePack/CRP.version → ...ameData/CommunityResourcePack/CRP.version b/GameData/CommunityResourcePack/CRP.version → ...ameData/CommunityResourcePack/CRP.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":2,
+         "PATCH":7,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":2
+         "PATCH":5
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":2
+         "PATCH":5
      }
  }