AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into dependabot/github_actions/development/actions/setup-java-3.11.0

Browse Source
This commit is contained in:
Paldiu 2023-07-04 18:51:48 -05:00 committed by GitHub
commit 7a0a7a251e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -128,8 +128,8 @@
<dependency> <dependency>
<groupId>me.totalfreedom.scissors</groupId> <groupId>me.totalfreedom.scissors</groupId>
<artifactId>scissors-api</artifactId> <artifactId>Scissors-API</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version> <version>1.19.4-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -150,7 +150,7 @@
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId> <artifactId>worldedit-bukkit</artifactId>
<version>7.2.12</version> <version>7.2.15</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

3
src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
View File

@ -4,8 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
/* TODO This will have to be changed from com.github.atlasmediagroup.scissors to me.totalfreedom.scissors when we migrate to 1.19 */ import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
import com.github.atlasmediagroup.scissors.event.block.MasterBlockFireEvent;
import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent; import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;

2
src/main/resources/plugin.yml
View File

@ -13,7 +13,7 @@ softdepend:
- JDA - JDA
- Votifier - Votifier
authors: [Madgeek1450, Prozza] authors: [Madgeek1450, Prozza]
api-version: "1.17" api-version: "1.19"
libraries: libraries:
- org.apache.commons:commons-lang3:3.12.0 - org.apache.commons:commons-lang3:3.12.0
- commons-io:commons-io:2.11.0 - commons-io:commons-io:2.11.0