Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked

# Conflicts:
#	Distribution/Restock/changelog.txt
#	Distribution/RestockPlus/changelog.txt

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: A problem with the appearance or usability of a Restock part
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Make sure you read the [list of common issues](https://github.com/PorktoberRevolution/ReStocked/issues/581) first!
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**List of mods installed:**
+ - Restock
+
+**Logs**
+Attach logs if you think they are relevant. The log file is named "KSP.log" and is found in the same folder as your KSP executable

.gitignore

@@ -3,5 +3,13 @@ deploy/
 build/
 build-deploy/
 .vs/
+.idea/
 bin/
 obj/
+*.swp
+**/@thumbs
+
+Distribution/Restock/GameData/ReStock/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Assets/CineboxAndrew"]
-	path = Assets/CineboxAndrew
-	url = https://github.com/drewcassidy/ReStocked-Assets.git

.travis.yml

@@ -1,51 +0,0 @@
-language: python
-python:
-  - 3.6
-install:
-  - pip install awscli boto3 requests
-branches:
-  only:
-    - prod
-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 "Distribution/" build-deploy/src/tests/  # run the deploy tests
-  - python build-deploy/src/package.py  --f "Distribution/Restock/.mod_data.yml"  # Build RS package
-  - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  # Build RS+ package
-before_deploy:
-  - python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script. Note that tags will come off restock base always
-deploy:
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy RS package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml"  # Deploy RS+ package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - 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/ReStock
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restock
-    on:
-      branch: prod
-  - 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/ReStockPlus
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restockplus
-    on:
-      branch: prod

CKAN/ReStockPlus.netkan

@@ -2,7 +2,7 @@
   "spec_version": "v1.4",
   "identifier": "ReStockPlus",
   "name": "ReStock+",
-  "abstract": "A carefully curated set of new parts that fill gaping holes in the stock lineup, adding fox example missing size classes for important part types",
+  "abstract": "A carefully curated set of new parts that fill gaping holes in the stock lineup, adding for example missing size classes for important part types",
   "author": "ReStock Team",
   "$kref": "#/ckan/github/PorktoberRevolution/ReStocked/asset_match/ReStockPlus_.*?\\.zip",
   "$vref": "#/ckan/ksp-avc",

CKAN/ReStockRigidLegs.netkan

@@ -0,0 +1,28 @@
+{
+  "spec_version": "v1.4",
+  "identifier": "RestockRigidLegs",
+  "name": "ReStock Extra - Rigid Legs",
+  "abstract": "A copy of the redone Restock legs with no suspension included",
+  "author": "ReStock Team",
+  "$kref": "#/ckan/github/PorktoberRevolution/ReStocked/asset_match/ReStock_.*?\\.zip",
+  "$vref": "#/ckan/ksp-avc",
+  "license": "restricted",
+  "resources": {
+    "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/182679-161-restock-revamping-ksps-art/",
+    "repository": "https://github.com/PorktoberRevolution/ReStocked"
+  },
+  "install": [
+    {
+      "find": "RestockRigidLegs",
+      "install_to": "GameData"
+    }
+  ],
+  "depends": [
+    {
+      "name": "ModuleManager"
+    },
+    {
+      "name": "ReStock"
+    }
+  ]
+}

Distribution/Restock/.mod_data.yml

@@ -8,9 +8,12 @@ package:
     - readme.txt
     - changelog.txt
     - license.txt
+  extras-path: Distribution/RestockExtras/
+  included-extras:
+    - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.0.2
+    version: 4.1.4
     location: s3
 deploy:
   SpaceDock: