Commit Graph

  • 8e9447f91e Merge remote-tracking branch 'origin/master' into redstoneflux mezz 2014-09-22 02:36:26 -07:00
  • ef49ae7a4a Convert MJ hints and descriptions to RF mezz 2014-09-22 02:35:33 -07:00
  • a80bcef949 Converted MJ to RF in circuits and Tin Engine mezz 2014-09-22 02:21:59 -07:00
  • 3468169bf9 Removed last of buildcraft.api.power mezz 2014-09-22 02:13:57 -07:00
  • 7de0258389 Converted farm gearbox to RF mezz 2014-09-22 01:24:55 -07:00
  • ca5a14d837 remove unused imports mezz 2014-09-22 01:10:06 -07:00
  • aea2ee5268 Convert Alveary Heater and Fan to RF mezz 2014-09-22 01:04:28 -07:00
  • eab4cecb5b Let engines accept energy (for chaining engines like before) mezz 2014-09-22 00:36:41 -07:00
  • 436a61978a Have engines use EnergyManager mezz 2014-09-22 00:36:05 -07:00
  • 6cc67e2df5 Created EnergyManager to help replicate previous behaviors mezz 2014-09-21 23:48:20 -07:00
  • 60fa471910 Removed IC2 power from TilePowered mezz 2014-09-21 21:36:13 -07:00
  • 98925d7927 Cleanup MachineFabricator mezz 2014-09-21 21:25:00 -07:00
  • 09acd8e778 Cleanup in TilePowered mezz 2014-09-21 21:16:29 -07:00
  • 4e8a25d55c Fixed machines working without power mezz 2014-09-21 21:09:48 -07:00
  • e89e8b4f9d Make engines output their energy on downstroke and upstroke mezz 2014-09-21 20:35:41 -07:00
  • 956e53dc66 Build up engine storage correctly mezz 2014-09-21 20:34:37 -07:00
  • 0163031bf1 Engine *10 cleanup mezz 2014-09-21 20:33:30 -07:00
  • 301d19e00d Updated to Forestry 173 Parker Young 2014-09-21 19:19:05 -04:00
  • 308a1ea027 Cleanup. Moved log smelting recipe to registerRecipes mezz 2014-09-21 16:41:26 -07:00
  • 6eb269e6a0 Merge branch 'upstream/master' into redstoneflux Parker Young 2014-09-21 19:18:17 -04:00
  • b5e8d37281 Fix #207: Crash on load with IC2 or Factorization (bad smelting recipe) mezz 2014-09-21 16:16:20 -07:00
  • d212fb75dd Updated to Forestry 172 Parker Young 2014-09-21 12:18:29 -04:00
  • a29fc7588d Merge branch 'upstream/master' into redstoneflux Parker Young 2014-09-21 12:17:05 -04:00
  • 73c4754a17 Closes #137. Removed @Deprecated mezz 2014-09-21 01:24:38 -07:00
  • 2ae2cf8896 Fixed or suppressed warnings for rawtypes and unchecked mezz 2014-09-21 01:42:41 -07:00
  • d314642d77 Fixed Bottler, removed fuelcan recipe from IC2 since it no longer exists mezz 2014-09-20 22:50:26 -07:00
  • 7cc3668a70 General clean up and improvement of internal plugin system CovertJaguar 2014-09-20 22:43:13 -07:00
  • 3ad5bdd598 Update submodules CovertJaguar 2014-09-20 18:39:45 -07:00
  • b9da1201e9 Merge branch 'master' into plugins-rcstyle CovertJaguar 2014-09-20 18:34:04 -07:00
  • c03a761c16 Clean up imports on plugin loader CovertJaguar 2014-09-20 18:30:07 -07:00
  • 8278f4688a Merge branch 'master' into plugins-rcstyle CovertJaguar 2014-09-20 18:26:01 -07:00
  • 133ad7d606 Merge pull request #204 from ShetiPhian/patch-1 CovertJaguar 2014-09-20 18:12:55 -07:00
  • 51aef06564 Fixed engines generating energy without being active. Whoops. Parker Young 2014-09-20 21:10:24 -04:00
  • 5545bd8706 Fixing tooltips and other general things Parker Young 2014-09-20 19:55:37 -04:00
  • 35db536f31 Merge branch 'upstream/master' into redstoneflux Parker Young 2014-09-20 19:53:06 -04:00
  • 98ce1b62c9 Fix #205: Worktable cannot craft certain items (AE2 Facades) mezz 2014-09-20 16:01:09 -07:00
  • 76cd4941d5 Updated to Forestry 167 Parker Young 2014-09-20 16:31:02 -04:00
  • c95c527fb4 Updated to ForestryMC/master Parker Young 2014-09-20 16:29:10 -04:00
  • b42a5803a8 Updated Gradle wrapper to 2.0 Parker Young 2014-09-20 16:26:33 -04:00
  • af7b9e13ec Updated lang submodule Parker Young 2014-09-20 16:24:11 -04:00
  • 1080799a8d First draft of Engines producing RF. Compiles. Untested. Parker Young 2014-09-20 16:22:22 -04:00
  • 310030bd24 Merge pull request #195 from sadris/patch-1 Parker Young 2014-09-20 15:55:17 -04:00
  • c138ab6862 Set toolClass of ItemWrench to "wrench" ShetiPhian 2014-09-20 05:21:16 -04:00
  • 7f50c7e929 Fix #181: Letters sent to yourself disappear in Single Player mezz 2014-09-20 01:53:15 -07:00
  • d459856852 Make sure worktables don't craft ore-dictionary items into wrong recipe mezz 2014-09-19 23:18:14 -07:00
  • acccfac0c3 minor reformatting for readability mezz 2014-09-19 23:15:38 -07:00
  • 12a8c0bc5e Removed unused "exclude" param from StackUtils.containsSets mezz 2014-09-19 21:34:03 -07:00
  • 646e0fdb5a Fix #201: Worktable crash on shift-clicking items in. mezz 2014-09-19 21:24:51 -07:00
  • 48f8244dd1 Fixed localization of circuit names and descriptions mezz 2014-09-19 21:00:21 -07:00
  • b786a227ed Updated to Forestry 158 Parker 2014-09-19 19:05:54 -04:00
  • f490ff1f8a Updated to ForestryMC/master Parker 2014-09-19 19:05:00 -04:00
  • 1bc5833e32 Fix #199 Vanilla saplings can't be analized in Treealyzer mezz 2014-09-19 16:01:23 -07:00
  • 3dbedba7be Updated to Forestry 157 Parker 2014-09-19 18:58:22 -04:00
  • 40a58add89 Fix #200, Squeezer not working with automation mezz 2014-09-19 15:44:01 -07:00
  • 40e6301eca Merge pull request #197 from ForestryMC/nei_tabs CovertJaguar 2014-09-19 03:48:35 -07:00
  • 8fd2c811e3 Info tabs push NEI out of the way mezz 2014-09-19 03:30:44 -07:00
  • 063efce85f Fixed crash when loading another player's ssp world with a multifarm mezz 2014-09-19 01:29:28 -07:00
  • d9ab86f9f2 Fix #196 Crash on trying to insert invalid item into Squeezer mezz 2014-09-19 00:44:30 -07:00
  • 12fd949fa5 Minor ItemBackpack code cleanup mezz 2014-09-19 00:34:50 -07:00
  • 5616081f17 Fix #53: Backpacks in Resupply mode crash when opening slotless GUIs mezz 2014-09-19 00:34:30 -07:00
  • 95d6f30f22 Fix #185. Remove [Forestry] user, use owner's permissions mezz 2014-09-18 22:54:45 -07:00
  • fe8d55f38f Created Server-safe method to get EntityPlayer from GameProfile mezz 2014-09-18 22:41:48 -07:00
  • c51e01987c convert spaces to tabs mezz 2014-09-18 19:24:55 -07:00
  • 1d48d4d855 Fixed localization for Short Mead mezz 2014-09-18 19:09:33 -07:00
  • 6a41a055d1 Updated all tanks to use TankManager. mezz 2014-09-18 19:07:44 -07:00
  • 4b7619355d Moved GeneratorFuel list to FuelManager mezz 2014-09-18 02:23:08 -07:00
  • b5878c3002 Support Mekanism products in miner backpack G H 2014-09-18 11:53:33 -04:00
  • 0c6ed6286d Fix types in StackMap to allow explicit types for FuelManager keys mezz 2014-09-18 01:59:58 -07:00
  • 240fdedaeb Filtered tanks accept multiple fluids. Tooltip lists all accepted fluids mezz 2014-09-18 01:55:05 -07:00
  • 07b5e04513 Fixed missing import mezz 2014-09-18 02:02:27 -07:00
  • 1a434af5f6 Make GUI Titles show up behind tooltips instead of in front. mezz 2014-09-18 01:52:05 -07:00
  • 2c1224eec0 Fixed tooltip background being too short for long tooltips mezz 2014-09-18 01:51:23 -07:00
  • 05c58ff7a9 Allow TankManager to network mezz 2014-09-16 21:52:52 -07:00
  • aff9d9d785 Update to current ForestryMC/master Parker 2014-09-16 21:07:59 -04:00
  • 5442b99837 Replace ForestryTank with StandardTank CovertJaguar 2014-09-16 17:40:39 -07:00
  • 7947a66187 Missed one. CovertJaguar 2014-09-16 17:15:29 -07:00
  • 2f7ed2386c Port Railcraft's Fluid utilities to Forestry. CovertJaguar 2014-09-16 17:14:00 -07:00
  • ce1d24952f Renamed new GUI elements so that texture packs don't use the old version mezz 2014-09-16 16:23:20 -07:00
  • 62af4d6f47 Fixes #191. Allow tropical trees to grow in tropical biomes mezz 2014-09-16 14:43:46 -07:00
  • cac24a8673 Fixes #190. Stop crash if a mod with a required version isn't loaded mezz 2014-09-16 13:53:57 -07:00
  • 2cefa9f99d Updated to Forestry 140 Parker 2014-09-16 13:16:31 -04:00
  • b9dfdef20c Merge remote-tracking branch 'upstream/master' into redstoneflux Parker 2014-09-16 13:14:52 -04:00
  • 17ec7edcf5 Fix #128 Make plugins for Buildcraft only available for 6.0.x, not 6.1.x mezz 2014-09-16 02:25:02 -07:00
  • b38ca33c72 Allow plugins to specify a mod with a certain version range mezz 2014-09-16 01:08:29 -07:00
  • 475a70f144 Fixes #145. Worktable can use IC2 RE-Battery and other strange NBT items mezz 2014-09-16 00:03:12 -07:00
  • a3c562c1b1 Fix #180 dupe bug. Unified checking and removing items from inventories mezz 2014-09-15 23:27:55 -07:00
  • 5486be107c Fixed fluid localization keys mezz 2014-09-15 19:27:37 -07:00
  • 69515d2f6b Fixes #183. Give Saplings and Leaves species info for WAILA mezz 2014-09-15 16:44:49 -07:00
  • 5cf658fbe8 Give bee products tooltips with their names in the Beealyzer mezz 2014-09-14 00:24:02 -07:00
  • b7e3145af5 Update localization submodule mezz 2014-09-14 00:20:18 -07:00
  • cea5f224fa Fix #186. Improve the Beealyzer and Treealyzer Mutations pages mezz 2014-09-13 23:30:50 -07:00
  • f91b7422b1 Fixes #184 Items in Trade Letters should have tooltips mezz 2014-09-13 22:20:57 -07:00
  • 84b40c65b9 Added link to latest 1.7.10 builds on Player's site (with permission) mezz 2014-09-13 19:24:47 -07:00
  • 33ae634f9c Changed nickname for IRC users from ForestryWiki to ForestryGithub mezz 2014-09-13 19:23:19 -07:00
  • f13bacfed5 Remove EnumAddressee.INVALID mezz 2014-09-12 23:39:22 -07:00
  • dff81eb85c Use EnumAddressee instead of String to identify mail carriers mezz 2014-09-12 21:25:46 -07:00
  • 0da3d6f792 Stupid submodule and forks not working together :( Parker 2014-09-12 16:16:07 -04:00
  • c6b2110182 Updated to Forestry 131 Parker 2014-09-12 16:12:14 -04:00
  • d6c3c8093c Revert "Updated PluginNatura for latest Natura" mezz 2014-09-12 02:01:03 -07:00
  • fe86b4d08b Updated PluginNatura for latest Natura mezz 2014-09-11 22:50:29 -07:00