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

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

.gitignore

@@ -7,3 +7,9 @@ build-deploy/
 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

Distribution/Restock/.mod_data.yml

@@ -13,7 +13,7 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.3
+    version: 4.1.4
     location: s3
 deploy:
   SpaceDock: