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

# Conflicts:
#	fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
#	forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java

2 files changed, 2 insertions, 4 deletions

diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
index a530492..21424fc 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DebugThread implements de.hype.bbsentials.common.client.DebugThread {
+    public static List<Object> store = new ArrayList<>();
     boolean doTest = false;
 
-    public static List<Object> store = new ArrayList<>();
     @Override
     public void loop() {
         if (doTest) {
@@ -22,9 +22,9 @@ public class DebugThread implements de.hype.bbsentials.common.client.DebugThread
     public void doOnce() {
         doTest = true;
     }
+
     @Override
     public List<String> test() {
         return List.of("");
     }
-
 }
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java b/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
index a426381..ef926e3 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
@@ -1,7 +1,5 @@
 package de.hype.bbsentials.forge;
 
-//import de.hype.bbsentials.forge.client.MoulConfigManager;
-
 import java.util.Collections;
 import java.util.List;