aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/lorenz
diff options
context:
space:
mode:
authorLorenz <ESs95s3P5z8Pheb>2022-07-12 12:35:35 +0200
committerLorenz <ESs95s3P5z8Pheb>2022-07-12 12:35:35 +0200
commitb730ac3829467c8390e9673f65bd37c2b64601ad (patch)
tree7a18c8263ae914c122758cfae39ae4c94df8841e /src/main/java/at/lorenz
parentafdba2c6a3b27a53817cef0b0a306c05162fbcac (diff)
parentd2092973fc39e7d06600b93c9235367e41f0f614 (diff)
downloadskyhanni-b730ac3829467c8390e9673f65bd37c2b64601ad.tar.gz
skyhanni-b730ac3829467c8390e9673f65bd37c2b64601ad.tar.bz2
skyhanni-b730ac3829467c8390e9673f65bd37c2b64601ad.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/at/lorenz')
-rw-r--r--src/main/java/at/lorenz/mod/LorenzMod.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java
index b4b420555..352c8d56d 100644
--- a/src/main/java/at/lorenz/mod/LorenzMod.java
+++ b/src/main/java/at/lorenz/mod/LorenzMod.java
@@ -9,8 +9,8 @@ import at.lorenz.mod.config.Features;
import at.lorenz.mod.dungeon.*;
import at.lorenz.mod.dungeon.damageindicator.DungeonBossDamageIndicator;
import at.lorenz.mod.items.HideNotClickableItems;
-import at.lorenz.mod.items.abilitycooldown.ItemAbilityCooldown;
import at.lorenz.mod.items.ItemDisplayOverlayFeatures;
+import at.lorenz.mod.items.abilitycooldown.ItemAbilityCooldown;
import at.lorenz.mod.misc.*;
import at.lorenz.mod.test.LorenzTest;
import com.google.gson.Gson;