Merge remote-tracking branch 'origin/develop' into develop

Aquerr · Aquerr · commit 26725c1e90f6 · 2022-03-04T14:39:24.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly('org.spongepowered:spongeapi:7.3.0')
-//    compile 'com.github.rojo8399:PlaceholderAPI:4.5.1'
+    compileOnly('org.spongepowered:spongeapi:7.4.0')
 }
 
 tasks.create("publishBuildOnDiscord") {
diff --git a/src/main/java/io/github/aquerr/eaglefactions/api/config/FactionsConfig.java b/src/main/java/io/github/aquerr/eaglefactions/api/config/FactionsConfig.java
@@ -78,4 +78,6 @@ public interface FactionsConfig
 	boolean shouldInformAboutDestroy();
 	boolean shouldShowAttackedClaim();
 	boolean shouldShowDestroyedClaim();
+
+    boolean shouldShowAttackInBossBar();
 }

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ repositories {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
`20`		`- compileOnly('org.spongepowered:spongeapi:7.3.0')`
`21`		`-// compile 'com.github.rojo8399:PlaceholderAPI:4.5.1'`
	`20`	`+ compileOnly('org.spongepowered:spongeapi:7.4.0')`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`tasks.create("publishBuildOnDiscord") {`
Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,6 @@ public interface FactionsConfig`
`78`	`78`	`boolean shouldInformAboutDestroy();`
`79`	`79`	`boolean shouldShowAttackedClaim();`
`80`	`80`	`boolean shouldShowDestroyedClaim();`
	`81`	`+`
	`82`	`+ boolean shouldShowAttackInBossBar();`
`81`	`83`	`}`