From 0c9361193ac0eead50b1832703ba4dbc30d5fd64 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Wed, 18 Nov 2015 01:32:45 +0100 Subject: GT Bee fix + new crop textures. --- build.properties | 4 ++-- .../gregtech/loaders/misc/GT_BranchDefinition.java | 3 ++- .../gregtech/textures/items/gt.metaitem.02/523.png | Bin 551 -> 514 bytes .../gregtech/textures/items/gt.metaitem.02/524.png | Bin 551 -> 725 bytes .../gregtech/textures/items/gt.metaitem.02/526.png | Bin 551 -> 604 bytes .../gregtech/textures/items/gt.metaitem.02/533.png | Bin 551 -> 616 bytes .../gregtech/textures/items/gt.metaitem.02/534.png | Bin 551 -> 605 bytes .../gregtech/textures/items/gt.metaitem.02/535.png | Bin 551 -> 2990 bytes 8 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 8ddcef6742..fb9da1ece0 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1517-1.7.10 -gt.version=5.09.11 +gt.version=5.09.12 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 @@ -15,7 +15,7 @@ cofhlib.version=[1.7.10]1.0.3-175-dev enderio.cf=2219/296 enderio.version=1.7.10-2.3.0.417_beta enderiocore.version=1.7.10-0.1.0.25_beta -forestry.version=4.1.0.781-unstable +forestry.version=4.1.1.46 ic2.version=2.2.790-experimental nei.version=1.0.3.57 railcraft.cf=2219/321 diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index d5387680d1..ffb6b59b54 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -5,6 +5,7 @@ import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; +import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.Allele; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -82,7 +83,7 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); - //AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.EFFECT, EnumAllele.effectNone); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.EFFECT, AlleleEffect.effectNone); } return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/523.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/523.png index 226c67da85..807c9cefe6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/523.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/523.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png index 226c67da85..9c58ab1034 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png index 226c67da85..b69ea5397c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png index 226c67da85..f95801e345 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/534.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/534.png index 226c67da85..df2686ace8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/534.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/534.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png index 226c67da85..a526f69e1c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png differ -- cgit