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
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
mezz
eab4cecb5b
Let engines accept energy (for chaining engines like before)
2014-09-22 00:58:47 -07:00
mezz
436a61978a
Have engines use EnergyManager
2014-09-22 00:36:05 -07:00
mezz
6cc67e2df5
Created EnergyManager to help replicate previous behaviors
2014-09-21 23:48:20 -07:00
mezz
60fa471910
Removed IC2 power from TilePowered
2014-09-21 21:36:13 -07:00
mezz
98925d7927
Cleanup MachineFabricator
2014-09-21 21:25:00 -07:00
mezz
09acd8e778
Cleanup in TilePowered
2014-09-21 21:16:29 -07:00
mezz
4e8a25d55c
Fixed machines working without power
2014-09-21 21:09:48 -07:00
mezz
e89e8b4f9d
Make engines output their energy on downstroke and upstroke
2014-09-21 20:35:41 -07:00
mezz
956e53dc66
Build up engine storage correctly
2014-09-21 20:34:37 -07:00
mezz
0163031bf1
Engine *10 cleanup
2014-09-21 20:33:30 -07:00
mezz
308a1ea027
Cleanup. Moved log smelting recipe to registerRecipes
2014-09-21 16:41:26 -07:00
Parker Young
6eb269e6a0
Merge branch 'upstream/master' into redstoneflux
2014-09-21 19:18:17 -04:00
mezz
b5e8d37281
Fix #207 : Crash on load with IC2 or Factorization (bad smelting recipe)
2014-09-21 16:16:20 -07:00
Parker Young
a29fc7588d
Merge branch 'upstream/master' into redstoneflux
2014-09-21 12:17:05 -04:00
mezz
73c4754a17
Closes #137 . Removed @Deprecated
2014-09-21 01:53:48 -07:00
mezz
2ae2cf8896
Fixed or suppressed warnings for rawtypes and unchecked
2014-09-21 01:52:57 -07:00
mezz
d314642d77
Fixed Bottler, removed fuelcan recipe from IC2 since it no longer exists
2014-09-21 01:51:37 -07:00
CovertJaguar
7cc3668a70
General clean up and improvement of internal plugin system
2014-09-20 22:43:13 -07:00
CovertJaguar
b9da1201e9
Merge branch 'master' into plugins-rcstyle
2014-09-20 18:34:04 -07:00
CovertJaguar
c03a761c16
Clean up imports on plugin loader
2014-09-20 18:33:24 -07:00
CovertJaguar
8278f4688a
Merge branch 'master' into plugins-rcstyle
...
Conflicts:
api
lang
2014-09-20 18:26:01 -07:00
CovertJaguar
133ad7d606
Merge pull request #204 from ShetiPhian/patch-1
...
Set toolClass of ItemWrench to "wrench"
2014-09-20 18:12:55 -07:00
Parker Young
51aef06564
Fixed engines generating energy without being active. Whoops.
2014-09-20 21:10:24 -04:00
Parker Young
5545bd8706
Fixing tooltips and other general things
...
Also updated to latest Forestry.
2014-09-20 19:55:37 -04:00
Parker Young
35db536f31
Merge branch 'upstream/master' into redstoneflux
2014-09-20 19:53:06 -04:00
mezz
98ce1b62c9
Fix #205 : Worktable cannot craft certain items (AE2 Facades)
2014-09-20 16:15:33 -07:00
Parker Young
c95c527fb4
Updated to ForestryMC/master
2014-09-20 16:29:10 -04:00
Parker Young
1080799a8d
First draft of Engines producing RF. Compiles. Untested.
2014-09-20 16:22:22 -04:00
Parker Young
310030bd24
Merge pull request #195 from sadris/patch-1
...
Support Mekanism products in miner backpack
2014-09-20 15:55:17 -04:00
ShetiPhian
c138ab6862
Set toolClass of ItemWrench to "wrench"
...
Allows other mods to use the wrench (for things other then rotation) without needing to know the itemstack.
2014-09-20 05:21:16 -04:00
mezz
7f50c7e929
Fix #181 : Letters sent to yourself disappear in Single Player
2014-09-20 01:53:15 -07:00
mezz
d459856852
Make sure worktables don't craft ore-dictionary items into wrong recipe
...
For example:
Wood Logs are all ore dictionary equivalent with each other,
but an Oak Log shouldn't be able to make Ebony Wood Planks
because it makes Oak Wood Planks using the same recipe.
2014-09-19 23:18:14 -07:00
mezz
acccfac0c3
minor reformatting for readability
2014-09-19 23:15:38 -07:00
mezz
12a8c0bc5e
Removed unused "exclude" param from StackUtils.containsSets
2014-09-19 21:34:03 -07:00
mezz
646e0fdb5a
Fix #201 : Worktable crash on shift-clicking items in.
2014-09-19 21:24:51 -07:00
mezz
48f8244dd1
Fixed localization of circuit names and descriptions
2014-09-19 21:00:21 -07:00
Parker
f490ff1f8a
Updated to ForestryMC/master
2014-09-19 19:05:00 -04:00
mezz
1bc5833e32
Fix #199 Vanilla saplings can't be analized in Treealyzer
2014-09-19 16:01:23 -07:00
Parker
3dbedba7be
Updated to Forestry 157
2014-09-19 18:58:22 -04:00
mezz
40a58add89
Fix #200 , Squeezer not working with automation
2014-09-19 15:44:01 -07:00
mezz
8fd2c811e3
Info tabs push NEI out of the way
2014-09-19 03:30:44 -07:00
mezz
063efce85f
Fixed crash when loading another player's ssp world with a multifarm
2014-09-19 01:29:28 -07:00
mezz
d9ab86f9f2
Fix #196 Crash on trying to insert invalid item into Squeezer
2014-09-19 00:44:30 -07:00
mezz
12fd949fa5
Minor ItemBackpack code cleanup
2014-09-19 00:34:50 -07:00
mezz