Skip to content

Commit

Permalink
Remove versioning conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pixelcrisis committed Feb 5, 2022
2 parents 74c3051 + bf55a80 commit cfec159
Show file tree
Hide file tree
Showing 102 changed files with 9,225 additions and 6,206 deletions.
9 changes: 9 additions & 0 deletions Building.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Building

- Run Yarn Install
- Run Yarn Build

# Development

- Yarn Watch will auto-build on save
- Yarn Start will build and then watch
70 changes: 52 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,29 @@

<p align="center">
<a href="https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme" target="_blank">
<img src="https://img.shields.io/chrome-web-store/stars/pmlkackfnbbnjfejpddpakallilkbdme?color=gold&label=Rating&logo=google-chrome&logoColor=white&style=for-the-badge" />
<img
src="https://img.shields.io/chrome-web-store/stars/pmlkackfnbbnjfejpddpakallilkbdme?color=gold&label=Rating&logo=google-chrome&logoColor=white&style=for-the-badge" />
</a>
<a href="https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme" target="_blank">
<img src="https://img.shields.io/chrome-web-store/users/pmlkackfnbbnjfejpddpakallilkbdme?color=gold&label=Users&logo=google-chrome&logoColor=white&style=for-the-badge" />
<img
src="https://img.shields.io/chrome-web-store/users/pmlkackfnbbnjfejpddpakallilkbdme?color=gold&label=Users&logo=google-chrome&logoColor=white&style=for-the-badge" />
</a>
<a href="https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme" target="_blank">
<img src="https://img.shields.io/chrome-web-store/v/pmlkackfnbbnjfejpddpakallilkbdme?color=teal&label=Version&logo=google-chrome&logoColor=white&style=for-the-badge" />
<img
src="https://img.shields.io/chrome-web-store/v/pmlkackfnbbnjfejpddpakallilkbdme?color=teal&label=Version&logo=google-chrome&logoColor=white&style=for-the-badge" />
</a>
<a href="https://ts.pixelcrisis.co" target="_blank">
<img src="https://img.shields.io/github/package-json/v/pixelcrisis/turnstyles?color=teal&label=Version&logo=javascript&logoColor=white&style=for-the-badge" />
<img
src="https://img.shields.io/github/package-json/v/pixelcrisis/turnstyles?color=teal&label=Version&logo=javascript&logoColor=white&style=for-the-badge" />
</a>
<br>
<a href="https://github.com/pixelcrisis/turnstyles/graphs/contributors/">
<img src="https://img.shields.io/github/contributors/pixelcrisis/turnstyles?color=blue&logo=github&style=for-the-badge" />
<img
src="https://img.shields.io/github/contributors/pixelcrisis/turnstyles?color=blue&logo=github&style=for-the-badge" />
</a>
<a href="#">
<img src="https://img.shields.io/github/watchers/pixelcrisis/turnstyles?color=blue&logo=github&style=for-the-badge" />
<img
src="https://img.shields.io/github/watchers/pixelcrisis/turnstyles?color=blue&logo=github&style=for-the-badge" />
</a>
<a href="#">
<img src="https://img.shields.io/github/stars/pixelcrisis/turnstyles?logo=github&style=for-the-badge" />
Expand All @@ -37,16 +43,23 @@

## Install

**turnStyles** is currently available via the [Chrome Web Store](https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme) and as a [Bookmarklet](https://ts.pixelcrisis.co).
**turnStyles** is currently available via the [Chrome Web
Store](https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme),
[Firefox](https://addons.mozilla.org/en-US/firefox/addon/turnstyles-for-turntable-fm/) and as a
[Bookmarklet](https://ts.pixelcrisis.co).

<p>
<a href="https://chrome.google.com/webstore/detail/pmlkackfnbbnjfejpddpakallilkbdme" target="_blank">
<img src="https://img.shields.io/chrome-web-store/stars/pmlkackfnbbnjfejpddpakallilkbdme?color=green&label=Chrome%20Store&logo=google-chrome&logoColor=white&style=for-the-badge" />
</a>

<a href="https://ts.pixelcrisis.co" target="_blank">
<img src="https://img.shields.io/github/package-json/v/pixelcrisis/turnstyles?color=green&label=Get%20Bookmarklet&logo=javascript&logoColor=white&style=for-the-badge" />
</a>
<img
src="https://img.shields.io/chrome-web-store/v/pmlkackfnbbnjfejpddpakallilkbdme?color=green&label=Version&logo=google-chrome&logoColor=white&style=for-the-badge" />
<a href="https://addons.mozilla.org/en-US/firefox/addon/turnstyles-for-turntable-fm/" target="_blank">
<img
src="https://img.shields.io/amo/v/turnstyles-for-turntable-fm?color=green&label=Version&logo=firefox&logoColor=white&style=for-the-badge">
</a>
<a href="https://ts.pixelcrisis.co" target="_blank">
<img
src="https://img.shields.io/github/package-json/v/pixelcrisis/turnstyles?color=green&label=Get%20Bookmarklet&logo=javascript&logoColor=white&style=for-the-badge" />
</a>
</p>

## Features
Expand All @@ -61,26 +74,45 @@
<br>Mute only until next song

**Themes**:
<br>Dark Mode, Night Mode
<br>Dark Mode, Night Mode, Cosmic, Midnight

**Styles**:
<br>Replace the Gold!

**Desktop Notifications**:
<br>New Songs, Mentions, PMs!
<br>New Songs, Stats, Mentions, PMs!

**Chat Notifications**:
<br>User leave/join, Snags, Song Stats, Dropped DJ stats

**Custom Chat Notifications**:
<br>Get notified on your chosen keywords

**Auto AFK Mentions**:
<br>Let everyone know you're AFK when mentioned

**Auto-Queue**:
<br>Jump on the decks with the next available DJ spot or set a custom mention trigger to add yourself when you're
mentioned

**Custom CSS**:
<br>Add your own custom CSS to turntable.fm

## Support

<a href="https://discord.gg/wqmAVvgSbE" target="_blank">
<img
src="https://img.shields.io/discord/595791360477626380?color=green&label=%20support%20discord&logo=discord&logoColor=white&style=for-the-badge">
</a>

- Join the [turnStyles Support Server](https://discord.gg/wqmAVvgSbE) - Includes support for **beta versions**
- Join the turntable.fm [Discord](https://discord.gg/jnRs4WnPjM) and ask in `#extensions-discussion`
- [Open an Issue!](https://github.com/pixelcrisis/turnstyles/issues/new)


## Contributing

[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge)](http://makeapullrequest.com)
[![PRs
Welcome](https://img.shields.io/badge/PRs-welcome-green.svg?style=for-the-badge)](http://makeapullrequest.com)

- Fork the repo
- Use the `dev` branch for changes
Expand All @@ -102,4 +134,6 @@ A full Privacy Statement can be found under [Privacy.md](Privacy.md).

## Changelog

The full changelog of turnStyles can be found under [turnStyles/releases.](https://github.com/pixelcrisis/turnstyles/releases)
The full changelog of turnStyles can be found under
[turnStyles/releases.](https://github.com/pixelcrisis/turnstyles/releases) or join the [support
Discord](https://discord.gg/wqmAVvgSbE) for previews of next releases!
Binary file modified build/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/images/icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/images/icon48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "turnStyles for turntable.fm",
"version": "5.6.6",
"version": "10.0.0",
"description": "Apply tweaks to turntable.fm - autobop, autodj, themes, styles, and more!",
"manifest_version": 2,
"icons": {
Expand Down
9 changes: 0 additions & 9 deletions build/notify.js

This file was deleted.

Loading

0 comments on commit cfec159

Please sign in to comment.