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

Release 1.2.0

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: build
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"

.github/workflows/deploy.yml

@@ -0,0 +1,47 @@
+name: deploy
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"  
+    - name: Staging package
+      run: python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
+    - name: Deploying package
+      run: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github

.ksp_deploy_config.yml

@@ -0,0 +1,3 @@
+OAUTH_TOKEN_SSM_KEY: pkmc-bot-github-oauth-token
+GITHUB_USER_SSM_KEY: pkmc-bot-github-user
+GITHUB_USER_EMAIL_SSM_KEY: pkmc-bot-github-user-email

.mod_data.yml

@@ -14,12 +14,12 @@ dependencies:  # Configure dependencies
     version: 2.17.0
     location: s3
   CommunityResourcePack:
-    version: 1.3.0
+    version: 1.4.2
     location: s3
   DynamicBatteryStorage:
-    tag: 2.1.7
+    tag: 2.2.1
     location: github
-    repository: ChrisAdderley/DynamicBatteryStorage
+    repository: post-kerbin-mining-corporation/DynamicBatteryStorage
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

CKAN/NearFutureElectrical-Core.netkan

@@ -9,7 +9,7 @@
     "license"             : "MIT",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
-      "repository": "https://github.com/ChrisAdderley/NearFutureElectrical"
+      "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureElectrical"
     },
     "install" : [
         { "file"       : "GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll",

CKAN/NearFutureElectrical.netkan

@@ -9,7 +9,7 @@
     "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
-      "repository": "https://github.com/ChrisAdderley/NearFutureElectrical"
+      "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureElectrical"
     },
     "depends" : [
         { "name" : "B9PartSwitch" },

GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg

@@ -49,4 +49,10 @@ PART {
 		maxAmount = 2800
 
 	}
+
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1200
+  } 
 }

GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg

@@ -49,4 +49,9 @@ PART {
 		maxAmount = 6400
 
 	}
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2160
+  }
 }

GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg

@@ -55,4 +55,9 @@ PART
 	 amount = 800
 	 maxAmount = 800
 	}
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 280
+  }
 }

GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg

@@ -92,4 +92,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 200
+  }
 }

GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg

@@ -92,4 +92,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 360
+  }
 }

GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg

@@ -92,4 +92,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 220
+  }
 }

GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg

@@ -93,4 +93,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 70
+  }
 }

GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg

@@ -198,4 +198,9 @@ PART
       secondaryColor = #777777
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 450
+  }
 }

GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg

@@ -81,4 +81,9 @@ PART
 			key = 350	0
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 120
+  }
 }

GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg

@@ -10,7 +10,7 @@
 }
 @PART[reactor-125]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
-	@TechRequired = advNuclearPower
+	@TechRequired = largeNuclearPower
 }
 @PART[reactor-0625]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {

GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version

@@ -1,19 +1,19 @@
 {
     "NAME":"NearFutureElectrical",
-    "URL":"https://raw.githubusercontent.com/ChrisAdderley/NearFutureElectrical/master/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version",
+    "URL":"https://raw.githubusercontent.com/post-kerbin-mining-corporation/NearFutureElectrical/master/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version",
     "DOWNLOAD":"http://forum.kerbalspaceprogram.com/index.php?/topic/155465-near-future-technologies",
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":1,
-        "PATCH":3,
+        "MINOR":2,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":10,
-        "PATCH":1
+        "MINOR":11,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":99
     }
 }

changelog.txt

@@ -1,3 +1,10 @@
+v1.2.0
+------
+- KSP 1.11
+- Updated DynamicBatteryStorage to 2.2.1
+- Updated CRP to 1.4.2
+- Set many parts as usable in inventories roughly following stock model: most 0.625m parts, smaller 1.25m parts
+
 v1.1.3
 ------
 - KSP 1.10

readme.txt

@@ -1,6 +1,6 @@
-==================================
-NEAR FUTURE ELECTRICAL PACK v1.1.3
-==================================
+=============================
+NEAR FUTURE ELECTRICAL v1.2.0
+=============================
 
 This pack contains advanced electrical parts - capacitors, nuclear reactors and new battery packs.
 
@@ -10,9 +10,9 @@ DEPENDENCIES
 
 Required:
 - B9PartSwitch (2.17.0)
-- Community Resource Pack (1.3.0)
+- Community Resource Pack (1.4.2)
 - ModuleManager (4.1.4)
-- DynamicBatteryStorage (2.1.7)
+- DynamicBatteryStorage (2.2.1)
 
 Optional
 - Community Tech Tree (v2.2+)