Commit Graph
336 Commits
Author SHA1 Message Date
MysteriousAges e87af0d409 Fixing Blood Magic bees for products & mutations. 2015-07-08 19:32:42 -07:00
MysteriousAges fde41046d6 Fixing issue where Botania bees are not correctly disabled when Botania compat should be disabled. 2015-07-08 13:06:09 -07:00
MysteriousAges 77d2833e7e Fix error in Silicon bees' name.
Bumping revision version in gradle.properties
2015-07-04 11:19:47 -07:00
MysteriousAges cc4ac2a389 Merge pull request #79 from MagicBees/ae2MatBees
Ae2 mat bees
2015-07-03 19:05:16 -07:00
MysteriousAges fa5c8aa264 Adding bees for AE2 materials. Closes #72
You're welcome, @FireBall1725 =D
2015-07-03 19:03:13 -07:00
MysteriousAges 7ee2bc991e Merge branch 'master' into ae2MatBees 2015-07-03 16:00:05 -07:00
MysteriousAges 5f78df9fe8 Implementing ISidedInventory on the Magic Apiary, 'cause I forgot. :x 2015-07-03 15:48:06 -07:00
MysteriousAges 7124041129 Added BigBad Bee mutation.
Closes #71
2015-07-03 14:50:34 -07:00
MysteriousAges dc7c54f85a Bumping Blood Magic & Botania versions. 2015-07-03 14:10:30 -07:00
MysteriousAges d0ce872a13 Adding safeguard to Hibeescus pickup logic to prevent single-frame dupe issue.
Closes #76
2015-07-03 13:38:59 -07:00
MysteriousAges fcdf5bd5b3 Adding new entries for Botania pages that were previously piggybacked on existing entries.
Closes #74
2015-07-03 13:34:12 -07:00
MysteriousAges 7a77dca7c7 Add AE2 Helper 2015-07-03 12:45:23 -07:00
MysteriousAges 3fad743f61 Some work on AE2 bees. 2015-07-03 12:38:31 -07:00
MysteriousAges 787a20c0da Merge pull request #75 from Vexatos/patch-2
Update de_DE.lang
2015-07-03 12:36:55 -07:00
Vexatos b326e366b6 Update de_DE.lang 2015-06-27 17:27:25 +02:00
MysteriousAges be652f2fd8 Tweaking Thaumcraft bee species products again. Closes #67. 2015-06-21 22:29:57 -07:00
MysteriousAges 6c61749d35 Merge branch 'master' of github.com:MagicBees/MagicBees 2015-06-19 23:49:22 -07:00
MysteriousAges a0cf62c2a0 Tweak to Doctoral Bees sprite. 2015-06-19 23:48:59 -07:00
mezz 0f644270cc Add Forestry Dev jar as a runtime dependency 2015-06-19 21:18:36 -07:00
mezz fbbc0c5050 Use Forestry API jar instead of Dev jar (woo!) 2015-06-19 20:47:13 -07:00
MysteriousAges 71686766a9 Spalling! 2015-06-19 14:19:12 -07:00
MysteriousAges 8e7767d4ba Adding Osmium bees using Ore Dictionary queries for products.
Add compatability for non-TCons Cobalt to Cobalt bee.
2015-06-19 14:02:44 -07:00
MysteriousAges e5f296cf83 Merge branch 'master' of github.com:MagicBees/MagicBees 2015-06-19 11:25:43 -07:00
MysteriousAges e0432846d5 Removing references to Forestry classes outside the API. Oops. 2015-06-19 11:25:29 -07:00
MysteriousAges e9c1e5cf8c Sorting out problems with initialization order of item fetching, mod helper setup and bee alles & species setup.
Closes #70
2015-06-19 11:10:36 -07:00
MysteriousAges 12dd21e35a Merge pull request #69 from Vexatos/patch-1
Update de_DE.lang
2015-06-18 22:52:48 -07:00
MysteriousAges 8ef17ecbc9 Removed reference to internal Forestry method. (Bad Myst! Go to your corner.) 2015-06-18 13:05:37 -07:00
Vexatos bab96ead6b Update en_US.lang 2015-06-13 10:50:37 +02:00
Vexatos 07ca48aa43 Update en_US.lang 2015-06-13 10:50:13 +02:00
Vexatos 0715532170 Update de_DE.lang 2015-06-13 10:49:33 +02:00
MysteriousAges b43137e399 Merge pull request #61 from 3TUSK/patch-1
Update zh_CN.lang
2015-05-20 00:30:25 -07:00
MysteriousAges 707266cad7 Moving some helper block & item grabbing to postInit; GameRegistry seems more reliable there. Should close #58 #64 2015-05-20 00:27:58 -07:00
MysteriousAges 7a028787c5 Merge branch 'master' of github.com:MagicBees/MagicBees
Conflicts:
	src/main/java/magicbees/main/utils/MoonPhase.java
2015-05-19 23:12:09 -07:00
MysteriousAges 1c5d255f58 Adding alternate localization scheme for moon phase sensitive mutations. Closes #54. 2015-05-19 23:11:14 -07:00
MysteriousAges 4f41f39f92 Adding alternate localization scheme for moon phase sensitive mutations. Closes #54. 2015-05-19 23:09:10 -07:00
MysteriousAges 7e930f44be Tweaking Deep hive spawn rates & locations. Closes #55. 2015-05-19 19:19:18 -07:00
MysteriousAges 23b595e250 Update Forestry's honey fluid name. Fixes #65 2015-05-19 19:11:11 -07:00
MysteriousAges 0c9b6df7b2 Updating localization. 2015-05-12 00:59:02 -07:00
Urey.X. cddddca223 Update zh_CN.lang
To catch up latest version...
2015-05-10 16:52:02 -04:00
MysteriousAges c62db23f79 Adding config values for Hibeescus.
Adding redstone sensitivity to Hibeescus to not pick up princesses/queens when it has a signal.
Adding extra information to Hibeescus lexicon entry.
2015-05-08 15:44:27 -07:00
MysteriousAges 223aba18a4 Adding the Hibeescus to Botania integration.
Fixing "missing" loc strings for Vis Apiary Booster.
Fixing order of petals within some Botania petal recipes.
2015-05-08 14:47:40 -07:00
MysteriousAges 2e4a7d7bb1 Fixing Vazbee creation recipe. 2015-05-02 12:31:58 -07:00
MysteriousAges 913433b0c7 Fixing error with Vis booster's research prerequisite.
Incrementing revision number.
2015-04-29 13:56:23 -07:00
MysteriousAges 3b28e2499e Updating latest version 1.7 2015-04-28 17:58:15 -07:00
MysteriousAges 090a6a2fc3 Fix NPE in SpeciesRecipeManaInfusion - outputCache not properly initalized the first time. :| Closes #50
Adding products to Big Bad Bee.
2015-04-26 14:06:20 -07:00
MysteriousAges 0a28b3fe63 Refactoring Configs to exploit the runtime config changing options in Forge. 2015-04-25 11:33:46 -07:00
MysteriousAges b1a3223fbe Cleaning up more warnings and unused code. 2015-04-25 01:27:49 -07:00
MysteriousAges be12564bcc Renaming fluid textures (2/2; Windows is goofy.) 2015-04-25 00:56:50 -07:00
MysteriousAges e56afa8feb Renaming fluid textures (1/2) 2015-04-25 00:56:24 -07:00
MysteriousAges a74b2da532 Removing defunct TC research.xml
Adding Thermal Foundation fluids to capsules.
2015-04-25 00:50:15 -07:00