diff options
| author | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-25 16:47:59 -0500 |
|---|---|---|
| committer | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-25 16:47:59 -0500 |
| commit | aae93755805a66d6cd253963307d69978d4d86fc (patch) | |
| tree | 2bb5dcc430f7a968bfe6ed96862163e8c4a467ee /src/main/resources | |
| parent | 17e083ed36b5fb3545ee04c11791160833207fed (diff) | |
| parent | ef9a7406af91f5fadcd78af4ec8bd93d7925b9b4 (diff) | |
| download | Skyblocker-aae93755805a66d6cd253963307d69978d4d86fc.tar.gz Skyblocker-aae93755805a66d6cd253963307d69978d4d86fc.tar.bz2 Skyblocker-aae93755805a66d6cd253963307d69978d4d86fc.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 1 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 5 | ||||
| -rw-r--r-- | src/main/resources/skyblocker.mixins.json | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index a1f0198e..680787e8 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -1,6 +1,7 @@ { "key.categories.skyblocker": "Skyblocker", "key.hotbarSlotLock": "Slot Lock (Hotbar)", + "key.wikiLookup": "Wiki Lookup", "text.autoconfig.skyblocker.title": "Skyblocker Settings", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 250e5737..8ef1482d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Skyblocker", "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", @@ -29,8 +29,7 @@ "fabricloader": ">=0.12.11", "fabric": "*", "cloth-config2": "*", - "minecraft": "1.17.x", - "java": ">=16" + "minecraft": ["1.18.x","1.17.x"] }, "custom": { "modmenu": { diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index bfc6b0f2..abc219fa 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -1,11 +1,10 @@ { "required": true, "package": "me.xmrvizzy.skyblocker.mixin", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_17", "client": [ "ChatHudListenerMixin", "ClientPlayerEntityMixin", - "ClientPlayNetworkHandlerMixin", "InGameHudMixin", "ItemRendererMixin", "MinecraftClientMixin", |