Skip to content

Commit

Permalink
update upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Blast-MC committed Jan 3, 2025
1 parent 16f6ecd commit 8252e84
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group = 'net.coreprotect'
String projectVersion = '22.4'
String projectVersion = '23.1'
String projectBranch = ''
version = projectVersion // `version` might be modified, we don't always want that (e.g. plugin.yml)
description = 'Provides block protection for your server.'
Expand All @@ -25,9 +25,11 @@ dependencies {
implementation(platform("com.intellectualsites.bom:bom-newest:1.45")) // Ref: https://github.com/IntellectualSites/bom
compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit")
compileOnly 'io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT'
implementation 'org.bstats:bstats-bukkit-lite:1.8'
implementation 'com.zaxxer:HikariCP:5.0.1'
compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
implementation("org.bstats:bstats-bukkit-lite:1.8")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("com.github.oshi:oshi-core:6.6.2")
implementation("org.apache.logging.log4j:log4j-core:2.23.1")
}

jar {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.coreprotect</groupId>
<artifactId>CoreProtect</artifactId>
<version>22.4</version>
<version>23.1</version>
<properties>
<project.branch></project.branch>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,4 @@ public BlockState copy() {
return null;
}

@Override
public BlockState copy(Location location) {
// TODO Auto-generated method stub
return null;
}

}
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CoreProtect
main: net.coreprotect.CoreProtect
version: ${project.version}
branch: development
branch: coreprotect
api-version: 1.13
folia-supported: true
website: http://coreprotect.net
Expand Down

0 comments on commit 8252e84

Please sign in to comment.