upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-10-25 20:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
748 Commits 2 Branches 91 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MysteriousAges 7987c846aa Merge branch 'master' of github.com:MagicBees/MagicBees 2016-02-19 16:29:08 -06:00
MysteriousAges 11eb9e4fb1 Version bump. 2016-02-19 16:28:53 -06:00
MysteriousAges 0569b81126 Merge pull request #127 from MagicBees/gradle-magic 
Use gradle magic instead of libs folder
 2016-02-19 13:27:41 -06:00
MysteriousAges 264385c778 Version bump. 2016-02-18 21:43:27 -06:00
MysteriousAges 36e3209167 Bump remote version check. 2016-01-27 14:39:14 -06:00
MysteriousAges 5c81c964b1 Fixing incorrect EE3 item name for integration. 2016-01-27 14:36:42 -06:00
MysteriousAges dce77fb246 Version bump 2016-01-26 14:09:33 -06:00
MysteriousAges c9fe22c399 Fixing FML Warning for no version param in the @Mod on MagicBees. 2016-01-26 13:10:30 -06:00
MysteriousAges e314a79e24 Fixes AM2 missing product crash. Fixes #81 and #123 2016-01-26 13:01:42 -06:00
MysteriousAges a46274fc6d Bump remote check version. 2016-01-25 14:17:30 -06:00
MysteriousAges 275f03ccba Fixed error in TileEntityVisAuraProvider that prevented the booster from working correctly. Fixes #120. 2016-01-24 16:43:32 -06:00
MysteriousAges 7fa6eb8953 Fixed Shift-click item stacks not moving Princess/Queens and drones into apiary slots. Closes #102 2016-01-24 15:16:49 -06:00
MysteriousAges e6ae553eb8 Fixed problem with Redstone Arsenal items being queried too late. Closes #122. 2016-01-23 19:54:09 -06:00
MysteriousAges 8f5e4127f0 Switching to baubles deobf jar to allow debugging 2016-01-23 19:53:16 -06:00
MysteriousAges 1e082e087f Removing Blood Magic hooks 2016-01-23 17:40:37 -06:00
MysteriousAges 8952663d40 Update BM jar version. 2016-01-22 17:41:43 -06:00
MysteriousAges 2e82ba2bf1 Updating Botania version to match with PR for recipe fix. 
Fix missing WoodenDeviceType entry to fix #121
 2016-01-19 01:12:52 -06:00
MysteriousAges 9597ebb658 Merge pull request #115 from EXTER7/master 
Change Botania related recipes to support Botania r1.8-238
 2016-01-13 01:10:11 -06:00
MysteriousAges 3a3bc29155 Merge pull request #113 from MagicBees/api_update 
Use new bee API for species and mutations. For Forestry 4.2.1
 2016-01-12 17:23:41 -06:00
MysteriousAges c1043bb588 Merge pull request #112 from 3TUSK/zh_CN 
Update zh_CN.lang
 2016-01-12 17:23:12 -06:00
MysteriousAges ab70d8aec2 Fixing Enchanted Earth ticking things at the top of the world. Thanks @TTFTCUTS. 2015-10-27 13:29:09 -05:00
MysteriousAges e8002e069a Fixed missing import. 2015-10-27 13:26:53 -05:00
MysteriousAges 90e5cf801b Merge pull request #110 from Hexicube/patch-1 
Fix for bee name changes in resource packs
 2015-10-26 22:13:59 -05:00
MysteriousAges 167b1f5257 Merge branch 'forestry4.0' 
Conflicts:
	src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java
 2015-10-04 14:50:28 -07:00
MysteriousAges 01cfec7169 Merge branch 'master' into HEAD 
Conflicts:
	src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java
 2015-10-04 14:38:44 -07:00
MysteriousAges 3fde6fb08c Adding sanity checking to Node Empowering effect. Fixes #107 2015-10-04 14:29:44 -07:00
MysteriousAges eacb9f2609 Adding error check to Beegonia to prevent Extra Bees from throwing NoSuchMethodError and crashing. Fixes #105. 2015-10-02 22:40:43 -07:00
MysteriousAges 2503c94b83 Preventing mysterious Magnet from picking up player's own shot projectiles. Doesn't _really_ fix #96, but it's the best I can do without special-casing to hell and back again. |: 2015-09-29 17:35:44 -07:00
MysteriousAges af44fb9d89 Disable TE/TF bees when mod is not present. 2015-09-27 17:25:06 -07:00
MysteriousAges 8569a43f87 Added new bees. What is wrong with me. 2015-09-26 19:13:54 -07:00
MysteriousAges bd8fa92266 Adding a null check in AlleleEffectSpawnMobWeighted. Preferred syntax to PR from #87. 2015-09-26 16:06:54 -07:00
MysteriousAges 4d2ea94b76 Refactored mod helper handling to use an interface and automatically grab all of them after registration. 
Added placeholder effect allele so if any 'oddness' happens when mods are added/removed or compat switched on/off bees won't lose their effects or crash the world.
Removed classes no longer used (BlockPlanks, BlockSlab). cya cya cya
Added alleles for Blitz & Basalz spawning in anticipation of the relevant bees.
 2015-09-26 02:23:02 -07:00
MysteriousAges 8d65e675d1 Collapsing TE & TF helpers into ThermalModsHelper. 
Moving Thermal * item refs from Config into helper.
 2015-09-26 00:48:19 -07:00
MysteriousAges 8beb50fcf8 Adding regular product for Void bee. 2015-09-24 18:14:58 -07:00
MysteriousAges 800799e85c Reset version to 2.3.6 (never actually released, herpderp.) 
Added Void metal bee.
Moved EffectData into effect package.
Changed Aura Node flower provider to correctly identify all varities of node.
 2015-09-24 18:04:12 -07:00
MysteriousAges 66c0f02a6e Merge branch 'master' of github.com:MagicBees/MagicBees 2015-09-18 15:27:51 -07:00
MysteriousAges aa2ef7f24d Updating Botania version. 
Fixing bugs with the Hibeescus: -Mana bar not showing -Bee stack not dropping on flower break
Fixing Forestry NEI plugin crash.
 2015-09-18 15:16:58 -07:00
MysteriousAges 4326da4013 Merge pull request #97 from Vexatos/patch-3 
Update de_DE.lang
 2015-09-09 19:09:39 -07:00
MysteriousAges 3d61472a7e Fixing blood magic integration. Closes #90 2015-09-07 12:30:44 -07:00
MysteriousAges ce8fb0323d Bumping version check file to 2.3.5 2015-09-05 15:53:01 -07:00
MysteriousAges 89975c8718 Adding Baubles compat for Mysterious Magnet in the amulet slot, cleaning up code to make it more readable. Closes #59. 2015-09-05 15:49:39 -07:00
MysteriousAges 7ae7af2238 Version bump. 2015-09-04 18:03:24 -07:00
MysteriousAges 0bdbcdb2f8 Adding products & mutations for TC4 high end bees. 2015-09-04 17:47:12 -07:00
MysteriousAges 354f2ef71b Adding node effect bees. 2015-09-04 15:40:00 -07:00
MysteriousAges 4c93eb6bf4 Update to forestry 3.6 API. 
Adds Aura node Recharge effect.
 2015-09-03 16:17:05 -07:00
MysteriousAges 922a8fffd6 Refactoring HiveDescription to remove static initializer; attaching data via constructors instead. 2015-09-02 13:47:27 -07:00
MysteriousAges ae15b9e77f Fix for hive spawns that should spawn regardless of climate. Closes #95 2015-09-02 13:32:38 -07:00
MysteriousAges 03068d7ddb Moving to Forestry 3.6; updating deprecated methods to new versions. 2015-08-25 17:31:25 -07:00
MysteriousAges a1a4506a14 Correcting Cobalt bee mutations. Closes #91. 2015-08-25 16:53:53 -07:00
MysteriousAges 4f7370b521 Adding Enchanted Earth. 2015-08-22 15:04:39 -07:00
MysteriousAges 25a17fcbfd Bumping remote version check number. 2015-08-17 00:09:33 -07:00
MysteriousAges 9a3fb6ba16 Update version check file. 2015-07-23 11:50:54 -07:00
MysteriousAges 07fde529a4 Changing Manasteel scoop & grafter to use sticks instead of livingwood twigs to avoid recipe conflicts with Botania items. Closes #82 2015-07-22 12:52:28 -07:00
MysteriousAges aad6b1fa13 Removing isPassive override on Beegonia. Closes #83 2015-07-22 12:49:23 -07:00
MysteriousAges 651aa82045 Tweak to floral bees' production rates. Moar flowers plz 2015-07-09 16:38:37 -07:00
MysteriousAges c078d1a24c Adding loc strings for new features in Extra Bees. 2015-07-08 19:48:05 -07:00
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
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
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
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
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
MysteriousAges ec00af6c09 Fixing Free Bees Forever non-feature of Hiveacynth. Closes #48 2015-04-24 23:26:13 -07:00