Commit Graph
86 Commits
Author SHA1 Message Date
Vexatos 8be4298ca9 Update PluginApiculture.java 2014-12-04 17:54:33 +01:00
MysteriousAges 4ab3e7ddb4 Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev 2014-12-04 01:37:01 -08:00
MysteriousAges 8ff72af9d2 Farmerly & Agrarian bees. Buzz buzz 2014-12-04 01:13:29 -08:00
mezz 38009bb32a Safety check for IC2 Plugin. #351 2014-12-03 20:46:10 -08:00
mezz c17a6af267 Fix trees growing with wrong wood. relates to #344 2014-11-30 14:44:53 -08:00
mezz 3884fecf77 Minor Cleanup
Fix up some null checks

Clean up redundant array creation to varargs parameter

Remove redundant type casts

Simplify arithmetic

Use foreach loops

Remove unused code

Minor cleanup
2014-11-29 23:49:47 -08:00
mezz 7f5108f26c Update for BuildCraft 6.2.1. Fix #348 2014-11-29 19:53:40 -08:00
mezz cc187d6b8b Semi-automatic minor cleanup 2014-11-28 18:09:51 -08:00
mezz 328b9e8356 Fix #344 Teak Trees have Lime wood 2014-11-27 11:41:41 -08:00
mezz 878fe51866 Fix up BuildCraft triggers 2014-11-26 23:40:37 -08:00
mezz 6927c4d5fb Add wildcard for OreDictionary where appropriate 2014-11-20 19:10:10 -08:00
MysteriousAges 9dd73935d7 Refactoring BeekeepingLogic's monolithic update(). Down from 200+ lines to 20, and a buttload of functions. Hopefully it's a bit easier to read & understand now.
Tabs.
Switched order of hasQueen/tryBreedingPrincess to ensure that princesses are bred into queens.
2014-11-16 15:17:15 -08:00
mezz 25a88df47c #232 use @Optional for BuildCraft triggers 2014-11-15 14:21:33 -08:00
mezz 70e8654adb update beekeeping commands 2014-11-14 22:53:46 -08:00
CovertJaguar 79c7ae435c Convert Mail Commands.
And various other improvements to the command code and localization support.
2014-11-13 04:25:10 -08:00
CovertJaguar 4a390fe967 Creates a new command framework that supports trees of commands simply and easily.
Depreciated CommandMC. Many commands remain to be converted to the new system.
Added a butterfly kill command.
2014-11-12 03:53:01 -08:00
mezz 32313cfe6a #309 Convert MJ to RF for BuildCraft plugin 2014-11-04 21:08:13 -08:00
mezz 5487aba3a2 Close #287. Add fireproof logs and planks, and recipes 2014-11-03 00:30:19 -08:00
mezz c9bd15a20d Close #84. Fix #302. Fix #309. Update BuildCraft API to 6.1.x 2014-11-02 15:00:28 -08:00
MysteriousAges f0dedf56a5 Adding storage blocks for Apatite, Copper, Tin and Bronze. 2014-10-24 20:01:43 -07:00
mezz b60b5c1251 Fix #283 Crash from Disabling Arboriculture 2014-10-11 16:52:10 -07:00
CovertJaguar 7ae094ab72 There is a function for that. 2014-10-06 15:14:14 -07:00
mezz 911aa8ca5c Fix #272. Allow every kind of log to be smelted into charcoal 2014-10-06 14:18:46 -07:00
mezz 955ae9640a Make ItemScoop an ItemForestryTool and work in Adventure Mode 2014-10-05 21:12:06 -07:00
mezz 46f5b2fb46 First steps to being able to disable the Lepidopterology module 2014-10-04 21:56:26 -07:00
mezz ebcdf7fbf5 Use strings to register hives in HiveManager 2014-10-04 00:44:03 -07:00
mezz 4b2336bae2 #260 Expose basic hive gen in the API 2014-10-03 02:08:41 -07:00
mezz f8ff6f9ea4 Fix crashes when disabling apiculture module 2014-10-01 22:28:21 -07:00
mezz c0ba391f4f Rename plain pollen to pollenCluster internally 2014-10-01 20:40:15 -07:00
mezz bbcfa7bf2b Fix #258 crash when disabling storage module 2014-10-01 19:44:10 -07:00
mezz c43d057339 #245 Add localized plugin description comments to modules.cfg too 2014-09-27 12:50:24 -07:00
mezz ccd91f91d5 Fix #245: Localize plugin descriptions 2014-09-27 12:46:54 -07:00
mezz cea331470e Moved all electric engine circuits and generator fuel to PluginIC2 2014-09-27 11:44:00 -07:00
mezz d2960b19be Fix #243. Add smelting recipe for apatite 2014-09-27 10:14:52 -07:00
CovertJaguar c1b29f5c20 Make Analyzer Machine require power and accept Honey Drops 2014-09-26 23:17:07 -07:00
mezz 52aceddd80 Stop decorative leaves from running updateTick 2014-09-26 00:20:56 -07:00
mezz 05abf550b9 #216 added leaves to ore dictionary 2014-09-25 22:41:19 -07:00
mezz 711b11f61e Fix #234 Backpacks not picking up ore dictionary items 2014-09-25 18:08:36 -07:00
mezz c23d550571 Merge branch 'dev' into redstoneflux 2014-09-25 02:50:33 -07:00
mezz aaef67ae8f Minor cleanup in PluginApiculture 2014-09-24 18:01:20 -07:00
mezz 23c30c7745 #216 Make Forestry Leaves inherit from and rely on Vanilla Leaves 2014-09-24 04:50:04 -07:00
CovertJaguar 63979170ad Merge branch 'master' into redstoneflux 2014-09-23 18:03:15 -07:00
mezz 62eeed9228 Fix #219: Viewing Beelyzer slot 3 crashes game 2014-09-23 13:37:23 -07:00
mezz 0f2e5c8e11 Fixed PluginIC2 crash and moved IC2 machines into the plugin 2014-09-23 00:07:52 -07:00
mezz 0a1eba609c Revert "Fix #209. Hardened plugin loading. IC2 machines load only with IC2"
This reverts commit 2986536e66.
2014-09-22 23:20:58 -07:00
mezz 2986536e66 Fix #209. Hardened plugin loading. IC2 machines load only with IC2 2014-09-22 22:42:15 -07:00
CovertJaguar 23ae1abb06 Vanilla species shouldn't be secret 2014-09-22 20:30:53 -07:00
CovertJaguar cc5f102d1c Some plugin manager error checking and tweaks. 2014-09-22 20:30:25 -07:00
mezz 8e9447f91e Merge remote-tracking branch 'origin/master' into redstoneflux 2014-09-22 02:36:26 -07:00
mezz a80bcef949 Converted MJ to RF in circuits and Tin Engine 2014-09-22 02:21:59 -07:00