aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz <ESs95s3P5z8Pheb>2022-07-12 12:35:35 +0200
committerLorenz <ESs95s3P5z8Pheb>2022-07-12 12:35:35 +0200
commitf36c080c2dcdb57e631c4cdc13454cacacec9dee (patch)
tree7a18c8263ae914c122758cfae39ae4c94df8841e
parent0a713290783a5a8722ff6c5af6cab8575aadbcc4 (diff)
parentec8b45ff8aee43758044bb62b5a00096690ce008 (diff)
downloadSkyHanni-f36c080c2dcdb57e631c4cdc13454cacacec9dee.tar.gz
SkyHanni-f36c080c2dcdb57e631c4cdc13454cacacec9dee.tar.bz2
SkyHanni-f36c080c2dcdb57e631c4cdc13454cacacec9dee.zip
Merge remote-tracking branch 'origin/master'
-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;