From 4f1380e0016e1f67904f8a127f951d645501a98b Mon Sep 17 00:00:00 2001 From: CoreyLee Hassell Date: Sun, 17 May 2020 06:20:31 -0400 Subject: [PATCH 1/2] Updated various little root files for consistency --- .gitattributes | 1 + .gitignore | 10 ++++++- .travis.yml | 29 ++++++++++++++++++ CODE_OF_CONDUCT.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++ addon.json | 6 ++++ readme.md | 11 ++++--- 6 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 .gitattributes create mode 100644 .travis.yml create mode 100644 CODE_OF_CONDUCT.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/.gitignore b/.gitignore index 90ec22b..5930364 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ -.svn +.svn/ +luac.out + +# Cache/Options directory for Visual Studio 2015 and higher +.vs/ + +# vscode +.vscode/* +.history \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..92b3765 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +dist: trusty +sudo: false +language: minimal + +branches: + only: + - master + - /^v[\d.-]+$/ + +notifications: + email: false + +script: + - git diff --check $TRAVIS_COMMIT_RANGE + +before_deploy: + - curl -L "https://github.com/AbigailBuccaneer/gmad-build/releases/download/v20180201/gmad_linux" -o "$HOME/gmad_linux" + - chmod +x "$HOME/gmad_linux" + - $HOME/gmad_linux create -folder . -out advduplicator.gma + +deploy: + skip_cleanup: true + provider: releases + api_key: + secure: N2rH4ff/kkXzwgiiK6GpI93Vvkun27wMb5QU0++uJu1MmPt99kq2jtuDTe96U5F0Es+I9Rrip+EOaPrnLgv6X/8Uy+GA4cOb2FNAsaN/keISw88nZzuc/tsXf1qXitKrVfW7FKp1z79L4tIt6paBlWYTlcTGD9KnBgSZa7wHz0A= + file: advduplicator.gma + on: + repo: wiremod/advduplicator + tags: true \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..010f433 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the Wire Team's administrators through Discord. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + diff --git a/addon.json b/addon.json index 02a3550..6a7f9bf 100644 --- a/addon.json +++ b/addon.json @@ -12,11 +12,17 @@ "*.xcf", ".git*", ".gitignore", + ".luacheckrc", + ".travis.yml", + "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", + "generate-luacheck.sh", "git-hooks-pre-commit", + "gitrid.sh", "license", "readme.md", "advdupe.jpg", + "advdupe.psd", "SECURITY.md" ] } diff --git a/readme.md b/readme.md index c32db45..3b5dfa5 100644 --- a/readme.md +++ b/readme.md @@ -4,18 +4,17 @@ The Advanced Duplicator is a tool to let you duplicate contraptions that include # Workshop Installation -Wiremod is now available via the Steam Workshop! Go to [its Workshop page][workshop] and press `Subscribe`, and it will automatically appear in Garry's Mod. +The Wiremod Collection is available on the Steam Workshop! Go to the [Workshop page][WireTeam Workshop Collection] and press `Subscribe` on the addons you want -# Installation +# Manual Installation -Simply clone this repository into your `addons` folder: +Clone this repository into your `steamapps\common\GarrysMod\garrysmod\addons` folder using this command if you are using git: - cd "%programfiles(x86)%/Steam/SteamApps/common/GarrysMod/garrysmod/addons" git clone https://github.com/wiremod/advduplicator.git advduplicator # License -Copyright 2009-2016 Wire Team +Copyright 2008 onwards by the Wire Team Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -27,7 +26,7 @@ Unless required by applicable law or agreed to in writing, software distributed [Garry's Mod]: -[workshop]: +[WireTeam Workshop Collection]: [Wiremod landing page](http://wiremod.com) From 35c7ee69346712e7040b83d7d9b327229ab50638 Mon Sep 17 00:00:00 2001 From: CoreyLee Hassell Date: Tue, 19 May 2020 08:13:31 -0400 Subject: [PATCH 2/2] Updated gmad_linux ref to always use latest build from wiremod repo. --- .gitignore | 1 - .travis.yml | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5930364..7ecc1b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.svn/ luac.out # Cache/Options directory for Visual Studio 2015 and higher diff --git a/.travis.yml b/.travis.yml index 92b3765..90bf56b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: bionic sudo: false language: minimal @@ -10,11 +10,8 @@ branches: notifications: email: false -script: - - git diff --check $TRAVIS_COMMIT_RANGE - before_deploy: - - curl -L "https://github.com/AbigailBuccaneer/gmad-build/releases/download/v20180201/gmad_linux" -o "$HOME/gmad_linux" + - curl -L "https://github.com/wiremod/gmad-build/releases/latest/download/gmad_linux" -o "$HOME/gmad_linux" - chmod +x "$HOME/gmad_linux" - $HOME/gmad_linux create -folder . -out advduplicator.gma