Commit Graph
1265 Commits
Author SHA1 Message Date
mezz c4e52f8670 Add tooltip information for engines 2016-04-28 22:46:19 -07:00
mezz 08d543b2ef Close #1144 add IC2 compatibility back 2016-04-28 19:52:12 -07:00
Nedelosk 04173d6bcf Merge branch 'mc-1.8.9' of https://github.com/ForestryMC/ForestryMC into mc-1.8.9 2016-04-28 10:23:24 +02:00
Nedelosk db20469cb7 Fix #1140, #1139, #1141 2016-04-28 10:23:06 +02:00
mezz 6820d31b31 Fix #1142 JEI [+] button integration with worktable 2016-04-27 23:20:33 -07:00
Nedelosk 04bcdfd8b0 Add Item Mesh Definition for cocoon item 2016-04-27 12:21:58 +02:00
Nedelosk 2d4a98b138 Merge branch 'mc-1.8.9' of https://github.com/ForestryMC/ForestryMC into mc-1.8.9 2016-04-27 12:07:09 +02:00
Nedelosk 4f239590fb Clean Up and Add Cocoon Item 2016-04-27 12:06:50 +02:00
mezz 1b24ba1e5c Use GlStateManager, fix up OpenGL issues 2016-04-26 18:32:31 -07:00
mezz f49cea199e Fix Forestry allele keys 2016-04-26 17:10:41 -07:00
mezz fe61f40179 Fix blend function of particles to match Minecraft's implementation 2016-04-26 17:01:36 -07:00
mezz 2fe2d9f895 Remove escritoire note count localization requirement 2016-04-26 16:44:14 -07:00
mezz 64cf622ccf Use names for Electron Tube UIDs instead of meta values 2016-04-26 16:31:26 -07:00
mezz 9bc61a891d Fix comment in TileHive 2016-04-26 16:15:27 -07:00
Nedelosk 39dc7dbe5e Merge branch 'mc-1.8.9' of https://github.com/ForestryMC/ForestryMC into mc-1.8.9 2016-04-26 16:03:50 +02:00
mezz 2f65545c6b Fix HiveBeeHousingInventory not voiding bee products 2016-04-25 21:17:04 -07:00
Nedelosk 7ca28d4d10 Improve the greenhouse controller 2016-04-25 20:40:55 +02:00
Nedelosk 080dd93dc2 Add cocoon material 2016-04-25 17:32:52 +02:00
mezz c7b94cc8af Make hive bees aggressive, add Bee Smoker item to calm them 2016-04-24 23:22:16 -07:00
mezz 801d8f2752 Make bee particles venture out and return home 2016-04-24 23:22:15 -07:00
Nedelosk 5be265374b Fix greenhouse 2016-04-24 20:59:27 +02:00
mezz 74c9fb57e9 Add JEI recipe integration for the Rainmaker 2016-04-23 23:15:24 -07:00
mezz 1ea86eb343 Add item descriptions for the Apiarist Suit, Habitat Locator, and Scoop 2016-04-23 22:25:56 -07:00
mezz f7ad61a2f3 Add better documentation for Frames 2016-04-23 22:10:59 -07:00
mezz 9f66b811c9 Fix tooltip rendering 2016-04-23 19:03:30 -07:00
mezz e775b5ec5a Pack fences into fewer block IDs 2016-04-23 18:17:15 -07:00
mezz af30ecd03b Add better debugging for WoodItemAccess 2016-04-23 18:17:03 -07:00
mezz 23826adafd #1114 Add wood doors 2016-04-15 19:20:53 -07:00
mezz 187a37643b Fix mis-capitalized file names 2016-04-12 17:34:48 -07:00
Nedelosk 4dfa1cec85 Add buildcraft api and move the apis in the api folder 2016-04-03 01:35:04 +02:00
Nedelosk 17d2105aff Add buildcraft api and move the apis in the api folder 2016-04-03 01:34:27 +02:00
Nedelosk f6daefe255 Fix a server bug 2016-04-01 01:05:01 +02:00
Nedelosk a401995e7e Fix a alvery bug 2016-04-01 00:28:31 +02:00
Nedelosk d794207dae Fix a butterfly mate bug 2016-03-31 21:40:45 +02:00
Nedelosk c5fc804bfa CleanUp 2016-03-31 02:04:29 +02:00
Nedelosk cf23644f45 Add cocoon world genartion with config entry(default false) and add cocoon loot and a greenhouse butterfly hatch 2016-03-30 00:48:19 +02:00
Nedelosk bc0d105730 Add a butterfly spawn rarity config entry 2016-03-28 03:15:48 +02:00
Nedelosk 0349890ddd Make the cocoonprovider to a allele 2016-03-26 17:38:50 +01:00
Nedelosk 31bd519eaf Fix hive gen 2016-03-26 13:31:36 +01:00
Nedelosk 6fbbb508cb Clean Up 2016-03-26 13:29:00 +01:00
Nedelosk 8a40dd6d27 Integrate the terrain in the tree gen helper 2016-03-26 13:28:13 +01:00
Nedelosk 1c1dd4918a Clean Up 2016-03-26 11:34:32 +01:00
Nedelosk b0b501a0ff Fix cocoons and add silk butterfly 2016-03-26 11:27:52 +01:00
Nedelosk 39c6e52d73 Update the butterfly mutations 2016-03-26 09:10:52 +01:00
Nedelosk 5b42b5fbae Add cocoons and fix bugs 2016-03-26 00:50:51 +01:00
mezz c4f447aa67 Fix #1117 Radioactive bee effect can bypass apiarist suit
(cherry picked from commit 4a2af4743f)

Conflicts:
	gradle.properties
2016-03-22 12:36:28 -07:00
Nedelosk 65d9c1dee6 Fix a greenhouse bug 2016-03-20 15:29:14 +01:00
Nedelosk cbcadfbba7 Add greenhouse recipes 2016-03-20 15:15:58 +01:00
Nedelosk b3a2d6cf84 Add recipes to fance gates and add fance gates to the wooditemaccess 2016-03-20 12:58:19 +01:00
Nedelosk 2442a2534a Fix add fence gates 2016-03-20 11:02:30 +01:00