From 69ce0dd945f699473a266a64c5ffa2c31168baf5 Mon Sep 17 00:00:00 2001 From: Zontreck Date: Wed, 28 Feb 2024 04:14:07 -0700 Subject: [PATCH] Removed conflicts. Bumped version --- gradle.properties | 2 +- .../java/dev/zontreck/otemod/data/ModItemModelsProvider.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f505e53..b4e8010 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ mod_name=Thresholds # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1201.4.022724.1607 +mod_version=1201.4.022824.0413 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/dev/zontreck/otemod/data/ModItemModelsProvider.java b/src/main/java/dev/zontreck/otemod/data/ModItemModelsProvider.java index 2657a1a..7c40ece 100644 --- a/src/main/java/dev/zontreck/otemod/data/ModItemModelsProvider.java +++ b/src/main/java/dev/zontreck/otemod/data/ModItemModelsProvider.java @@ -64,7 +64,6 @@ public class ModItemModelsProvider extends ItemModelProvider /* Engineer's Decor Items */ - item(ModItems.METAL_BAR);