Commit Graph
400 Commits
Author SHA1 Message Date
mezz e1a67d9499 Fix xp for smelting 2014-09-27 10:07:14 -07:00
CovertJaguar a6708ac4ab Merge branch 'dev' into release_3.1 2014-09-26 13:55:49 -07:00
mezz 95fc960b50 Fix #240: Cans cannot pick up water or lava 2014-09-26 12:03:13 -07:00
mezz dadd2a71ff Fix #236: Crops multifarm putting dirt in the output inventory
dirt was listed as a waste product, as a holdover from the older style farms
2014-09-26 01:25:15 -07:00
CovertJaguar 23b1df18d4 Bump version 2014-09-26 00:44:43 -07:00
mezz 52aceddd80 Stop decorative leaves from running updateTick 2014-09-26 00:20:56 -07:00
mezz eface45071 #216 fix leaves item rendering 2014-09-25 22:41:34 -07:00
mezz 5219092a7d #216 make placed leaves decorative and nonfunctional 2014-09-25 22:41:34 -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 afc3efbc61 Fix #237 Engines connected to cables don't animate 2014-09-25 15:35:16 -07:00
mezz 14afcf6c63 update lang submodule 2014-09-25 15:11:13 -07:00
mezz 25994dce04 #230 remove TODO that was just fixed 2014-09-25 04:38:34 -07:00
mezz 36f5bc814e Fix #230 Apatite Ore smelts to Copper or Tin 2014-09-25 04:37:15 -07:00
mezz b4f11c9649 Merge pull request #231 from ForestryMC/redstoneflux
Converted from MJ to RF
2014-09-25 03:55:45 -07:00
mezz 0e3b651300 Don't include the IC2 API 2014-09-25 03:33:21 -07:00
mezz 9df9f1d403 Spaces to tabs 2014-09-25 03:05:01 -07:00
mezz 730c08332e remove isPoweredTile 2014-09-25 03:04:25 -07:00
mezz a8f4cf0e5c Set build.gradle versioning back to normal 2014-09-25 03:02:50 -07:00
mezz 4e124f680d Convert MJ hints and descriptions to RF 2014-09-25 02:53:20 -07:00
mezz c23d550571 Merge branch 'dev' into redstoneflux 2014-09-25 02:50:33 -07:00
mezz 6c6cce6957 Fix #229 Server crash when opening mailtrader GUI 2014-09-25 02:43:33 -07:00
mezz b2feb8b4c4 #216 Add 3D leaf item rendering, allow shearing, allow creative access 2014-09-25 02:14:02 -07:00
mezz aaef67ae8f Minor cleanup in PluginApiculture 2014-09-24 18:01:20 -07:00
mezz c67afc53e3 Merge pull request #226 from bdew/patch-housing-climate-ignored
Bees don't respect the temperature/humidity provided by the bee housing
2014-09-24 16:13:54 -07:00
bdew 8c5e512172 Bees should respect the temperature/humidity provided by the bee housing 2014-09-24 15:39:26 +03:00
mezz 23c30c7745 #216 Make Forestry Leaves inherit from and rely on Vanilla Leaves 2014-09-24 04:50:04 -07:00
CovertJaguar 979516f069 Farms radius is now (width of central structure * 3) instead of (width + 1) 2014-09-23 20:25:05 -07:00
CovertJaguar 6f69f9830e Merge branch 'master' into redstoneflux 2014-09-23 19:46:10 -07:00
CovertJaguar fbaad8bf93 Some tree farm optimizations. 2014-09-23 19:41:24 -07:00
CovertJaguar 63979170ad Merge branch 'master' into redstoneflux 2014-09-23 18:03:15 -07:00
mezz 5fe339093a Fix #214: Managed Arboretum does not consume dirt 2014-09-23 14:17:18 -07:00
mezz 62eeed9228 Fix #219: Viewing Beelyzer slot 3 crashes game 2014-09-23 13:37:23 -07:00
mezz ad8c90f5f2 Fix #220. More robust world object for FarmLogic 2014-09-23 13:17:29 -07:00
mezz 52e38f0f9a Fix #215. Allow Trade Station Automation 2014-09-23 04:33:25 -07:00
mezz 3c46ea1b8b Fixed permissions for restricted and private access 2014-09-23 04:25:53 -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 624d5b481e Fix #213: Crash on bee checking for valid biome 2014-09-22 22:51:28 -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
CovertJaguar 27d8f9f585 Update submodules 2014-09-22 06:26:28 -07:00
mezz 8e9447f91e Merge remote-tracking branch 'origin/master' into redstoneflux 2014-09-22 02:36:26 -07:00
mezz ef49ae7a4a Convert MJ hints and descriptions to RF 2014-09-22 02:35:33 -07:00
mezz a80bcef949 Converted MJ to RF in circuits and Tin Engine 2014-09-22 02:21:59 -07:00
mezz 3468169bf9 Removed last of buildcraft.api.power 2014-09-22 02:13:57 -07:00
mezz 7de0258389 Converted farm gearbox to RF 2014-09-22 01:24:55 -07:00
mezz ca5a14d837 remove unused imports 2014-09-22 01:10:06 -07:00
mezz aea2ee5268 Convert Alveary Heater and Fan to RF 2014-09-22 01:04:28 -07:00