CovertJaguar
792ab77a48
More Inventory rewrite stuff.
2014-12-13 18:20:52 -08:00
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
mezz
2242dfdfb9
Cleanup
2014-12-12 00:34:44 -08:00
mezz
e26da52d21
Closes #363 . Ore dictionary support for IC2's Rubberized Electron Tubes
2014-12-11 22:00:03 -08:00
mezz
dbf6202a90
Fix Alveary Swarmer and Swarm Hive
2014-12-09 01:09:10 -08:00
mezz
a300e97aa0
Cleanup MachineFabricator
2014-12-08 22:41:37 -08:00
mezz
76fe2b1c90
cleanup
2014-12-08 22:41:36 -08:00
mezz
099f33549b
Refactor out worktable canCraftRecipe logic to RecipeUtil
2014-12-08 22:41:36 -08:00
MysteriousAges
e281cb4591
Welcoming Miry and Boggy bees! Marshy bees are no longer in a branch all on their lonesome.
2014-12-08 21:42:22 -08:00
MysteriousAges
99f09b4037
Fertile effect should now respect housing territory modifiers.
2014-12-08 21:41:08 -08:00
mezz
23ffb78ab3
Improve null safety of memorized recipe isValid check
2014-12-07 16:23:03 -08:00
mezz
2cb1959421
Add blacklist to worktable memory, blacklist non-empty maps
2014-12-07 16:15:40 -08:00
mezz
7ffb9d5c1d
Fix #362 Missing Analyzer Crafting recipe
2014-12-07 12:45:21 -08:00
mezz
029604222c
Support left click drag on Worktable
2014-12-07 01:46:15 -08:00
mezz
c6f205864f
oops
2014-12-06 23:34:40 -08:00
mezz
4cc318bc1d
Fix crash when crafting with a Map on a Worktable
2014-12-06 23:31:56 -08:00
mezz
c010977a0b
Fix #359 Crafting with a worktable does not trigger achievements.
2014-12-06 23:28:05 -08:00
mezz
54e4aafc0e
Improve bee give command format
2014-12-06 19:54:53 -08:00
mezz
46256bac41
Fix crash from checking Potion.isBadEffect on server
2014-12-06 18:52:32 -08:00
CovertJaguar
4f48cd5890
More progress on inventory rework
2014-12-05 12:43:23 -08:00
CovertJaguar
f3895aeaab
Merge branch 'dev' into inventory-cleanup
2014-12-04 19:09:37 -08:00
mezz
4c6a461425
Partially Revert "Swapping out deprecated method for non-deprecated call."
...
This reverts commit fafee34803
2014-12-04 18:28:39 -08:00
Vexatos
8be4298ca9
Update PluginApiculture.java
2014-12-04 17:54:33 +01:00
MysteriousAges
fafee34803
Swapping out deprecated method for non-deprecated call.
2014-12-04 01:56:43 -08:00
MysteriousAges
4ab3e7ddb4
Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev
2014-12-04 01:37:01 -08:00
MysteriousAges
8ff72af9d2
Farmerly & Agrarian bees. Buzz buzz
2014-12-04 01:13:29 -08:00
mezz
b2d722a4c5
Make Apiarist's Armor protect against potion effects from bees
2014-12-04 00:12:07 -08:00
mezz
475d99eae8
Fix #353 Alveary heater/fan energy consumption, animation
2014-12-03 23:50:39 -08:00
mezz
d0244ece32
Fix biome error in Alveary
2014-12-03 23:50:00 -08:00
mezz
4f95ceab29
Cleanup
2014-12-03 22:45:32 -08:00
mezz
0105f36668
Fix #356 Worktable using the wrong wood with Shift-use all
2014-12-03 21:56:41 -08:00
mezz
ab3ba0c4db
Fix #357 Forestry stained glass not silk touchable
2014-12-03 21:22:21 -08:00
mezz
38009bb32a
Safety check for IC2 Plugin. #351
2014-12-03 20:46:10 -08:00
mezz
d132a0ae62
Cleanup
2014-12-02 23:23:11 -08:00
mezz
d827a0f132
Fix #352 Backpack deletion/duplication bug
2014-12-02 23:22:58 -08:00
mezz
f8a9bf44c3
Suppress unhandled exception warnings
2014-11-30 18:31:42 -08:00
mezz
874a49262d
Cleanup *alyzers
2014-11-30 18:31:05 -08:00
CovertJaguar
3636af5b9c
More work on inventory stuff, and fix all the broken merge stuff
2014-11-30 17:59:31 -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
CovertJaguar
3d765067cf
Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev
...
Conflicts:
src/main/java/forestry/core/utils/BlockUtil.java
2014-11-30 16:50:09 -08:00
mezz
9da092e6d4
Fix #347 Squeezer progress bar interferes with tank display
2014-11-30 16:12:03 -08:00
mezz
0b5a5bc34d
Fix trade stations failing to initialize because of GameProfile check
2014-11-30 15:26:46 -08:00
mezz
c17a6af267
Fix trees growing with wrong wood. relates to #344
2014-11-30 14:44:53 -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
05a7ac6d93
Fix bonemealed pods growing too large
2014-11-29 23:49:42 -08:00
mezz
7f5108f26c
Update for BuildCraft 6.2.1. Fix #348
2014-11-29 19:53:40 -08:00
mezz
be82dd318b
Clean up GuiFlutterlyzer
2014-11-28 18:20:40 -08:00
mezz
ce2930b1ab
Clean up Treealyzer, fix showing secondary fruits
2014-11-28 18:20:03 -08:00
CovertJaguar