Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
#	src/main/java/dev/j3fftw/headlimiter/blocklimiter/BlockLimiter.java
  • Loading branch information
ybw0014 committed Apr 9, 2024
2 parents e1255fe + b721f04 commit 0d54b0e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.github.StarWishsama</groupId>
<artifactId>Slimefun4</artifactId>
<version>eb20e5911f</version>
<version>2024.2</version>
<scope>provided</scope>
</dependency>

Expand All @@ -136,7 +136,7 @@
<dependency>
<groupId>net.guizhanss</groupId>
<artifactId>GuizhanLibPlugin</artifactId>
<version>1.6.1</version>
<version>1.7.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 0d54b0e

Please sign in to comment.