Commit Graph

Select branches

Hide Pull Requests

master

mu

release/2.9.x

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#53/merge

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#68/merge

#69

#7

#70

#8

#9

0.9.0

1.0.701

1.1.702

1.2.705

1.3.0

1.3.0a

1.3.0b

1.3.0c

1.3.0d

1.4.0

1.4.2

1.4.3

1.4.3a

1.4.3b

1.4.3c

1.4.4

1.4.4b

1.4.5

1.4.5a

1.4.6

1.4.7

2.0.5

2.1.0

2.10.0-GTNH

2.10.1-GTNH-pre

2.10.10-GTNH

2.10.11-GTNH

2.10.12-GTNH

2.10.13-GTNH

2.10.14-GTNH

2.10.2-GTNH

2.10.3-GTNH-pre

2.10.4-GTNH

2.10.5-GTNH

2.10.6-GTNH

2.10.7-GTNH

2.10.8-GTNH

2.10.9-GTNH

2.11.0-GTNH

2.2.3

2.4.1

2.4.2

2.5.0

2.5.10-GTNH

2.5.11-GTNH

2.5.12-GTNH

2.5.13-GTNH

2.5.14-GTNH

2.5.15-GTNH

2.5.16-GTNH

2.5.2

2.5.2-GTNH

2.5.3-GTNH

2.5.4-GTNH

2.5.5-GTNH

2.5.6-GTNH

2.5.7-GTNH

2.5.8-GTNH

2.5.9-GTNH

2.6.0-GTNH

2.6.1-GTNH

2.6.2-GTNH

2.6.3-GTNH

2.6.4-GTNH

2.6.5-GTNH-pre

2.6.6-GTNH

2.7.0-GTNH

2.7.1-GTNH

2.7.10-GTNH-pre

2.7.11-GTNH

2.7.12-GTNH

2.7.13-GTNH

2.7.14-GTNH

2.7.15-GTNH

2.7.16-GTNH

2.7.2-GTNH-pre

2.7.3-GTNH-pre

2.7.4-GTNH

2.7.5-GTNH-pre

2.7.6-GTNH-pre

2.7.7-GTNH-pre

2.7.8-GTNH-pre

2.7.9-GTNH

2.8.0-GTNH

2.8.1-GTNH

2.8.2-GTNH

2.8.3-GTNH

2.8.4-GTNH

2.8.5-GTNH

2.9.0-GTNH

2.9.1-GTNH

2.9.2-GTNH

2.9.3-GTNH

2.9.4-GTNH

Mono Color

• 5e2543027d fix broken gradle properties 2.5.2-GTNH Dream-Master 2020-03-08 18:13:40 +01:00
• 74afd10913 Merge remote-tracking branch 'TataTawa/1.7.10-krypt' into 1.7.10-krypt Dream-Master 2020-03-08 18:10:13 +01:00
• 1ef16b4dba Update gradle not working add libs add gitignore Dream-Master 2020-03-08 18:03:01 +01:00
• c1cc32b2f6 Merge pull request #1 from ForestryMC/mc-1.7.10 TataTawa 2019-12-30 11:02:38 +08:00
• 451f183e83 Add config for node max size 2.5.2 KryptonCaptain 2019-08-24 11:03:36 +10:00
• bff3c669bf git stuff KryptonCaptain 2018-08-08 11:31:14 +10:00
• 6c28a687ab [1.7.10] Thaumcraft/Thermal compat updates and fixes (#68) KryptonCaptain 2018-06-16 00:22:12 +10:00
• 918334e5bf More Thaumcraft compat 2.5.0 KryptonCaptain 2018-06-11 19:36:19 +10:00
• afee91a925 quick fixes 2 KryptonCaptain 2017-09-15 23:04:43 +10:00
• 9196bee240 quick fixes 1 KryptonCaptain 2017-09-15 22:53:42 +10:00
• 824e72ac82 Fixed missing import from @rmunn 's fix Elec332 2017-08-24 00:14:43 +02:00
• fe7824eef4 build stuff Elec332 2017-08-23 10:55:26 +02:00
• c796902c91 Fix nodes growing without limit (#33) Robin Munn 2017-08-21 02:43:13 +07:00
• d13d5ec3dd Merge pull request #25 from rmunn/mc-1.7.10 mezz 2017-07-20 20:27:45 -07:00
• 90186aa9be Allow Valiant bees to sometimes drop from hives Robin Munn 2017-07-20 21:55:11 +07:00
• 155d638647 Fix frequency of rare bee products (#18) Robin Munn 2017-07-14 11:04:50 +07:00
• 130b7c6836 Added config to disable magnet sounds, Fixed effect jar not dropping inv (#144) Gigabit101 2016-05-02 19:58:03 +01:00
• a2ab168d69 Changed oredict entry for Emerald, Diamond and Apatite shards (#142) Jason McRay 2016-04-30 21:57:49 +02:00
• 7987c846aa Merge branch 'master' of github.com:MagicBees/MagicBees MysteriousAges 2016-02-19 16:29:08 -06:00
• 11eb9e4fb1 Version bump. MysteriousAges 2016-02-18 21:43:27 -06:00
• 0569b81126 Merge pull request #127 from MagicBees/gradle-magic MysteriousAges 2016-02-19 13:27:41 -06:00
• 264385c778 Version bump. MysteriousAges 2016-02-18 21:43:27 -06:00
• 93c8fb9dd0 Use gradle magic instead of libs folder mezz 2016-02-11 19:53:23 -08:00
• 36e3209167 Bump remote version check. MysteriousAges 2016-01-27 14:39:14 -06:00
• 5c81c964b1 Fixing incorrect EE3 item name for integration. MysteriousAges 2016-01-27 14:36:42 -06:00
• dce77fb246 Version bump 2.4.2 MysteriousAges 2016-01-26 14:09:33 -06:00
• c9fe22c399 Fixing FML Warning for no version param in the @Mod on MagicBees. MysteriousAges 2016-01-26 13:10:30 -06:00
• e314a79e24 Fixes AM2 missing product crash. Fixes #81 and #123 MysteriousAges 2016-01-26 13:01:42 -06:00
• a46274fc6d Bump remote check version. MysteriousAges 2016-01-25 14:17:30 -06:00
• 275f03ccba Fixed error in TileEntityVisAuraProvider that prevented the booster from working correctly. Fixes #120. 2.4.1 MysteriousAges 2016-01-24 16:43:32 -06:00
• 7fa6eb8953 Fixed Shift-click item stacks not moving Princess/Queens and drones into apiary slots. Closes #102 MysteriousAges 2016-01-24 15:16:49 -06:00
• e6ae553eb8 Fixed problem with Redstone Arsenal items being queried too late. Closes #122. MysteriousAges 2016-01-23 19:54:09 -06:00
• 8f5e4127f0 Switching to baubles deobf jar to allow debugging MysteriousAges 2016-01-23 19:53:16 -06:00
• 1e082e087f Removing Blood Magic hooks MysteriousAges 2016-01-23 17:40:37 -06:00
• 8952663d40 Update BM jar version. MysteriousAges 2016-01-22 17:41:43 -06:00
• 2e82ba2bf1 Updating Botania version to match with PR for recipe fix. Fix missing WoodenDeviceType entry to fix #121 MysteriousAges 2016-01-19 01:12:52 -06:00
• 9597ebb658 Merge pull request #115 from EXTER7/master MysteriousAges 2016-01-13 01:10:11 -06:00
• 5615d2a75b Added more Mana Powders to Botania recipes. EXTER 2016-01-12 19:51:42 -04:00
• 3a3bc29155 Merge pull request #113 from MagicBees/api_update MysteriousAges 2016-01-12 17:23:41 -06:00
• c1043bb588 Merge pull request #112 from 3TUSK/zh_CN MysteriousAges 2016-01-12 17:23:12 -06:00
• e555aeaec2 Changed Botania related recipes to support Botania r1.8-238 EXTER 2015-12-06 15:37:57 -04:00
• ab5b7c7532 Use new bee API for species and mutations. For Forestry 4.2.1 (future) mezz 2015-11-21 19:28:09 -08:00
• 80a078d2ed Update zh_CN.lang Urey.X 2015-11-13 20:38:42 -05:00
• ab70d8aec2 Fixing Enchanted Earth ticking things at the top of the world. Thanks @TTFTCUTS. MysteriousAges 2015-10-27 13:29:09 -05:00
• e8002e069a Fixed missing import. MysteriousAges 2015-10-27 13:26:53 -05:00
• 90e5cf801b Merge pull request #110 from Hexicube/patch-1 MysteriousAges 2015-10-26 22:13:59 -05:00
• e5a26e1b88 Fixed bracing Hexicube 2015-10-26 22:07:42 +00:00
• 72e8fb4c24 Fix for bee name changes in resource packs Hexicube 2015-10-14 05:58:11 +01:00
• a76d0d1c29 Update Forestry version, fix flower providers' growFlowers mezz 2015-10-11 06:46:06 -07:00
• 167b1f5257 Merge branch 'forestry4.0' MysteriousAges 2015-10-04 14:50:28 -07:00
• 01cfec7169 Merge branch 'master' into HEAD MysteriousAges 2015-10-04 14:38:44 -07:00
• 3fde6fb08c Adding sanity checking to Node Empowering effect. Fixes #107 MysteriousAges 2015-10-04 14:29:44 -07:00
• eacb9f2609 Adding error check to Beegonia to prevent Extra Bees from throwing NoSuchMethodError and crashing. Fixes #105. MysteriousAges 2015-10-02 22:40:43 -07:00
• 3f43cc52c1 Update Forestry version requirement mezz 2015-10-02 15:18:18 -07:00
• f1086f3095 Update for Forestry 4.0 mezz 2015-10-01 21:47:53 -07:00
• 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. |: MysteriousAges 2015-09-29 17:35:44 -07:00
• af44fb9d89 Disable TE/TF bees when mod is not present. MysteriousAges 2015-09-27 17:25:06 -07:00
• 8569a43f87 Added new bees. What is wrong with me. MysteriousAges 2015-09-26 19:13:54 -07:00
• bd8fa92266 Adding a null check in AlleleEffectSpawnMobWeighted. Preferred syntax to PR from #87. MysteriousAges 2015-09-26 16:06:54 -07:00
• 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. MysteriousAges 2015-09-26 02:23:02 -07:00
• 8d65e675d1 Collapsing TE & TF helpers into ThermalModsHelper. Moving Thermal * item refs from Config into helper. MysteriousAges 2015-09-26 00:48:19 -07:00
• 8beb50fcf8 Adding regular product for Void bee. MysteriousAges 2015-09-24 18:14:58 -07:00
• 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. MysteriousAges 2015-09-24 18:04:12 -07:00
• 66c0f02a6e Merge branch 'master' of github.com:MagicBees/MagicBees MysteriousAges 2015-09-18 15:27:51 -07:00
• 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. MysteriousAges 2015-09-18 15:16:58 -07:00
• 4326da4013 Merge pull request #97 from Vexatos/patch-3 MysteriousAges 2015-09-09 19:09:39 -07:00
• 3d61472a7e Fixing blood magic integration. Closes #90 MysteriousAges 2015-09-07 12:30:44 -07:00
• 97d50f0405 Update de_DE.lang Vexatos 2015-09-07 19:12:33 +02:00
• ab8a16b26d Update de_DE.lang Vexatos 2015-09-07 19:11:18 +02:00
• ce8fb0323d Bumping version check file to 2.3.5 MysteriousAges 2015-09-05 15:53:01 -07:00
• 89975c8718 Adding Baubles compat for Mysterious Magnet in the amulet slot, cleaning up code to make it more readable. Closes #59. MysteriousAges 2015-09-05 15:49:39 -07:00
• 7ae7af2238 Version bump. MysteriousAges 2015-09-04 18:03:24 -07:00
• 0bdbcdb2f8 Adding products & mutations for TC4 high end bees. MysteriousAges 2015-09-04 17:47:12 -07:00
• 354f2ef71b Adding node effect bees. MysteriousAges 2015-09-04 15:40:00 -07:00
• 4c93eb6bf4 Update to forestry 3.6 API. Adds Aura node Recharge effect. MysteriousAges 2015-09-03 16:17:05 -07:00
• 922a8fffd6 Refactoring HiveDescription to remove static initializer; attaching data via constructors instead. MysteriousAges 2015-09-02 13:47:27 -07:00
• ae15b9e77f Fix for hive spawns that should spawn regardless of climate. Closes #95 MysteriousAges 2015-09-02 13:32:38 -07:00
• 03068d7ddb Moving to Forestry 3.6; updating deprecated methods to new versions. MysteriousAges 2015-08-25 17:31:25 -07:00
• a1a4506a14 Correcting Cobalt bee mutations. Closes #91. MysteriousAges 2015-08-25 16:53:53 -07:00
• 4f7370b521 Adding Enchanted Earth. MysteriousAges 2015-08-22 15:04:39 -07:00
• 25a17fcbfd Bumping remote version check number. MysteriousAges 2015-08-17 00:09:33 -07:00
• 9a3fb6ba16 Update version check file. MysteriousAges 2015-07-23 11:50:54 -07:00
• 07fde529a4 Changing Manasteel scoop & grafter to use sticks instead of livingwood twigs to avoid recipe conflicts with Botania items. Closes #82 MysteriousAges 2015-07-22 12:52:28 -07:00
• aad6b1fa13 Removing isPassive override on Beegonia. Closes #83 MysteriousAges 2015-07-22 12:49:23 -07:00
• 651aa82045 Tweak to floral bees' production rates. Moar flowers plz MysteriousAges 2015-07-09 16:38:37 -07:00
• c078d1a24c Adding loc strings for new features in Extra Bees. MysteriousAges 2015-07-08 19:48:05 -07:00
• e87af0d409 Fixing Blood Magic bees for products & mutations. MysteriousAges 2015-07-08 19:32:42 -07:00
• fde41046d6 Fixing issue where Botania bees are not correctly disabled when Botania compat should be disabled. MysteriousAges 2015-07-08 13:06:09 -07:00
• 77d2833e7e Fix error in Silicon bees' name. Bumping revision version in gradle.properties MysteriousAges 2015-07-04 11:19:47 -07:00
• cc4ac2a389 Merge pull request #79 from MagicBees/ae2MatBees MysteriousAges 2015-07-03 19:05:16 -07:00
• fa5c8aa264 Adding bees for AE2 materials. Closes #72 You're welcome, @FireBall1725 =D MysteriousAges 2015-07-03 19:03:13 -07:00
• 7ee2bc991e Merge branch 'master' into ae2MatBees MysteriousAges 2015-07-03 16:00:05 -07:00
• 5f78df9fe8 Implementing ISidedInventory on the Magic Apiary, 'cause I forgot. :x MysteriousAges 2015-07-03 15:48:06 -07:00
• 7124041129 Added BigBad Bee mutation. Closes #71 MysteriousAges 2015-07-03 14:50:14 -07:00
• dc7c54f85a Bumping Blood Magic & Botania versions. MysteriousAges 2015-07-03 14:10:30 -07:00
• d0ce872a13 Adding safeguard to Hibeescus pickup logic to prevent single-frame dupe issue. Closes #76 MysteriousAges 2015-07-03 13:38:59 -07:00
• fcdf5bd5b3 Adding new entries for Botania pages that were previously piggybacked on existing entries. Closes #74 MysteriousAges 2015-07-03 13:34:12 -07:00
• 7a77dca7c7 Add AE2 Helper MysteriousAges 2015-07-03 12:45:23 -07:00
• 3fad743f61 Some work on AE2 bees. MysteriousAges 2015-07-03 12:38:31 -07:00
• 787a20c0da Merge pull request #75 from Vexatos/patch-2 MysteriousAges 2015-07-03 12:36:55 -07:00