tterrag1098
eec706b465
Merge pull request #1571 from MatthiasMann/master
...
fixed connected textures between conduit facade and fuzed quartz
2015-01-04 18:18:00 -05:00
Matthias Mann
eee6e98c52
allow to configure XP juice ID, take value from OpenBlocks' config if possible
2015-01-05 00:14:10 +01:00
hilburn
76a13f3df3
Farm Station respects Tinker's Tools
...
Also fixed an edge case where crops could be inserted into the tool slot
on the tick that the tool broke
2015-01-04 19:05:42 +00:00
Matthias Mann
da6daab14c
prevent crash when XP juice could not be found
2015-01-04 13:28:30 +01:00
Matthias Mann
74742841fe
make stacking of capbanks easier by remove NONE entries from facesMode map so that the NBT format is normalized
2015-01-04 02:42:03 +01:00
Matthias Mann
41fd6dffec
fixed connected textures between conduit facade and fuzed quartz
2015-01-04 01:12:01 +01:00
hilburn
a481704215
Derp
2015-01-03 03:48:17 +00:00
hilburn
3b2d96924a
added a null check to stop a crash
2015-01-03 03:21:43 +00:00
hilburn
0286245a5e
Added config. Line of Sight req for Killer Joe
...
checks front face and adjacent 2 sides for line of sight to target
before attacking
also ignores players in creative mode because that was just a waste of
nutrient
2015-01-03 03:20:57 +00:00
hilburn
6c20739578
Farming Station accepts wooden axe
...
for #1561
Wood is tool level 0, non-axes are <0
2015-01-03 01:41:05 +00:00
tterrag1098
c4d623c9e0
#1548 Wireless charger redstone control does not affect wireless lights
2015-01-02 16:43:39 -05:00
tterrag1098
f7ff5e6328
Fix conduits breaking near instantly with picks
2015-01-02 14:01:12 -05:00
tterrag1098
5ed46705df
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git
2015-01-02 14:00:00 -05:00
tterrag1098
b2e3155fc6
Fix disabled IO mode not being accessible on cap banks for generators
2015-01-02 13:59:50 -05:00
Matthias Mann
3482229a67
added AE2 and ProjectRed hoes to the farm station's white list
2015-01-02 12:44:58 +01:00
Matthias Mann
641d9a3c56
fixed machine name in log message
2015-01-02 12:27:37 +01:00
tterrag1098
9fa3d5d645
Allow dark steel armor to charge other mods' armors
2015-01-02 01:33:59 -05:00
tterrag1098
848fc10d37
#1556 Farm should not allow two of the same type of tool in the inv
2015-01-02 01:19:36 -05:00
tterrag1098
14f30acd8f
#1549 EnderIO blocks should be mined faster with a pick
2015-01-01 17:11:20 -05:00
tterrag1098
93684fc28e
Fix power monitor reading int values where it saved long
2015-01-01 16:39:28 -05:00
hilburn
c4cec0a0ff
Fixes
...
Changes powerInMachines to use long as apparently that can be a thing -
prevents overflow
Fixes some typos
Changes the Set to List
2014-12-31 17:34:40 +00:00
hilburn
e658c41746
Fixes #1538 and minor performance improvements
2014-12-31 10:50:41 +00:00
hilburn
6072a1e56e
Merge remote-tracking branch 'upstream/master'
2014-12-31 10:34:31 +00:00
hilburn
16b546c2b2
Eep config copy-paste fail
2014-12-31 10:16:24 +00:00
tterrag1098
9fc63d98c2
Add farm hoe whitelist
2014-12-30 23:19:16 -05:00
tterrag1098
a738c875a7
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git
2014-12-30 17:48:48 -05:00
tterrag1098
efbbffde76
Add buffer textures
2014-12-30 17:48:40 -05:00
tterrag1098
620e5f3c1d
Merge pull request #1536 from MatthiasMann/master
...
allow SAG-Mill recipes to disable main output bonus per recipe
2014-12-30 17:33:14 -05:00
tterrag1098
4b16659e6c
Fix crash when reservoir placed at y = 0
2014-12-30 17:30:42 -05:00
Matthias Mann
ff0d28df4a
allow SAG-Mill recipes to disable main output bonus per recipe
2014-12-30 23:19:26 +01:00
tterrag1098
a75bcd1855
Fix wrong behavior of berry bush harvester
2014-12-30 16:31:21 -05:00
tterrag1098
8843604edb
Fix fill gauge connecting on creative banks
2014-12-30 16:24:45 -05:00
tterrag1098
a819618a47
Add config for harvesting jungle wood when cocoa exists
2014-12-30 15:29:22 -05:00
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