From 0c9361193ac0eead50b1832703ba4dbc30d5fd64 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Wed, 18 Nov 2015 01:32:45 +0100 Subject: [PATCH] GT Bee fix + new crop textures. --- build.properties | 4 ++-- .../loaders/misc/GT_BranchDefinition.java | 3 ++- .../textures/items/gt.metaitem.02/523.png | Bin 551 -> 514 bytes .../textures/items/gt.metaitem.02/524.png | Bin 551 -> 725 bytes .../textures/items/gt.metaitem.02/526.png | Bin 551 -> 604 bytes .../textures/items/gt.metaitem.02/533.png | Bin 551 -> 616 bytes .../textures/items/gt.metaitem.02/534.png | Bin 551 -> 605 bytes .../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 8ddcef67..fb9da1ec 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 d5387680..ffb6b59b 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 226c67da85ce3d4e7821aef08a287e0b9ead505a..807c9cefe6e867d46f2d9a146b338f1e669f0d66 100644 GIT binary patch delta 488 zcmV004R=004l4008;_ z004mK002@5009+P0026d000+n*IFNt0004qNklS?MTOwPh14cd@B;|$w0|Hh6gMKGMd38}I-}Py z?{$8sMNAmTIO@APtB2=(kEkk_iD?|u?~D#Vy`dKd0Ay4C#SI1qtptbHcsbH`E(&MC_CT9zBkvJ!&C$n?=QY@w^dk&?N zkk7;7MU~8#-;l|~x!LJp3@m?%csmx?rWHB*WoSvF3|6C5A4GtCDDP;4s|dj@ES4>1*- z#1d1)H#ZQ!g{ou_vE9UicSWkuQ9xe)Q4DEDbpJ2x?@b&q8F4zD%+7vhb!DA9^_}7m zK(o13Esw-#ue?Ve{q%ZY5gPN;ROiN)Ze`H*e->TW*^KMt004R=004l4008;_ z004mK002@5009+P0026d000+n*IFNt00078NklY{_<-yn#%mC}#FK{|C1ap+VW{09oH)Y48Cf`5~xi}Yg)60D(6ilvdO zw@S3>kmQ~Y)-+b}z`MNX>-U`ZJ*X;|ombCAFY^ZgUN0NEm35d~*p;ctMg`=>%Of7# zv-SOlFkooTwE$#h_K<2b0JgFYyKb4m0ZTp4#Pdv+79%<~;^Ei<9zO{K2p5HNa31eO6O(-N{8YopHEzQ*dk(Kr>lKhllbsCrezh zO4#urc7I$*XB??Upn4YF9Y5&1apGEiQ;>;iUpiX%85{K}t6#zRzW_VAsKjDL0nl=Q zXyio2;DE)%v@ZZLtB4&Bo-eSx;?j~hpe1oYI^#$vq%{3~K06-N>PDrKPin280HUhr z{`dHJlg6wf*SqW4{#@Y8*Av7?507;#>#(_5z&1NDdHc>2B*WoSvF3|6C5A4GtCDDP;4s|dj@ES4>1*- z#1d1)H#ZQ!g{ou_vE9UicSWkuQ9xe)Q4DEDbpJ2x?@b&q8F4zD%+7vhb!DA9^_}7m zK(o13Esw-#ue?Ve{q%ZY5gPN;ROiN)Ze`H*e->TW*^KMt004R=004l4008;_ z004mK002@5009+P0026d000+n*IFNt0005vNklpIa|i?vpEyB#8O1wTDK ziM2M9B%*W}kgn@;E!9PYY|1bUgb=XSGMmlVY&Mi-$=BBxi^YP=<&w-!${4Zbl7z*SKrgJWnyu7?Ho{a<+5efifjOzPd^?k1Z6+%z|4-XHl z*XuOSe>}RbBgRP6G%B@JWEsHg>ucWEb*+}mC2wzU>ibvz`~Lo}05uNa-vB!rSLs$s RqsIUM002ovPDHLkV1lk731k2O delta 526 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