CovertJaguar
990d4990db
Fix lang
3.3.0
2014-12-14 21:39:45 -08:00
mezz
ce232e808e
Fix Alveary Swarmer and Swarm Hive
...
(cherry picked from commit 2577ee9c930cdc91bdf3d207cbeaaebbe1141257)
Conflicts:
src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java
2014-12-09 01:08:14 -08:00
mezz
31574a9c6e
Cleanup
...
(cherry picked from commit 4f95ceab29 )
2014-12-09 01:03:05 -08:00
mezz
cd9a4110ee
Refactor out worktable canCraftRecipe logic to RecipeUtil
2014-12-08 20:26:51 -08:00
mezz
6b35ff2ba1
Improve null safety of memorized recipe isValid check
...
(cherry picked from commit 23ffb78ab3 )
2014-12-07 16:25:01 -08:00
mezz
5133e721cc
Add blacklist to worktable memory, blacklist non-empty maps
...
(cherry picked from commit 2cb1959421 )
2014-12-07 16:18:23 -08:00
mezz
09ced92f5b
Support left click drag on Worktable
...
(cherry picked from commit 029604222c )
2014-12-07 16:18:17 -08:00
mezz
12477a7711
Fix crash when crafting with a Map on a Worktable
2014-12-07 16:17:21 -08:00
mezz
b7dc4d9144
Fix #359 Crafting with a worktable does not trigger achievements.
...
(cherry picked from commit c010977a0b )
2014-12-07 16:16:24 -08:00
mezz
da48d317ff
Fix #362 Missing Analyzer Crafting recipe
...
(cherry picked from commit 7ffb9d5c1d )
2014-12-07 15:32:02 -08:00
mezz
5bfb11e952
Fix #353 Alveary heater/fan energy consumption, animation
...
(cherry picked from commit 475d99eae8 )
2014-12-07 15:30:30 -08:00
mezz
4dffb9f352
Fix biome error in Alveary
...
(cherry picked from commit d0244ece32 )
2014-12-07 15:30:20 -08:00
mezz
beadb47539
Fix #356 Worktable using the wrong wood with Shift-use all
...
(cherry picked from commit 0105f36668 )
2014-12-07 15:30:08 -08:00
mezz
6301d3c193
Fix #357 Forestry stained glass not silk touchable
...
(cherry picked from commit ab3ba0c4db )
2014-12-07 15:30:02 -08:00
mezz
883863e047
Safety check for IC2 Plugin. #351
...
(cherry picked from commit 38009bb32a )
2014-12-07 15:29:42 -08:00
mezz
2c14f02151
Fix #352 Backpack deletion/duplication bug
...
(cherry picked from commit d827a0f132 )
2014-12-07 15:29:07 -08:00
CovertJaguar
00771b1a42
Bump version
2014-11-30 17:22:40 -08:00
CovertJaguar
46ec2f2740
Merge branch 'dev' into release_3.3
2014-11-30 17:21:03 -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
mezz
cc187d6b8b
Semi-automatic minor cleanup
2014-11-28 18:09:51 -08:00
mezz
1d2c4e438d
cleanup BlockBeehives
2014-11-28 17:49:08 -08:00
mezz
be0a62b831
Fix use of GameProfile.equals()
2014-11-28 16:58:53 -08:00
mezz
8b37aa86ff
Fix #346 . Legacy crash from old Apiarist chest
2014-11-28 16:52:51 -08:00
mezz
9d70a1b0ec
Cleanup imports
2014-11-28 16:47:18 -08:00
CovertJaguar
6ea4ab4491
Clean up Engines a bit.
...
Remove ISpecialInventory implementations on Engines.
Change Engines to IEnergyConnection instead of IEnergyHandler.
2014-11-28 10:36:13 -08:00
CovertJaguar
10a5ba3eb8
Update lang
2014-11-28 10:34:52 -08:00
CovertJaguar
8ce7e49d5f
Update dependencies
2014-11-28 10:03:11 -08:00
mezz
34c1956cc1
Fix #345 Pipette not depositing liquid
2014-11-27 23:00:39 -08:00
mezz
cfbde3eb83
Minor tree cleanup
2014-11-27 11:42:10 -08:00
mezz
328b9e8356
Fix #344 Teak Trees have Lime wood
2014-11-27 11:41:41 -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
14b34e0b01
Fix #343 AbstractMethodError from Command's getRequiredPermissionLevel()
2014-11-26 21:34:56 -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
6cdafc05de
Fix enum type in ContainerCatalogue
2014-11-22 01:38:48 -08:00
mezz
00924ccd68
Fix checking for fuels
2014-11-22 01:38:43 -08:00
mezz
e251d28893
Fix operator precedence error with sending UUIDs
2014-11-22 01:32:27 -08:00
mezz
0ec13d6966
Cleanup: typo variables
2014-11-22 01:31:19 -08:00
mezz
07ba130dc6
Fix #336 . infinite loop on server when bee housing is full
2014-11-21 22:00:46 -08:00
mezz
6927c4d5fb
Add wildcard for OreDictionary where appropriate
2014-11-20 19:10:10 -08:00