aboutsummaryrefslogtreecommitdiff
path: root/forge
diff options
context:
space:
mode:
authorHacktheTime <l4bg0jb7@duck.com>2023-12-15 18:27:29 +0100
committerHacktheTime <l4bg0jb7@duck.com>2023-12-15 18:27:29 +0100
commit595bb1aca851f8ab4eb216fadbd0e15f7831e4f5 (patch)
tree761c0bc33101b59682badb488e55f8908246b692 /forge
parent64e125ae35ffc42b454b3c9b2bb78605555c51bd (diff)
parent8ffaa253eae1b82c12c1e065fc9cc66006c9feab (diff)
downloadBBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.tar.gz
BBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.tar.bz2
BBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.zip
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
Diffstat (limited to 'forge')
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java2
1 files changed, 0 insertions, 2 deletions
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;