diff --git a/build.gradle b/build.gradle index f67404049..4794cb27e 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ minecraft { replaceIn "StorageDrawers.java" replace '@VERSION@', project.version - replace 'required-after:Chameleon', "required-after:Chameleon@[${chameleon_version},${chameleon_max_version})" + replace 'required-after:chameleon', "required-after:chameleon@[${chameleon_version},${chameleon_max_version})" } sourceSets.main { diff --git a/gradle.properties b/gradle.properties index fb1e1f1cc..ee0c7a5cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx3G minecraft_base_version=1.12 minecraft_version=1.12 -mod_version=5.2.0 -chameleon_version=4.0.1 +mod_version=5.2.1 +chameleon_version=4.1.0 chameleon_max_version=5.0.0 jei_version=4.7.0.67 diff --git a/resources/assets/storagedrawers/models/item/upgrade_redstone_combined.json b/resources/assets/storagedrawers/models/item/upgrade_redstone_combined.json index f4285edc5..9f07a7376 100644 --- a/resources/assets/storagedrawers/models/item/upgrade_redstone_combined.json +++ b/resources/assets/storagedrawers/models/item/upgrade_redstone_combined.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "storagedrawers:items/upgrade_redstone_combined" } diff --git a/resources/assets/storagedrawers/models/item/upgrade_redstone_max.json b/resources/assets/storagedrawers/models/item/upgrade_redstone_max.json index 6b8001b1e..c98241b69 100644 --- a/resources/assets/storagedrawers/models/item/upgrade_redstone_max.json +++ b/resources/assets/storagedrawers/models/item/upgrade_redstone_max.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "storagedrawers:items/upgrade_redstone_max" } diff --git a/resources/assets/storagedrawers/models/item/upgrade_redstone_min.json b/resources/assets/storagedrawers/models/item/upgrade_redstone_min.json index 978e507ab..03482c36b 100644 --- a/resources/assets/storagedrawers/models/item/upgrade_redstone_min.json +++ b/resources/assets/storagedrawers/models/item/upgrade_redstone_min.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "storagedrawers:items/upgrade_redstone_min" }