Commit Graph
1199 Commits
Author SHA1 Message Date
Matthias Mann a60fcea000 cache IO display info in client side network, compute tile entity render bounding box based on IO display info 2015-01-10 13:27:52 +01:00
Matthias Mann f088b20ca8 support rendering of larger IO labels 2015-01-08 16:19:29 +01:00
Matthias Mann 1c253a3d80 #1433 fix crash with Mekanism universal cables 2015-01-08 02:56:51 +01:00
tterrag1098 42464d3097 Merge pull request #1610 from MatthiasMann/item_filter
#1458 Add button to merge inventory content with existing snapshot
2015-01-07 18:52:56 -05:00
Matthias Mann 2fccdaa683 right clicking while sneaking with an existing item filter on an inventory will add the content to the snapshot 2015-01-07 23:23:28 +01:00
Matthias Mann 173821524d #1458 Add button to merge inventory content with existing snapshot 2015-01-07 23:22:44 +01:00
tterrag1098 086c80f79f Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-07 00:40:48 -05:00
tterrag1098 742197ad9b #1607 Fix farm damaging some items incorrectly 2015-01-07 00:40:42 -05:00
Matthias Mann 5087a371b0 drain fluid containers also when the top side is configured for push or disabled 2015-01-07 00:20:31 +01:00
Matthias Mann 91a7b0ce81 show mob health on soul vials 2015-01-06 22:38:39 +01:00
tterrag1098 4c800028fe Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-06 16:11:11 -05:00
tterrag1098 0ca7bf783e #1600 Travel Anchor crashes when repainted with itself 2015-01-06 16:11:04 -05:00
tterrag1098 ff41ead8be Merge pull request #1598 from MatthiasMann/master
added recipes for Lumium and Signalum
2015-01-06 15:11:36 -05:00
tterrag1098 3b3173eb26 Merge pull request #1599 from hilburn/better_conduits
Implement IInventoryConnection on ItemConduits
2015-01-06 15:11:18 -05:00
tterrag1098 c386c08c02 #1595 All buffers show as Item Buffer in WAILA
TODO: fix this for all machines in a less hacky way
2015-01-06 15:10:21 -05:00
hilburn e3e707bd0a Implement IInventoryConnection on ItemConduits
much better than the old way
2015-01-06 18:21:58 +00:00
Matthias Mann 1946735a99 show mob name on soul vials, allow naming of soul vials, show moo fluid name in tooltip, add soul bound enchanment description 2015-01-06 17:06:28 +01:00
Matthias Mann 791bcf0271 fixed other potential crashes when the XP juice could not be found 2015-01-05 01:12:16 +01:00
tterrag1098 c22f9f4837 Merge pull request #1579 from Vexatos/patch-1
Made Power Monitor Engine control accessible
2015-01-04 18:18:24 -05:00
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
Vexatos ecccd563ab Made Engine control accessible
Required for asiekierka/Computronics#99
2015-01-04 20:41:55 +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