Skip to content

Commit 22f903d

Browse files
committed
Merge branch 'master' into dev
2 parents 3fa205e + 1033d34 commit 22f903d

File tree

4 files changed

+31
-9
lines changed

4 files changed

+31
-9
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
[//]: # Please describe the issue in details
12+
13+
Lavalink version used:
14+
Client used:
15+
16+
[//]: # Remember to include Lavalink logs

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ The most noteworthy of these, as well as any features and breaking changes, are
1212
Contributors:
1313
[@Devoxin](https://github.com/Devoxin),
1414
[@duncte123](https://github.com/duncte123),
15-
[@Frederikam](https://github.com/Frederikam/), and
15+
[@Frederikam](https://github.com/Frederikam), and
1616
[@napstr](https://github.com/napstr)
1717

18+
## v3.2.0.3
19+
* Add compatibility for Java 8-10
20+
21+
Contributor:
22+
[@MinnDevelopment](https://github.com/MinnDevelopment/)
23+
1824
## v3.2.0.2
1925
* Patched magma
2026

IMPLEMENTATION.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ The Java client has support for JDA, but can also be adapted to work with other
55
## Requirements
66
* You must be able to send messages via a shard's mainWS connection.
77
* You must be able to intercept voice server updates from mainWS on your shard connection.
8-
* One of the following WS drafts (all but RFC 6455 is deprecated but should work):
9-
* RFC 6455
10-
* Hybi 17
11-
* Hybi 10
12-
* Hixie 76
13-
* Hixie 75
148

159
## Significant changes v2.0 -> v3.0
1610
* The response of `/loadtracks` has been completely changed (again since the initial v3.0 pre-release).
@@ -63,9 +57,13 @@ Provide an intercepted voice server update. This causes the server to connect to
6357
```
6458

6559
Cause the player to play a track.
60+
6661
`startTime` is an optional setting that determines the number of milliseconds to offset the track by. Defaults to 0.
62+
6763
`endTime` is an optional setting that determines at the number of milliseconds at which point the track should stop playing. Helpful if you only want to play a snippet of a bigger track. By default the track plays until it's end as per the encoded data.
68-
`noReplace` if set to true, this operation will be ignored if a track is already playing or paused.
64+
65+
If `noReplace` is set to true, this operation will be ignored if a track is already playing or paused.
66+
6967
```json
7068
{
7169
"op": "play",

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,22 @@ users about the compatibility of their clients to the Lavalink server.
6464
* [pylava](https://github.com/Pandentia/pylava) (discord.py, Python)
6565
* [SandySounds](https://github.com/MrJohnCoder/SandySounds) (JavaScript)
6666
* [eris-lavalink](https://github.com/briantanner/eris-lavalink) ([eris](https://github.com/abalabahaha/eris), JavaScript)
67+
* [Shoukaku](https://github.com/Deivu/Shoukaku) ([discord.js](https://github.com/discordjs/discord.js), JavaScript)
6768
* [discord.js-lavalink](https://github.com/MrJacz/discord.js-lavalink/) ([discord.js](https://github.com/discordjs/discord.js), JavaScript)
6869
* [SharpLink](https://github.com/Devoxin/SharpLink) ([Discord.Net](https://github.com/RogueException/Discord.Net), .NET)
6970
* [Victoria](https://github.com/Yucked/Victoria) ([Discord.NET](https://github.com/RogueException/Discord.Net), .NET)
7071
* [Lavalink.NET](https://github.com/Dev-Yukine/Lavalink.NET) (.NET)
7172
* [DSharpPlus.Lavalink](https://github.com/DSharpPlus/DSharpPlus/tree/master/DSharpPlus.Lavalink) ([DSharpPlus](https://github.com/DSharpPlus/DSharpPlus/), .NET)
73+
* [Lavalink4NET](https://github.com/angelobreuer/Lavalink4NET) ([Discord.Net](https://github.com/RogueException/Discord.Net), [DSharpPlus](https://github.com/DSharpPlus/DSharpPlus/), .NET)
7274
* [Luna](https://github.com/CharlotteDunois/Luna) ([Yasmin](https://github.com/CharlotteDunois/Yasmin) or generic, PHP)
7375
* [gavalink](https://github.com/foxbot/gavalink) (Go)
7476
* [Magma](https://github.com/initzx/magma/) (discord.py, Python)
7577
* [lavapotion](https://github.com/SamOphis/lavapotion) (Elixir)
78+
* [WaveLink](https://github.com/EvieePy/Wavelink)(discord.py, Python)
7679
* Or [create your own](https://github.com/Frederikam/Lavalink/blob/master/IMPLEMENTATION.md)
7780

7881
### Supports 2.x:
7982
* [eris-lavalink](https://github.com/briantanner/eris-lavalink) (Eris, JavaScript)
80-
* [discord.js-lavalink](https://github.com/MrJacz/discord.js-lavalink/) (Discord.js, JavaScript)
8183
* Or [create your own](https://github.com/Frederikam/Lavalink/blob/master/IMPLEMENTATION.md)
8284

8385
## Server configuration

0 commit comments

Comments
 (0)