diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-08-14 18:18:00 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-08-14 18:18:00 +0200 |
| commit | cfef2d401c80d58871c7d5c236946777d1915d00 (patch) | |
| tree | 52f7eea8f0fb18bcc3327e098838fff07f61b8a1 /src/main/resources/fabric.mod.json | |
| parent | 54133f9aa5d4b5134943d3e8d2916100ae7e1f3a (diff) | |
| parent | ada74ef6b54168a1793c76bf3dd1c2c9d379c604 (diff) | |
| download | Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.tar.gz Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.tar.bz2 Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
Pull new upstream things into branch
Diffstat (limited to 'src/main/resources/fabric.mod.json')
| -rw-r--r-- | src/main/resources/fabric.mod.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 71d9763e..596fe8cf 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,6 +37,9 @@ "cloth-config2": "*", "minecraft": "~1.20" }, + "conflicts": { + "immediatelyfast": "<=1.1.26+1.20.1" + }, "custom": { "modmenu": { "links": { |