aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-08-20 13:22:34 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-08-20 13:22:34 +0200
commite228eac03fbe10ea3ffd1c2e1930f33318a98c70 (patch)
treedd62c5462f865e919160a8fbb01129cf608b9f1c /src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
parentbb2612feb2b86e94d23d02fbc3e66d5abeb6dd41 (diff)
parent6069d3cf7d2e96ca7ef1975a3dd04e2121a6e3c9 (diff)
downloadSkyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.tar.gz
Skyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.tar.bz2
Skyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.zip
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud
Pull newest changes from upstream
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 8c09f5b1..fe05e793 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -12,6 +12,7 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonMap;
import me.xmrvizzy.skyblocker.skyblock.dungeon.LividColor;
import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
import me.xmrvizzy.skyblocker.skyblock.item.CustomArmorDyeColors;
+import me.xmrvizzy.skyblocker.skyblock.item.CustomArmorTrims;
import me.xmrvizzy.skyblocker.skyblock.item.CustomItemNames;
import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
@@ -94,6 +95,7 @@ public class SkyblockerMod implements ClientModInitializer {
TeleportOverlay.init();
CustomItemNames.init();
CustomArmorDyeColors.init();
+ CustomArmorTrims.init();
containerSolverManager.init();
scheduler.scheduleCyclic(Utils::update, 20);
scheduler.scheduleCyclic(DiscordRPCManager::updateDataAndPresence, 100);