From db7daa33437dfb571802c9aa3e8dce4a97e9287e Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Sat, 23 Sep 2017 02:16:10 -0400 Subject: [PATCH] Closes #884 --- .../mod/config/values/ConfigIntValues.java | 4 +--- .../entity/villager/jam_villager_zombie.png | Bin 2971 -> 21493 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java index 7f8bacf1e..e869f6ba9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java @@ -13,9 +13,7 @@ package de.ellpeck.actuallyadditions.mod.config.values; import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; public enum ConfigIntValues{ - - JAM_VILLAGER_ID("Jam Villager: ID", ConfigCategories.WORLD_GEN, 493827, 100, 1000000, "The ID of the Jam Villager"), - + RICE_AMOUNT("Rice: Amount", ConfigCategories.WORLD_GEN, 15, 1, 100, "The Amount of Rice generating"), CANOLA_AMOUNT("Canola: Amount", ConfigCategories.WORLD_GEN, 10, 1, 50, "The Amount of Canola generating"), FLAX_AMOUNT("Flax: Amount", ConfigCategories.WORLD_GEN, 8, 1, 50, "The Amount of Flax generating"), diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/villager/jam_villager_zombie.png b/src/main/resources/assets/actuallyadditions/textures/entity/villager/jam_villager_zombie.png index d78969276629ea69699bb04cdf1ae347d523446e..92221b5ee26e9966bde885c93e2d1cae600ec8db 100644 GIT binary patch literal 21493 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