Skip to content

Commit

Permalink
Switch to main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
udoprog committed Nov 17, 2020
1 parent 272370c commit 10d12b6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build
on:
push:
branches:
- master
- main
pull_request: {}

jobs:
Expand All @@ -30,4 +30,4 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --all
args: --all
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<a href="https://setbac.tv">
<img src="https://raw.githubusercontent.com/udoprog/OxidizeBot/master/bot/res/icon48.png" title="Oxidize Bot">
<img src="https://raw.githubusercontent.com/udoprog/OxidizeBot/main/bot/res/icon48.png" title="Oxidize Bot">
</a>
</div>

Expand Down Expand Up @@ -33,23 +33,23 @@ If there's something you're missing, feel free to [open an issue].
**Rust** &mdash; Written in [Rust], promoting high performance, low utilization, and reliability.

<p>
<img style="float: left;" title="Rust" width="67" height="50" src="https://github.com/udoprog/OxidizeBot/raw/master/gfx/cuddlyferris.png" />
<img style="float: left;" title="Rust" width="67" height="50" src="https://github.com/udoprog/OxidizeBot/raw/main/gfx/cuddlyferris.png" />
</p>

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

<p>
<img style="float: left;" title="Settings" width="140" height="50" src="https://github.com/udoprog/OxidizeBot/raw/master/gfx/setting.png" />
<img style="float: left;" title="Settings" width="140" height="50" src="https://github.com/udoprog/OxidizeBot/raw/main/gfx/setting.png" />
</p>

**Integrated with Windows** &mdash; Runs in the background with a System Tray.
Notifies you on issues.
Starts automatically with Windows if you want it to.

<p>
<img style="float: left;" title="Windows Systray" width="131" height="50" src="https://github.com/udoprog/OxidizeBot/raw/master/gfx/windows-systray.png" />
<img style="float: left;" title="Reminder" width="120" height="50" src="https://github.com/udoprog/OxidizeBot/raw/master/gfx/windows-reminder.png" />
<img style="float: left;" title="Windows Systray" width="131" height="50" src="https://github.com/udoprog/OxidizeBot/raw/main/gfx/windows-systray.png" />
<img style="float: left;" title="Reminder" width="120" height="50" src="https://github.com/udoprog/OxidizeBot/raw/main/gfx/windows-reminder.png" />
</p>

[open an issue]: https://github.com/udoprog/OxidizeBot/issues
Expand Down Expand Up @@ -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.
See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT) for details.
4 changes: 2 additions & 2 deletions bot/src/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -547,4 +547,4 @@ types:
doc: >
The URL to base the `!help` command from.
Default is <https://setbac.tv>.
type: {id: string}
type: {id: string}

0 comments on commit 10d12b6

Please sign in to comment.