From ba843161dd6cf99766bdfc94d1e18500ccb90c95 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Sun, 21 Nov 2021 18:53:29 +0100 Subject: add Zailer43 to contributors [skip ci] --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fbb1dd91..560b5f0e 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"], + "contributors": ["ExternalTime", "Zailer43"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", -- cgit From e670718beb6463097ede5661dae59c0f9e4726e0 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Thu, 9 Dec 2021 19:51:35 +0100 Subject: support 1.18.x minecraft version and update to 1.4.2 [skip ci] --- src/main/resources/fabric.mod.json | 4 ++-- src/main/resources/skyblocker.mixins.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 560b5f0e..20142d7f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,8 +29,8 @@ "fabricloader": ">=0.11.3", "fabric": "*", "cloth-config2": "*", - "minecraft": "1.17.x", - "java": ">=16" + "minecraft": "1.18.x", + "java": ">=17" }, "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", -- cgit From ada965285c6b2d8d87585579eb14870491031727 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Sun, 12 Dec 2021 21:50:14 +0100 Subject: fix log4j2 --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 20142d7f..09320692 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "skyblocker.mixins.json" ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.12.11", "fabric": "*", "cloth-config2": "*", "minecraft": "1.18.x", -- cgit From 4ceec17c35386dfd2c4178120c13da7b1c4eb88f Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Sat, 18 Dec 2021 23:33:03 +0100 Subject: Merge pull request #29 --- .../resources/assets/skyblocker/textures/gui/bars.png | Bin 6756 -> 8158 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/textures/gui/bars.png b/src/main/resources/assets/skyblocker/textures/gui/bars.png index d3fc95b1..8b5ca33d 100644 Binary files a/src/main/resources/assets/skyblocker/textures/gui/bars.png and b/src/main/resources/assets/skyblocker/textures/gui/bars.png differ -- cgit From 7e30f50d4aae4c48434bde3e852ffd1c95c6efae Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Sat, 22 Jan 2022 15:45:45 -0500 Subject: Added Wiki Lookup Added a keybind which, when pressed will open up the wiki page of the player's held item. --- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/resources') 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", -- cgit From bdbf2074eb548900d780d3989d19ddb089699609 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 25 Jan 2022 00:59:23 +0100 Subject: [skip ci] --- src/main/resources/fabric.mod.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 09320692..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.18.x", - "java": ">=17" + "minecraft": ["1.18.x","1.17.x"] }, "custom": { "modmenu": { -- cgit