diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2872876 --- /dev/null +++ b/.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" \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..e302790 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.ksp_deploy_config.yml b/.ksp_deploy_config.yml new file mode 100644 index 0000000..91e5200 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.mod_data.yml b/.mod_data.yml index 8c1dfba..62118b2 100644 --- a/.mod_data.yml +++ b/.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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3747191..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: python -python: - - 3.6 -install: - - pip install awscli boto3 requests -branches: - only: - - master -script: - - git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git # clone this repo, it contains the stuff that does the heavy lifting - - cd build-deploy - - git checkout master - - cd .. - - pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests - - python build-deploy/src/package.py --f ".mod_data.yml" # Build package -before_deploy: - - python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script -deploy: - - provider: script - script: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github - skip_cleanup: true - on: - branch: master - - provider: s3 # releases to S3 - access_key_id: $AWS_ACCESS_KEY_ID - secret_access_key: $AWS_SECRET_ACCESS_KEY - bucket: "nertea-ksp-modding-releases" - local_dir: deploy/NearFutureElectrical - skip_cleanup: true - acl: public_read - region: us-east-2 - upload-dir: near-future-electrical - on: - branch: master diff --git a/CKAN/NearFutureElectrical-Core.netkan b/CKAN/NearFutureElectrical-Core.netkan index a15a9a6..382f78b 100644 --- a/CKAN/NearFutureElectrical-Core.netkan +++ b/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", diff --git a/CKAN/NearFutureElectrical.netkan b/CKAN/NearFutureElectrical.netkan index 5385bb9..cf3df7d 100644 --- a/CKAN/NearFutureElectrical.netkan +++ b/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" }, diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg index 940eead..56c65bd 100644 --- a/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg +++ b/GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg @@ -49,4 +49,10 @@ PART { maxAmount = 2800 } + + MODULE + { + name = ModuleCargoPart + packedVolume = 1200 + } } diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg index a238895..e8e03fa 100644 --- a/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg +++ b/GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg @@ -49,4 +49,9 @@ PART { maxAmount = 6400 } + MODULE + { + name = ModuleCargoPart + packedVolume = 2160 + } } diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg index b489703..bebf872 100644 --- a/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg +++ b/GameData/NearFutureElectrical/Parts/Batteries/battery-rad-125.cfg @@ -55,4 +55,9 @@ PART amount = 800 maxAmount = 800 } + MODULE + { + name = ModuleCargoPart + packedVolume = 280 + } } diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg index 75bde9c..980ea71 100644 --- a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg +++ b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-0625.cfg @@ -92,4 +92,9 @@ PART key = 1 1 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 200 + } } diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg index eb71c28..11ce784 100644 --- a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg +++ b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-125.cfg @@ -92,4 +92,9 @@ PART key = 1 1 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 360 + } } diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg index f2993a0..3b3ceb9 100644 --- a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg +++ b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625-2.cfg @@ -92,4 +92,9 @@ PART key = 1 1 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 220 + } } diff --git a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg index 9e04088..029def2 100644 --- a/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg +++ b/GameData/NearFutureElectrical/Parts/Capacitors/capacitor-rad-0625.cfg @@ -93,4 +93,9 @@ PART key = 1 1 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 70 + } } diff --git a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg index 1d7c752..5da59da 100644 --- a/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg +++ b/GameData/NearFutureElectrical/Parts/FissionReactors/reactor-0625.cfg @@ -198,4 +198,9 @@ PART secondaryColor = #777777 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 450 + } } diff --git a/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg b/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg index 8d2232d..9c92fe9 100644 --- a/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg +++ b/GameData/NearFutureElectrical/Parts/RTG/rtg-0625.cfg @@ -81,4 +81,9 @@ PART key = 350 0 } } + MODULE + { + name = ModuleCargoPart + packedVolume = 120 + } } diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg index 1d2d6e2..e9b257f 100644 --- a/GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg +++ b/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] { diff --git a/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version b/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version index 706c495..726f95f 100644 --- a/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version +++ b/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 } } diff --git a/changelog.txt b/changelog.txt index 7ea495a..dd3a41e 100644 --- a/changelog.txt +++ b/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 diff --git a/readme.txt b/readme.txt index fcc6949..eb470b8 100644 --- a/readme.txt +++ b/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+)