From 872a6b759bb840f2f665ad290e35d9828b0bd83f Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 3 Sep 2024 12:46:31 -0400 Subject: [PATCH] post merge fixes --- .../registry/NumismaticsIcons.java | 18 ++++++++++-------- .../assets/numismatics/textures/gui/icons.png | Bin 8847 -> 4429 bytes 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsIcons.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsIcons.java index 4f72903..a74ec24 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsIcons.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsIcons.java @@ -61,6 +61,16 @@ public class NumismaticsIcons extends AllIcons { I_COIN_CROWN = next(), I_COIN_SUN = next() ; + + public static final NumismaticsIcons + I_COIN_SPUR_RED_LINE = newRow(), + I_COIN_BEVEL_RED_LINE = next(), + I_COIN_SPROCKET_RED_LINE = next(), + I_COIN_COG_RED_LINE = next(), + I_COIN_CROWN_RED_LINE = next(), + I_COIN_SUN_RED_LINE = next() + ; + public static final NumismaticsIcons I_HOPPER = newRow(), I_OPEN_SUB_LIST = next(), @@ -68,14 +78,6 @@ public class NumismaticsIcons extends AllIcons { I_SALE_ALERT = next(), I_SALE_CANCEL = next() ; - - public static final NumismaticsIcons - I_COIN_SPUR_RED_LINE = newRow(), - I_COIN_BEVEL_RED_LINE = next(), - I_COIN_SPROCKET_RED_LINE = next(), - I_COIN_COG_RED_LINE = next(), - I_COIN_CROWN_RED_LINE = next(), - I_COIN_SUN_RED_LINE = next(); public NumismaticsIcons(int x, int y) { super(x, y); diff --git a/common/src/main/resources/assets/numismatics/textures/gui/icons.png b/common/src/main/resources/assets/numismatics/textures/gui/icons.png index 477c5b11e4cdb2930c122d288d470b7e9480201e..1f19a57da07fbbfaa8e8c6773950123917fae9a3 100644 GIT binary patch delta 3757 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