diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5930364 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.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 index 3278111..7e4950e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,4 @@ deploy: file: advdupe2.gma on: repo: wiremod/advdupe2 - tags: true + 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 b86f9f2..4de3541 100644 --- a/addon.json +++ b/addon.json @@ -2,7 +2,7 @@ "title" : "Advanced Duplicator 2", "type" : "tool", "tags" : [ "build" ], - "description": "Ground up rewrite meant to make up for some of the shortcomings of the first iteration of AdvDupe. Still considered alpha!", + "description": "Ground up rewrite meant to make up for some of the shortcomings of the first iteration of AdvDupe.", "ignore" : [ "*.psd", @@ -10,8 +10,13 @@ "*.svn*", "*.txt", "*.xcf", - ".*", + ".git*", + ".gitignore", + ".luacheckrc", + ".travis.yml", + "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", + "generate-luacheck.sh", "git-hooks-pre-commit", "gitrid.sh", "icon.tga", @@ -19,8 +24,6 @@ "advdupe2icon.psd", "license", "readme.md", - "SECURITY.md", - "wiremod.fgd", - "wiremod.jpg" + "SECURITY.md" ] } diff --git a/readme.md b/readme.md index 0d7cadd..5c963fb 100644 --- a/readme.md +++ b/readme.md @@ -2,16 +2,19 @@ Advanced Duplicator 2 is a [Garry's Mod][] addon which implements a tool similar to the Duplicator, but with many added features. It is a fork of (and not a direct successor to, despite the name) [Advanced Duplicator][]. -# Installation +# Workshop Installation -Currently, this version of AdvDupe2 isn't available on the Steam Workshop. The best way to get this addon is to clone this repository into your `addons` folder: +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 + +# Manual Installation + +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/advdupe2.git advdupe2 # License -Copyright 2014-2016 Wire Team +Copyright 2014 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 @@ -23,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)