diff options
| author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-05-17 16:50:12 -0400 |
|---|---|---|
| committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-05-17 17:41:29 -0400 |
| commit | 329c2a81c774f80b288a7b26bda039c15e73566e (patch) | |
| tree | 2453ee1fb82043c726978e9494b21a3b16b0ad74 /src/main/resources | |
| parent | 02b6c6e8ae49e888605964ac8a70b2eaaac7b50d (diff) | |
| parent | 2093b1fc1c2a75009b367bcd7b378bcf6e1d16b8 (diff) | |
| download | Skyblocker-329c2a81c774f80b288a7b26bda039c15e73566e.tar.gz Skyblocker-329c2a81c774f80b288a7b26bda039c15e73566e.tar.bz2 Skyblocker-329c2a81c774f80b288a7b26bda039c15e73566e.zip | |
Merge branch 'api-migration'
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
# src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
# src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/fabric.mod.json | 2 | ||||
| -rw-r--r-- | src/main/resources/skyblocker.mixins.json | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d8ef4941..00bf5b57 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "environment": "client", "entrypoints": { "client": [ - "me.xmrvizzy.skyblocker.SkyblockerInitializer" + "me.xmrvizzy.skyblocker.SkyblockerMod" ], "modmenu": [ "me.xmrvizzy.skyblocker.config.modmenu.ModMenuEntry" diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 1fc53632..91c856a0 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -10,7 +10,6 @@ "FarmlandBlockMixin", "MinecraftClientMixin", "AccessorWorldRenderer", - "GenericContainerScreenMixin", "GenericContainerScreenHandlerMixin", "HandledScreenMixin", "InventoryScreenMixin", |