Merge pull request #131 from post-kerbin-mining-corporation/dev

Inventory fix
post-kerbin-mining-corporation · Dec 27, 2020 · d0a20f2 · d0a20f2
2 parents 7b2c226 + 8f43a7c
commit d0a20f2
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 25 deletions.
diff --git a/CKAN/NearFutureElectrical-Core.netkan b/CKAN/NearFutureElectrical-Core.netkan
@@ -5,7 +5,7 @@
     "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
     "name"                : "Near Future Electrical Core",
     "abstract"            : "This is the Near Future Electrical plugin stand-alone, for adding functionality to other mods. It contains no parts and does nothing by itself.",
-    "author"              : "Nertea",
+    "author"              : "Nertea (Chris Adderley)",
     "license"             : "MIT",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",

diff --git a/CKAN/NearFutureElectrical-DecayingRTGs.netkan b/CKAN/NearFutureElectrical-DecayingRTGs.netkan
@@ -5,7 +5,7 @@
     "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
     "name"                : "Near Future Electrical - Decaying RTGs",
     "abstract"            : "This optional patch makes the power output of RTGs (both stock and Near Future's) shrink over time, like they would in real life.",
-    "author"              : "Nertea",
+    "author"              : "Nertea (Chris Adderley)",
     "license"             : "MIT",
     "depends" : [
         { "name" : "NearFutureElectrical" }

diff --git a/CKAN/NearFutureElectrical.netkan b/CKAN/NearFutureElectrical.netkan
@@ -4,7 +4,7 @@
     "$kref"               : "#/ckan/spacedock/558",
     "name"                : "Near Future Electrical",
     "abstract"            : "Nuclear reactors, capacitors and more batteries that fit right in with stock",
-    "author"              : "Nertea",
+    "author"              : "Nertea (Chris Adderley)",
     "license"             : "restricted",
     "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
     "resources": {

diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg
@@ -4,7 +4,7 @@ PART {
 
 	name = battery-0625
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg
@@ -4,7 +4,7 @@ PART {
 
 	name = battery-125
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-25.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-25.cfg
@@ -4,7 +4,7 @@ PART {
 
 	name = battery-25
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = battery-rad-125
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = capacitor-0625
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = capacitor-125
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-25.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-25.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = capacitor-25
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = capacitor-rad-0625-2
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = capacitor-rad-0625
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-0625
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-125.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-125.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-125
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-25-2.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-25-2.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-25-2
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-25.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-25.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-25
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-375-2.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-375-2.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-375-2
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-375.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-375.cfg
@@ -6,7 +6,7 @@ PART
 	// --- general parameters ---
 	name = reactor-375
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-0625.cfg b/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-0625.cfg
@@ -4,7 +4,7 @@ PART
 {
 	name = nuclearfuel-0625
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-125.cfg b/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-125.cfg
@@ -4,7 +4,7 @@ PART
 {
 	name = nuclearfuel-125
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-25.cfg b/GameData/NearFutureElectrical/Parts/NuclearFuel/nuclearfuel-25.cfg
@@ -4,7 +4,7 @@ PART
 {
 	name = nuclearfuel-25
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg b/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg
@@ -4,7 +4,7 @@ PART
 {
 	name = rtg-0625
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Parts/Resources/nuclear-recycler-25.cfg b/GameData/NearFutureElectrical/Parts/Resources/nuclear-recycler-25.cfg
@@ -4,7 +4,7 @@ PART
 {
 	name = nuclear-recycler-25
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	MODEL
   {

diff --git a/GameData/NearFutureElectrical/Patches/NFElectrical1-10.cfg b/GameData/NearFutureElectrical/Patches/NFElectrical1-10.cfg
@@ -0,0 +1,5 @@
+// Deletes cargo partmodule in KSP < 1.11
+@PART[*]:HAS[#author[Chris?Adderley??Nertea?],@MODULE[ModuleCargoPart]]:NEEDS[!Squad/Parts/Engine/Size2LFB_v2]:FOR[NearFutureElectrical]
+{
+  !MODULE[ModuleCargoPart] {}
+}
diff --git a/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version b/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":2,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+v1.2.1
+------
+- Fix for inventory parts in 1.10
+
 v1.2.0
 ------
 - KSP 1.11

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 =============================
-NEAR FUTURE ELECTRICAL v1.2.0
+NEAR FUTURE ELECTRICAL v1.2.1
 =============================
 
 This pack contains advanced electrical parts - capacitors, nuclear reactors and new battery packs.