From 10d12b66ee37845dacda787138d0ea9125d3908d Mon Sep 17 00:00:00 2001 From: John-John Tedro Date: Tue, 17 Nov 2020 10:06:56 +0100 Subject: [PATCH] Switch to main branch --- .github/workflows/build.yml | 4 ++-- README.md | 12 ++++++------ bot/src/settings.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dd5e2b4..100b54d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Build on: push: branches: - - master + - main pull_request: {} jobs: @@ -30,4 +30,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: test - args: --all \ No newline at end of file + args: --all diff --git a/README.md b/README.md index 1ae8ad0c..76d1665c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
- +
@@ -33,14 +33,14 @@ If there's something you're missing, feel free to [open an issue]. **Rust** — Written in [Rust], promoting high performance, low utilization, and reliability.

- +

**Configurable** — Everything is tweakable to suit your needs through a [hundred settings]. Changes to settings applies immediately - no need to restart.

- +

**Integrated with Windows** — Runs in the background with a System Tray. @@ -48,8 +48,8 @@ Notifies you on issues. Starts automatically with Windows if you want it to.

- - + +

[open an issue]: https://github.com/udoprog/OxidizeBot/issues @@ -94,4 +94,4 @@ This will include backtraces on errors, which is currently an [unstable feature] OxidizeBot is distributed under the terms of both the MIT license and the Apache License (Version 2.0). -See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT) for details. \ No newline at end of file +See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT) for details. diff --git a/bot/src/settings.yaml b/bot/src/settings.yaml index 21b74573..853c95d3 100644 --- a/bot/src/settings.yaml +++ b/bot/src/settings.yaml @@ -95,7 +95,7 @@ types: doc: > **Experimental** support for command-specific configuration overrides. An example override looks like this: `{"name": "Wanted", "enabled": true, "cost": 10000, "cooldown": "5m"}`. - [Available names](https://github.com/udoprog/OxidizeBot/blob/master/bot/src/module/gtav.rs#L208). + [Available names](https://github.com/udoprog/OxidizeBot/blob/main/bot/src/module/gtav.rs#L208). type: id: set value: @@ -547,4 +547,4 @@ types: doc: > The URL to base the `!help` command from. Default is . - type: {id: string} \ No newline at end of file + type: {id: string}