Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes to master --release #477

Merged
merged 2 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN ./gradlew build pluginJar --no-daemon
# 4. Launch a minecraft server with jdk17 and plugin
FROM amazoncorretto:17
# Change to the current plugin version present in build.gradle
ENV PLUGIN_VERSION=6.37.1
ENV PLUGIN_VERSION=6.38.0
# Change to the server version you want to test.
ENV SERVER_VERSION=spigot-1.18.jar
# Port of the Minecraft Server.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BlockBall is a spigot plugin to play soccer games in Minecraft.

* Uses blocks as balls in minecraft
* Games are completely customizable
* Version support 1.8.R3 - 1.20.R2
* Version support 1.8.R3 - 1.20.R3
* Check out the [BlockBall-Spigot-Page](https://www.spigotmc.org/resources/15320/) to get more information.

## Installation
Expand Down
4 changes: 2 additions & 2 deletions blockball-bukkit-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ dependencies {
implementation(project(":blockball-bukkit-api"))
implementation(project(":blockball-core"))

implementation("com.github.shynixn.mcutils:common:1.0.40")
implementation("com.github.shynixn.mcutils:packet:1.0.61")
implementation("com.github.shynixn.mcutils:common:1.0.41")
implementation("com.github.shynixn.mcutils:packet:1.0.65")

implementation("com.github.shynixn.org.bstats:bstats-bukkit:1.7")
implementation("org.slf4j:slf4j-jdk14:1.7.25")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ class BlockBallPlugin : JavaPlugin(), PluginProxy {
Version.VERSION_1_19_R3,
Version.VERSION_1_20_R1,
Version.VERSION_1_20_R2,
Version.VERSION_1_20_R3,
)
} else {
arrayOf(
Version.VERSION_1_20_R2,
Version.VERSION_1_20_R3,
)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: BlockBall
version: 6.37.1
version: 6.38.0
author: Shynixn
website: https://www.spigotmc.org/members/shynixn.63455/
main: com.github.shynixn.blockball.bukkit.BlockBallPlugin
Expand Down
3 changes: 2 additions & 1 deletion blockball-bukkit-plugin/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: BlockBall
version: 6.37.1
version: 6.38.0
author: Shynixn
website: https://www.spigotmc.org/members/shynixn.63455/
main: com.github.shynixn.blockball.bukkit.BlockBallPlugin
softdepend: [WorldEdit, BossBarAPI, PlaceholderAPI, Vault]
libraries:
- 'org.slf4j:slf4j-jdk14:1.7.25'
- 'com.google.inject:guice:5.0.1'
- 'aopalliance:aopalliance:1.0'
- 'commons-io:commons-io:2.6'
- 'com.google.code.gson:gson:2.8.6'
- 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tasks.register("printVersion") {

subprojects {
group 'com.github.shynixn.blockball'
version '6.37.1'
version '6.38.0'

sourceCompatibility = 1.8

Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@

# General information about the project.
project = 'BlockBall'
copyright = '2015 - 2023, Shynixn'
copyright = '2015 - 2024, Shynixn'
author = 'Shynixn'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '6.31.0'
version = '6.38.0'
# The full version, including alpha/beta/rc tags.
release = '6.31.0'
release = '6.38.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading