CovertJaguar
3326f4db03
Merge branch 'dev' of github.com:ForestryMC/ForestryMC into inventory-cleanup
...
Conflicts:
src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java
src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java
src/main/java/forestry/core/gui/ContainerForestry.java
src/main/java/forestry/energy/gadgets/EngineBronze.java
src/main/java/forestry/energy/gadgets/MachineGenerator.java
src/main/java/forestry/factory/gadgets/MachineBottler.java
src/main/java/forestry/factory/gadgets/MachineCarpenter.java
src/main/java/forestry/factory/gadgets/MachineFabricator.java
src/main/java/forestry/factory/gadgets/MachineFermenter.java
src/main/java/forestry/factory/gadgets/MachineMoistener.java
src/main/java/forestry/factory/gadgets/MachineRaintank.java
src/main/java/forestry/factory/gadgets/MachineStill.java
src/main/java/forestry/factory/gadgets/TileWorktable.java
src/main/java/forestry/farming/gadgets/TileFarmPlain.java
src/main/java/forestry/farming/gui/ContainerFarm.java
2014-12-13 16:39:40 -08:00
mezz
5ea4770a2d
Fix #364 . Cleanup of Liquid/Fluid handling, handle IFluidContainerItem
2014-12-13 01:42:52 -08:00
mezz
5c4bd5307c
Fix #365 Fluid pipe connected to farmblock
2014-12-12 01:30:51 -08:00
CovertJaguar
034cdf2860
Intial stages of an cleanup of the inventory code, this commit is very broken.
2014-11-30 17:19:16 -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
cc187d6b8b
Semi-automatic minor cleanup
2014-11-28 18:09:51 -08:00
mezz
878fe51866
Fix up BuildCraft triggers
2014-11-26 23:40:37 -08:00
mezz
efe1236326
Fix #338 Fixed soil detection multifarm trigger
2014-11-26 22:57:06 -08:00
mezz
abe0563550
Fix null biome error for multifarms
2014-11-26 22:25:48 -08:00
mezz
dba8b5448a
Use BiomeGenBase instead of biomeID
2014-11-26 21:13:57 -08:00
mezz
91206dce35
Fix #342 Raintank - wrong biome message in correct biomes
2014-11-26 20:08:12 -08:00
mezz
b6ba59f9f9
Move EnumErrorCode to the API (tick performance)
2014-11-16 20:01:33 -08:00
mezz
f47d349056
Fix #303 : Default Farm Logic disappears with smaller circuits
2014-10-26 21:03:08 -07:00
mezz
d510e121eb
Fix #268 saplings not being picked up by large farms
2014-10-05 05:46:55 -07:00
mezz
46c4c65488
Put harvested farm resources back in the resources slot
2014-10-05 04:29:15 -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
fbaad8bf93
Some tree farm optimizations.
2014-09-23 19:41:24 -07:00
mezz
5fe339093a
Fix #214 : Managed Arboretum does not consume dirt
2014-09-23 14:17:18 -07:00
mezz
95d6f30f22
Fix #185 . Remove [Forestry] user, use owner's permissions
2014-09-18 22:54:45 -07:00
mezz
fe8d55f38f
Created Server-safe method to get EntityPlayer from GameProfile
2014-09-18 22:41:48 -07:00
mezz
6a41a055d1
Updated all tanks to use TankManager.
2014-09-18 19:10:05 -07:00
CovertJaguar
5442b99837
Replace ForestryTank with StandardTank
2014-09-16 17:40:39 -07:00
mezz
a3c562c1b1
Fix #180 dupe bug. Unified checking and removing items from inventories
2014-09-15 23:27:55 -07:00
Parker
8f2d802f11
Reformed Forestry!
...
* Updated for BC 6.0.x compatibility
* Re-implemented the Pipes plugin
* Converted to vanilla assets lang system
* Converted to standard gradle file structure
* General warnings cleanup
2014-08-11 16:56:09 -04:00