511 Commits
Author SHA1 Message Date
mezz ac653d46c1 Fix #326 decorative leaves should not pollinate 3.2.0 2014-11-15 04:15:20 -08:00
mezz 63d9935d01 Minor code cleanup 2014-11-15 04:15:14 -08:00
mezz ba695b977d Fix #325 Centrifuge dupe bug 2014-11-15 04:13:46 -08:00
CovertJaguar 6b1dfb1596 Set submodules 2014-11-15 04:12:44 -08:00
CovertJaguar fff02be71d Bump version to 3.2 2014-11-08 21:40:45 -08:00
CovertJaguar 0e5b9e4957 Merge branch 'dev' into release_3.2
Conflicts:
	src/main/resources/assets/forestry/textures/blocks/storage/apatite.png
	src/main/resources/assets/forestry/textures/blocks/storage/bronze.png
	src/main/resources/assets/forestry/textures/blocks/storage/copper.png
	src/main/resources/assets/forestry/textures/blocks/storage/tin.png
2014-11-08 21:39:26 -08:00
mezz d385a25efa Fix Fermenter error state and hasWork 2014-11-06 19:18:33 -08:00
mezz 5f52cf54cb Add icon for "no power" error state 2014-11-06 19:04:07 -08:00
mezz acb85e75ef Add "No Power" error state to multifarm 2014-11-05 23:03:13 -08:00
mezz 220ce0b6a2 Add "No Power" error state to multifarm 2014-11-05 23:00:44 -08:00
mezz 63ec46d830 Close #312, use BuildCraft's IHasWork instead of TriggerHasWork 2014-11-05 22:51:10 -08:00
mezz 06907ae3d4 Fix engineTin constantly switching error states 2014-11-05 22:51:10 -08:00
mezz cb805e3a22 Fix TileAnalyzer's error state checking and display 2014-11-05 22:51:10 -08:00
mezz 393bd691d8 Fix crash from TriggerLowLiquid 2014-11-05 22:51:09 -08:00
mezz 3a5275396b Add "No Power" error state 2014-11-05 22:51:04 -08:00
mezz 7d72a60f9b Make unpowered machines not inherit from TilePowered 2014-11-05 21:50:14 -08:00
mezz 32313cfe6a #309 Convert MJ to RF for BuildCraft plugin 2014-11-04 21:08:13 -08:00
mezz 9f0084c1b7 Optimize NBT species retrieval from ItemStacks 2014-11-03 23:02:08 -08:00
mezz 13d89fc347 Give fireproof genes a name 2014-11-03 21:33:16 -08:00
mezz 8bf9184ba4 Fix #313: Genome NBT errors 2014-11-03 21:32:49 -08:00
mezz 5487aba3a2 Close #287. Add fireproof logs and planks, and recipes 2014-11-03 00:30:19 -08:00
mezz 66a74703f8 #287 Add fireproof gene to trees 2014-11-03 00:28:14 -08:00
mezz c9bd15a20d Close #84. Fix #302. Fix #309. Update BuildCraft API to 6.1.x 2014-11-02 15:00:28 -08:00
mezz 486b7a8f80 Fix low paper trigger message 2014-11-02 15:00:28 -08:00
mezz bc2e27e495 Bump to trigger a build on jenkins (it was down) 2014-11-02 11:26:15 -08:00
mezz e028428a67 Fix Tropical Hive generation 2014-11-01 21:37:11 -07:00
mezz a9b72c85bd Fix #306: Raintank fills in Desert biome 2014-10-29 22:04:21 -07:00
mezz 247cb0b336 #300: Fix leaf tick frequency to match BlockTreeContainer 2014-10-26 23:09:21 -07:00
mezz 50a155aa2a Fix #300: Fruits on leaves do not ripen 2014-10-26 22:20:51 -07:00
mezz f47d349056 Fix #303: Default Farm Logic disappears with smaller circuits 2014-10-26 21:03:08 -07:00
mezz 4c52620f0f use foreach 2014-10-26 21:02:39 -07:00
mezz f4121b0849 Fix Lang submodule 2014-10-26 20:58:55 -07:00
MysteriousAges 3415030fbf Revert "Storage block textures - Apatite, Bronze, Copper, Tin."
This reverts commit c8fd93873a.
2014-10-24 20:18:30 -07:00
MysteriousAges f0dedf56a5 Adding storage blocks for Apatite, Copper, Tin and Bronze. 2014-10-24 20:01:43 -07:00
MysteriousAges 71b0a7bc1d Adding storage block textures. 2014-10-24 18:52:38 -07:00
MysteriousAges c8fd93873a Storage block textures - Apatite, Bronze, Copper, Tin. 2014-10-23 17:42:20 -07:00
mezz d1baa7d69c Fix crash from addon circuits 2014-10-20 22:22:09 -07:00
mezz 8c19ba73cb Change warning about MCPC+ to Cauldron 2014-10-20 20:34:17 -07:00
mezz 7d373ad75b Formatting cleanup in MailAddress 2014-10-17 00:10:36 -07:00
mezz 5960f800e7 Fix #288 The MultiFarm won't place dirt 2014-10-16 22:46:37 -07:00
mezz eb4fcf3267 Exclude old language files from jars 2014-10-12 23:50:15 -07:00
mezz 1f9d4badc3 Losslessly compress all png assets with PNGGauntlet 2014-10-12 23:40:07 -07:00
mezz b60b5c1251 Fix #283 Crash from Disabling Arboriculture 2014-10-11 16:52:10 -07:00
mezz d7dc7a8c69 Re-add deprecated backpack method to stop outdated mods from crashing 2014-10-11 16:37:18 -07:00
mezz 5e9cc9e2b1 Fix #280, crash on viewing the name of research notes from 1.6.4 2014-10-10 00:25:20 -07:00
CovertJaguar 4fcb9cb221 Update README.md 2014-10-08 18:22:09 -07:00
CovertJaguar 1e4db46584 Update README.md 2014-10-08 18:21:42 -07:00
CovertJaguar 5a9d2fd14d Update Lang submodule 3.1.1 2014-10-08 15:54:32 -07:00
CovertJaguar 547719b6df Bump version 2014-10-08 15:46:53 -07:00
CovertJaguar eb102ac7d7 Bump version 2014-10-08 15:46:13 -07:00