From 6c79dfb104ec6a927809c0363814488e6690fd5f Mon Sep 17 00:00:00 2001 From: jadedcat Date: Thu, 16 Jan 2014 14:31:09 -0600 Subject: [PATCH] Thermal Expansion and Redstone Arsenal Bees --- magicbees_res/assets/magicbees/lang/en_US.xml | 44 ++++ magicbees_res/build.number | 3 + magicbees_res/build.xml | 2 +- .../magicbees/bees/BeeClassification.java | 3 + .../magicbees/bees/BeeGenomeManager.java | 204 +++++++++++++++ magicbees_src/magicbees/bees/BeeMutation.java | 59 +++++ magicbees_src/magicbees/bees/BeeSpecies.java | 238 ++++++++++++++++++ .../magicbees/item/types/CombType.java | 12 +- .../magicbees/item/types/DropType.java | 5 + .../magicbees/item/types/NuggetType.java | 8 +- magicbees_src/magicbees/main/Config.java | 28 +++ magicbees_src/magicbees/main/MagicBees.java | 10 +- .../magicbees/main/utils/CraftingManager.java | 19 ++ .../magicbees/main/utils/VersionInfo.java | 2 +- .../utils/compat/RedstoneArsenalHelper.java | 100 ++++++++ .../utils/compat/ThermalExpansionHelper.java | 187 ++++++++++++++ 16 files changed, 919 insertions(+), 5 deletions(-) create mode 100644 magicbees_res/build.number create mode 100644 magicbees_src/magicbees/main/utils/compat/RedstoneArsenalHelper.java create mode 100644 magicbees_src/magicbees/main/utils/compat/ThermalExpansionHelper.java diff --git a/magicbees_res/assets/magicbees/lang/en_US.xml b/magicbees_res/assets/magicbees/lang/en_US.xml index 74d5462..3365695 100644 --- a/magicbees_res/assets/magicbees/lang/en_US.xml +++ b/magicbees_res/assets/magicbees/lang/en_US.xml @@ -50,6 +50,11 @@ Essence Comb Potent Comb + + Carbon Comb + Electric Comb + Lux Comb + Endearing Comb Magic Wax @@ -59,6 +64,11 @@ Enchanting Drop Intellect Drop + + Destabilized Drop + Carbon Drop + Lux Drop + Endearing Drop Unusual Pollen @@ -368,6 +378,40 @@ Ravenous for mana, they may be dangerous for any caster.|Apinomicon Wight "They attract magical spirits; not always docile."|Mithion, Adept + + Blizzy + Frigid and cold like miniature snowmen|Apinomicon + Gelid + Liquid coolant producers|Apinomicon + Dante + Mixing bees in an inferno produces surprising results|Apinomicon + Pyro + "You Monster"|Apinomicon + Dante + Mixing bees in an inferno produces surprising results|Apinomicon + Electrum + ...|Apinomicon + Platinum + ...|Apinomicon + Nickel + ...|Apinomicon + Invar + ...|Apinomicon + Tinker + ...|Apinomicon + Carbon + ...|Apinomicon + Destabilized + These bees started out unstable, they didn't get better with time|Apinomicon + Lux + Let there be light..|Apinomicon + Winsome + ....|Apinomicon + Endearing + ....|Apinomicon + Fluxed + ....|Apinomicon +