Merge remote-tracking branch 'upstream/master' into DecreeCommands

This commit is contained in:
CocoTheOwner committed 2021-08-25 13:08:45 +02:00
commit 8547ea4c6a
129 files changed
+2117 -3505

No files matched your search

@@ -26,8 +26,7 @@ public interface IrisService extends Listener {
void onDisable();
default void postShutdown(Runnable r)
{
default void postShutdown(Runnable r) {
Iris.instance.postShutdown(r);
}
}
@@ -426,7 +426,7 @@ public class VolmitSender implements CommandSender {
}
}
public void sendDecreeHelpNode(VirtualDecreeCommand i){
public void sendDecreeHelpNode(VirtualDecreeCommand i) {
if (isPlayer()) {
String newline = "<reset>\n";