Skip to content

Commit 9422f46

Browse files
committed
Merge branch 'version/1.21.7' into feat/glow-api
2 parents 3d4aa5f + d57fc6f commit 9422f46

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

.idea/modules.xml

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ reflection-remapper = "0.1.3"
5151
brigadier = "1.0.18"
5252
configurate = "4.2.0"
5353
more-persistent-data-types = "2.4.0"
54-
inventoryframework = "0.11.1"
54+
inventoryframework = "0.11.2"
5555
flogger = "0.8"
5656
aide-reflection = "1.3"
5757
auto-service = "1.1.1"

surf-api-bukkit/surf-api-bukkit-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
runtimeOnly(libs.scoreboard.library.implementation)
3232
runtimeOnly(libs.scoreboard.library.modern)
3333
paperLibrary(libs.scoreboard.library.api)
34-
// api(libs.inventoryframework)
34+
api(libs.inventoryframework)
3535
paperLibrary(libs.guava)
3636
paperLibrary(libs.caffeine)
3737
paperLibrary(libs.gson)

surf-api-bukkit/surf-api-bukkit-server/src/main/kotlin/dev/slne/surf/surfapi/bukkit/server/libs/LibLoader.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class LibLoader(pluginClassLoader: ClassLoader) {
3030
private val logger = logger()
3131
private val pluginClassLoader = pluginClassLoader as PaperPluginClassLoader
3232

33-
fun loadLibs() {
34-
loadLib("IF-0.11.2.zip", "1.20");
35-
}
33+
fun loadLibs() {}
3634

3735
private fun loadLib(jarName: String, apiVersion: String = plugin.pluginMeta.apiVersion!!) {
3836
logger.atInfo().log("Loading library %s", jarName)
Binary file not shown.

0 commit comments

Comments
 (0)