Skip to content

Commit

Permalink
Merge pull request #27 from BlitzOffline/master
Browse files Browse the repository at this point in the history
  • Loading branch information
BlitzOffline authored Dec 29, 2021
2 parents 98ccb1b + 42c136c commit 0af59eb
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("com.github.johnrengelman.shadow") version "7.0.0"
kotlin("jvm") version "1.5.31"
id("com.github.johnrengelman.shadow") version "7.1.2"
kotlin("jvm") version "1.6.10"
}

group = "com.github.frcsty"
Expand All @@ -24,7 +24,7 @@ dependencies {
implementation("me.mattstudios.utils:matt-framework:1.4.6")
implementation("org.bstats:bstats-bukkit:2.2.1")
compileOnly("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT")
compileOnly("me.clip:placeholderapi:2.10.10")
compileOnly("me.clip:placeholderapi:2.11.1")
}

java {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
1 change: 0 additions & 1 deletion src/main/kotlin/com/github/frcsty/command/FormatCommand.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import me.mattstudios.mf.annotations.Completion
import me.mattstudios.mf.annotations.Permission
import me.mattstudios.mf.annotations.SubCommand
import me.mattstudios.mf.base.CommandBase
import org.bukkit.Bukkit
import org.bukkit.command.CommandSender
import org.bukkit.entity.Player

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit
import org.bukkit.Bukkit
import org.bukkit.entity.Player
import org.bukkit.plugin.Plugin
import org.bukkit.scheduler.BukkitRunnable

object MessageFormatter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class PositionPlaceholder(private val loader: Loader) : PlaceholderExpansion() {
}

override fun getVersion(): String {
return "2.1.2"
return "2.3.0"
}

override fun getAuthor(): String {
Expand Down

0 comments on commit 0af59eb

Please sign in to comment.