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. --- .../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 7 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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