Skip to content

Commit

Permalink
Merge pull request #84 from Anticept/consistencyupdate
Browse files Browse the repository at this point in the history
Updated various little root files for consistency
  • Loading branch information
Anticept authored May 20, 2020
2 parents 5109593 + 35c7ee6 commit c7ebe04
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
.svn
luac.out

# Cache/Options directory for Visual Studio 2015 and higher
.vs/

# vscode
.vscode/*
.history
26 changes: 26 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
dist: bionic
sudo: false
language: minimal

branches:
only:
- master
- /^v[\d.-]+$/

notifications:
email: false

before_deploy:
- 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

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
74 changes: 74 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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

6 changes: 6 additions & 0 deletions addon.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
11 changes: 5 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -27,7 +26,7 @@ Unless required by applicable law or agreed to in writing, software distributed

[Garry's Mod]: <http://garrysmod.com/>

[workshop]: <http://steamcommunity.com/sharedfiles/filedetails/?id=160250458>
[WireTeam Workshop Collection]: <https://steamcommunity.com/id/wireteam/myworkshopfiles/?appid=4000>

[Wiremod landing page](http://wiremod.com)

Expand Down

0 comments on commit c7ebe04

Please sign in to comment.