Merge pull request #29 from BobPalmer/DEVELOP

KSP 1.2.1
UmbraSpaceIndustries · Nov 15, 2016 · fd1d56b · fd1d56b
2 parents c22ee22 + 7f60d26
commit fd1d56b
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 498 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.8.4 - (KSP 1.2.1)
+-------------------
+Dependency Updates
+
 0.8.3 - 2016.10.22
 ------------------
 Fixed a bug causing NRE spam with toolbar (thanks Kerbas-ad-astra!)

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.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":3,
+         "PATCH":4,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      }
  } 
diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version
@@ -4,11 +4,21 @@
   "VERSION": {
     "MAJOR": 7,
     "MINOR": 4,
-    "PATCH": 1
+    "PATCH": 2
   },
-  "KSP_VERSION": {
-    "MAJOR": 1,
-    "MINOR": 2,
-    "PATCH": 0
-  }
+ "KSP_VERSION":{
+	 "MAJOR":1,
+	 "MINOR":2,
+	 "PATCH":1
+ },
+ "KSP_VERSION_MIN":{
+	 "MAJOR":1,
+	 "MINOR":2,
+	 "PATCH":0
+ },
+ "KSP_VERSION_MAX":{
+	 "MAJOR":1,
+	 "MINOR":2,
+	 "PATCH":1
+ }
 }
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.dll.mdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb
diff --git a/FOR_RELEASE/GameData/ModuleManager.2.7.3.dll b/FOR_RELEASE/GameData/ModuleManager.2.7.3.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.3.4 - (KSP 1.2.1)
+-------------------
+Changed Nukes category to Electrical (Thanks SirCharizard17/SixDasher!)
+Removed NFE Configs (Nertea should handle this now)
+
 0.3.3 - 2016.10.22
 ------------------
 Dependency Updates

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg
@@ -42,7 +42,7 @@ attachRules = 1,1,1,1,0
 
 
 // --- standard part parameters ---
-mass = 17.5
+mass = 1.75
 dragModelType = default
 maximum_drag = 0.20
 minimum_drag = 0.15
@@ -58,7 +58,7 @@ bulkheadProfiles = size0,srf
 		resourceAmounts = 14000;140000;1400000;1260,1540;14000;14000;14000;56000;2800;2800
  		initialResourceAmounts = 0;35000;350000;0;0;0;0;0;0;0
  		tankCost = 56000000;560000;14700;1288;11.2;224000;0;2058;2240;3360
-		basePartMass = 17.5
+		basePartMass = 1.75
 		tankMass = 0;0;0;0;0;0;0;0;0;0
 		hasGUI = false
 	}

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.3.3 - (KSP 1.2.1)
+-------------------
+Dependency Updates
+
 0.3.2 - 2016.10.22
 ------------------
 Made atmospheric nerf optional

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":3,
-         "PATCH":2,
+         "PATCH":3,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      }
  } 
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg
@@ -25,7 +25,7 @@ PART
 	TechRequired = advScienceTech
 	entryCost = 3795
 	cost = 37950
-	category = Utility
+	category = Electrical
 	subcategory = 0
 	title = Nuclear Reactor (1.25m)
 	manufacturer = Umbra Space Industries

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg
@@ -26,7 +26,7 @@ PART
 	TechRequired = advScienceTech
 	entryCost = 25575
 	cost = 255750
-	category = Utility
+	category = Electrical
 	subcategory = 0
 	title = Nuclear Reactor (2.5m)
 	manufacturer = Umbra Space Industries

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg
@@ -25,7 +25,7 @@ PART
 	TechRequired = advScienceTech
 	entryCost = 74250
 	cost = 742500
-	category = Utility
+	category = Electrical
 	subcategory = 0
 	title = Nuclear Reactor (3.75m)
 	manufacturer = Umbra Space Industries

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg
@@ -25,7 +25,7 @@ PART
 	TechRequired = advScienceTech
 	entryCost = 495
 	cost = 4950
-	category = Utility
+	category = Electrical
 	subcategory = 0
 	title = Nuclear Reactor (.625m)
 	manufacturer = Umbra Space Industries