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

Dev
post-kerbin-mining-corporation · Dec 29, 2020 · 0749cb7 · 0749cb7
2 parents a6c7764 + b2fde19
commit 0749cb7
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 37 deletions.
diff --git a/CKAN/NearFutureSolar-Core.netkan b/CKAN/NearFutureSolar-Core.netkan
@@ -4,7 +4,7 @@
     "$kref"               : "#/ckan/spacedock/559",
     "name"                : "Near Future Solar Core",
     "abstract"            : "This is the Near Future Solar 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",
     "$vref"               : "#/ckan/ksp-avc/NearFutureSolar.version",
     "recommends": [

diff --git a/CKAN/NearFutureSolar.netkan b/CKAN/NearFutureSolar.netkan
@@ -4,7 +4,7 @@
   "identifier"          : "NearFutureSolar",
   "$kref"               : "#/ckan/spacedock/559",
   "abstract"            : "New solar panels in a variety of sizes and types",
-  "author"              : "Chris Adderley (Nertea)",
+  "author"              : "Nertea (Chris Adderley)",
   "license"             : "restricted",
   "$vref"               : "#/ckan/ksp-avc",
   "resources": {

diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-ikonos-1.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-ikonos-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x1-ikonos-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...lar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-messenger-1.cfg b/...lar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-messenger-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x1-messenger-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-mro-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-mro-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x2-mro-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-wv4-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-wv4-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x2-wv4-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x3-orion-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-2.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-2.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x3-orion-2
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-1.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x4-dragon-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-2.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-2.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x4-dragon-2
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-dawn-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-dawn-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x5-dawn-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-goes-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-goes-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-1x5-goes-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x20-hub-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x20-hub-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-2x20-hub-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x6x6-lab-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x6x6-lab-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-2x6x6-lab-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...olar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-hayabusa-1.cfg b/...olar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-hayabusa-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-3x1-hayabusa-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-tdrss-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-tdrss-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-3x1-tdrss-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-wv3-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-wv3-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-advanced-3x1-wv3-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-arm-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-arm-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-arm-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-bfs-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-bfs-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-bfs-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...ureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-copernicus-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-copernicus-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-copernicus-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 	rescaleFactor = 1
 	// --- asset parameters ---
 	MODEL

diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-drm-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-drm-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-drm-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dsg-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dsg-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-dsg-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dst-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dst-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-dst-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-nautilus-1.cfg b/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-nautilus-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-nautilus-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...arFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-orion-1.cfg b/...arFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-orion-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-orion-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-starship-1.cfg b/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-starship-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-blanket-starship-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...rts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x3x1-juice-1.cfg b/...rts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x3x1-juice-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-concentrator-1x3x1-juice-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/.../Parts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x4-juno-1.cfg b/.../Parts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x4-juno-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-concentrator-1x4-juno-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...ta/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-25-1.cfg b/...ta/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-25-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-curved-25-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/...a/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-375-1.cfg b/...a/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-375-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-deploying-curved-375-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Parts/SolarPanels/static-curved/nfs-panel-static-curved-25-1.cfg b/GameData/NearFutureSolar/Parts/SolarPanels/static-curved/nfs-panel-static-curved-25-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-static-curved-25-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Parts/SolarPanels/static-curved/nfs-panel-static-curved-375-1.cfg b/GameData/NearFutureSolar/Parts/SolarPanels/static-curved/nfs-panel-static-curved-375-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-static-curved-375-1
 	module = Part
-	author = ChrisAdderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-1.cfg b/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-1.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-static-truss-1
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-2.cfg b/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-2.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-static-truss-2
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-3.cfg b/GameData/NearFutureSolar/Parts/SolarPanels/static/nfs-panel-static-truss-3.cfg
@@ -5,7 +5,7 @@ PART
 	// --- general parameters ---
 	name = nfs-panel-static-truss-3
 	module = Part
-	author = Chris Adderley
+	author = Chris Adderley (Nertea)
 
 	// --- asset parameters ---
 	MODEL

diff --git a/GameData/NearFutureSolar/Patches/NFSolar1-10.cfg b/GameData/NearFutureSolar/Patches/NFSolar1-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[NearFutureSolar]
+{
+  !MODULE[ModuleCargoPart] {}
+}
diff --git a/GameData/NearFutureSolar/Versioning/NearFutureSolar.version b/GameData/NearFutureSolar/Versioning/NearFutureSolar.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+v1.3.1
+------
+- Fixed cargo parts for KSP 1.10
+
 v1.3.0
 ------
 - KSP 1.11

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 =============================
-NEAR FUTURE SOLAR PACK v1.3.0
+NEAR FUTURE SOLAR PACK v1.3.1
 =============================
 
 This pack contains many modern and fancy solar panels to use on your ships and stations.