Commit Graph
1146 Commits
Author SHA1 Message Date
tterrag1098 a645601803 Merge pull request #1532 from hilburn/master
Cocoa Farmer Improvements
2014-12-30 15:26:20 -05:00
tterrag1098 d993cd4cbf Fix treetaps not being recognized under the new system. 2014-12-30 15:18:15 -05:00
hilburn cfaa3a9a91 CustomSeedFarmer can disable TreeFarmer
Only used for cocoa beans currently but might prove useful - if the seed
item is in that quadrant it won't chop trees even with an axe
2014-12-30 18:56:54 +00:00
hilburn 6dcbe62db2 Fixes the Cocoa Farmer to instantly replant 2014-12-30 17:58:49 +00:00
tterrag1098 619348cb71 Merge pull request #1531 from hilburn/master
Mushroom Farming and fixed some typos
2014-12-30 12:37:30 -05:00
hilburn 4f214be559 Mushroom Farming and fixed some typos
getExperiance made my skin crawl
2014-12-30 17:27:41 +00:00
tterrag1098 89a4015bf4 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2014-12-30 10:44:03 -05:00
tterrag1098 19a5fdac05 Implement interface hack to support both chisel versions 2014-12-30 10:43:53 -05:00
tterrag1098 c0b5e57a14 Merge pull request #1524 from hilburn/master
Ignore Bee Generations
2014-12-30 10:35:38 -05:00
tterrag1098 97bdb5f209 Remove AE2 rv1 support, update API to rv2 2014-12-30 10:22:38 -05:00
hilburn d86b31ce50 Ignore Bee Generations
#1416
if a generation tag exists, discards it before NBT comparison - it's not
exactly pretty but pretty much what Forestry does with it's logic
2014-12-30 03:34:16 +00:00
tterrag1098 e17c938814 Fix obelisk rendering in fast graphics 2014-12-29 20:56:57 -05:00
hilburn 944c924222 Added Cocoa and Mana Beans to Farmer
Added Cocoa Farmer
Added Mana Bean Farmer
Mana bean farm config option to turn off
also fixed some typos
Farmer was merging beans with different aspects because they are only
differentiated by NBT, overwrote getNumCanMerge to fix that in
TileFarmStation as it seems unnecessary in other machines and would
increase overhead for no appreciable gain
2014-12-30 01:12:08 +00:00
tterrag1098 b84620a98c Add percentage tooltip to grinding bar 2014-12-28 17:37:24 -05:00
tterrag1098 ecfe78fc24 Fix grinding ball bar not rendering most of the time 2014-12-28 17:22:58 -05:00
tterrag1098 4a83569eb7 Add buffer recipes 2014-12-28 16:51:17 -05:00
tterrag1098 239163f3d5 Farm tool detection is more extendable and should support all axe types 2014-12-28 02:06:43 -05:00
tterrag1098 1d23599a9e Remove debug spam from solars 2014-12-27 23:13:20 -05:00
tterrag1098 b599663b1d #1506 Fix typo causing items to not be pushed from machines at all 2014-12-27 23:10:10 -05:00
tterrag1098 f6a38b1533 #1445 Cap banks refusing input mode when connected to certain blocks
Also fix rare crash with cap bank packets
2014-12-27 20:44:32 -05:00
tterrag1098 ff4ef4ffd3 #32 Connected Photovoltaic Cells
- Have connected textures similar to cap banks
- Form a cohesive unit that gains and emites power as a whole
2014-12-27 20:42:29 -05:00
Matthias Mann ad9e856307 rewrote CapBankNetwork.setNetwork to use a work list instead of recursion - issue #1454 2014-12-27 21:01:20 +01:00
tterrag1098 e0d160cb65 #1501 Travel Anchor drops in creative 2014-12-27 13:04:52 -05:00
tterrag1098 43b13ae654 Fix capacitor bank bug that caused 2x as much to be pulled.
Fix creative buffer power
2014-12-26 22:15:39 -05:00
tterrag1098 313af94744 Merge branch 'master' into Buffer_Rendering
Conflicts:
	src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java
2014-12-26 21:52:25 -05:00
tterrag1098 eb077f839e #1500 Dupe bug with infernal mobs 2014-12-26 21:41:09 -05:00
tterrag1098 96beafa468 #1456 Allow wireless charger to be disabled with redstone 2014-12-26 21:39:52 -05:00
tterrag1098 5dd479f5e6 #1489 Farming Station attempting to harvest blocks above berry bushes 2014-12-25 13:16:47 -05:00
tterrag1098 04f0dd442b Fix off-by-one in IBlockAccessWrapper 2014-12-25 12:10:37 -05:00
tterrag1098 dd714896b1 #1436 crash when placing painted blocks at y=0
Apparently ChunkCache doesn't sanitize array indeces -.-
2014-12-25 02:32:27 -05:00
tterrag1098 19ef16de32 #1466 Travel Anchor teleporting to one block off when going upwards 2014-12-25 02:06:22 -05:00
tterrag1098 f6e55c91a2 Fix SoulBound enchant not registering when id set to -1
@CrazyPants wat r u doin
2014-12-25 01:45:57 -05:00
tterrag1098 9676e8291e #1451 Keybind in Yeta Wrench tooltip is not dyamic 2014-12-25 01:40:06 -05:00
tterrag1098 b2d9260e09 Remove rendering code 2014-12-19 12:49:49 -05:00
tterrag1098 fb66d0d181 #1450 Capacitor render bug. Fix obelisk block bounds. 2014-12-19 12:36:44 -05:00
tterrag1098 4fda07f8d9 Fix obelisk item rendering being stuttery 2014-12-19 06:56:54 -05:00
tterrag1098 ac7f744163 Add configurable I/O for buffers. Improve GUI. Improve power logic. 2014-12-18 07:51:48 -05:00
tterrag1098 8315a6dfc0 Why do I always do this? Fix unnecessary block udpate spam in KillerJoe 2014-12-18 03:59:53 -05:00
tterrag1098 a82b5601a7 Allow KillerJoe sword to be extracted. Update CoFHAPIProps. 2014-12-18 03:49:31 -05:00
tterrag1098 d4477c6788 Fix not having a clicky noise when you right click a color button 2014-12-18 01:37:54 -05:00
tterrag1098 3add27b550 Add all types of buffer and a lot of clean up to ALL GUIs.
Configurable IO rate still needed
2014-12-18 01:19:10 -05:00
tterrag1098 b4d5a88a75 Merge remote-tracking branch 'origin/master' into Buffer_Rendering
Conflicts:
	src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
2014-12-17 20:27:17 -05:00
tterrag1098 4841edb8d7 Fix farm crashing when IO config is pressed 2014-12-17 18:58:37 -05:00
tterrag1098 b9fd4c1a19 Typo: addCustumRecipes -> addCustomRecipes 2014-12-16 20:08:42 -05:00
tterrag1098 8632fbe3da Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2014-12-16 20:03:56 -05:00
tterrag1098 78b6458fe9 Refactor Vat classes from still to vat package 2014-12-16 20:03:43 -05:00
CrazyPants 131f3c2572 Added IMC support for defining if a block or tile entity should be connected to by insulated redstone conduits 2014-12-16 17:33:10 +08:00
CrazyPants 5e43537ee2 #1413 Added support for Dense Ores in SAG Mill and Alloy Furnace 2014-12-16 17:13:41 +08:00
tterrag1098 a8d734ddbb Add IRedstoneConnectable to API to allow forced rs conduit connections 2014-12-16 03:50:19 -05:00
tterrag1098 0431da3c4d Undo changes to CubeRenderer 2014-12-16 03:17:12 -05:00