diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-16 12:34:18 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-16 12:34:18 +0200 |
| commit | 4293cfd919c3c93d4532534f722c407d7ad1370d (patch) | |
| tree | f9f612f021ef7f4283d74312edfaca30badc6749 /src/main/resources | |
| parent | 538e3ceb76f8e0b590291ce9aa90aa94896cdcb6 (diff) | |
| parent | 024ba52fb69b6cd44b4e31542867f802de656f15 (diff) | |
| download | SkyHanni-cum.tar.gz SkyHanni-cum.tar.bz2 SkyHanni-cum.zip | |
Merge branch 'beta' into cumcum
# Conflicts:
# src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
# src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/skyhanni/sounds.json | 11 | ||||
| -rw-r--r-- | src/main/resources/assets/skyhanni/sounds/itstimetopunchwheat.ogg | bin | 0 -> 18944 bytes | |||
| -rw-r--r-- | src/main/resources/mcmod.info | 2 | ||||
| -rw-r--r-- | src/main/resources/mixins.skyhanni.json | 4 |
4 files changed, 16 insertions, 1 deletions
diff --git a/src/main/resources/assets/skyhanni/sounds.json b/src/main/resources/assets/skyhanni/sounds.json new file mode 100644 index 000000000..7c017cb0d --- /dev/null +++ b/src/main/resources/assets/skyhanni/sounds.json @@ -0,0 +1,11 @@ +{ + "centurytimer.active": { + "category": "neutral", + "sounds": [ + { + "name": "itstimetopunchwheat", + "stream": false + } + ] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/skyhanni/sounds/itstimetopunchwheat.ogg b/src/main/resources/assets/skyhanni/sounds/itstimetopunchwheat.ogg Binary files differnew file mode 100644 index 000000000..b7bd98137 --- /dev/null +++ b/src/main/resources/assets/skyhanni/sounds/itstimetopunchwheat.ogg diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7f3776068..d920128ae 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid": "skyhanni", "name": "SkyHanni", - "description": "Hypixel Skyblock Mod", + "description": "Hypixel SkyBlock Mod", "version": "${version}", "mcversion": "1.8.9", "url": "", diff --git a/src/main/resources/mixins.skyhanni.json b/src/main/resources/mixins.skyhanni.json index ed342797f..69b41eb4b 100644 --- a/src/main/resources/mixins.skyhanni.json +++ b/src/main/resources/mixins.skyhanni.json @@ -12,6 +12,8 @@ "MixinItemStack", "MixinNetHandlerPlayClient", "MixinNetworkManager", + "MixinRendererLivingEntity", + "MixinRenderGlobal", "MixinRenderItem", "MixinRenderManager", "gui.AccessorGuiContainer", @@ -19,7 +21,9 @@ "renderer.MixinRendererLivingEntity" ], "client": [ + "AccessorGuiEditSign", "AccessorKeyBinding", + "CustomRenderGlobal", "MixinEntityRenderer", "MixinGuiChat", "MixinGuiIngame", |