Commit Graph
3061 Commits
Author SHA1 Message Date
tterrag1098 dedd877af7 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-06-12 19:06:10 -04:00
tterrag1098 4fa83c1114 #1668 Fix attractor obelisk behavior with endermen 2015-06-12 19:06:02 -04:00
MatthiasMann 4f95be7677 Merge pull request #2576 from MatthiasMann/invpanel_storagedrawers_api
add Storage Drawer API support for the Inventory Panel
2015-06-12 22:19:05 +02:00
Matthias Mann b04213e165 add Storage Drawer API support for the Inventory Panel 2015-06-12 22:14:31 +02:00
tterrag1098 d98be8dd86 Massive recipe cleanup, everything should use oredict properly now 2015-06-12 14:35:12 -04:00
tterrag1098 70080d9acf Fix power monitor automatically focusing on an invisible text box 2015-06-12 11:56:07 -04:00
tterrag1098 631af51f58 Third time's the charm, even better fix for #2557 2015-06-12 11:46:23 -04:00
tterrag1098 19134e706d #2542 Fix painter source slot positioning 2015-06-12 11:35:06 -04:00
tterrag1098 e6e9071053 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-06-12 11:21:04 -04:00
tterrag1098 69c39c3bb9 Better fix for tooltip issues (#2557) 2015-06-12 11:20:51 -04:00
tterrag1098 8345969bdd Revert "#2557 only add the button tooltip to the GUI when the button had been added"
This reverts commit f7b64b8d7f.
2015-06-12 11:05:43 -04:00
tterrag1098 2890a436cb Merge pull request #2540 from tgstyle/master
A bit more cleanup, formatting, and consistency in XMLs.
2015-06-11 22:04:17 -04:00
tterrag1098 b6bd6dffaf Fix enchanter GUI 2015-06-11 21:48:09 -04:00
MatthiasMann 2d9d8dc3e2 Merge pull request #2573 from MatthiasMann/invpanel_db_cleanup
cleanup DB slot tracking
2015-06-11 08:43:55 +02:00
MatthiasMann de818aa41c Merge pull request #2569 from MatthiasMann/issue_2557
#2557 only add the button tooltip to the GUI when the button had been added
2015-06-10 20:57:44 +02:00
Matthias Mann f7b64b8d7f #2557 only add the button tooltip to the GUI when the button had been added 2015-06-10 20:56:58 +02:00
Matthias Mann 57292ff004 cleanup DB slot tracking 2015-06-10 19:16:17 +02:00
tterrag1098 068339925f Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-06-08 02:41:15 -04:00
tterrag1098 34c7f19f3a Update CoFH API, implement IBlockAppearance 2015-06-08 02:41:03 -04:00
MatthiasMann 885ae6e356 Merge pull request #2554 from MatthiasMann/issue_2552
#2552 prevent endless loops in crafting
2015-06-07 19:05:27 +02:00
Matthias Mann 508e06323c #2552 prevent endless loops in crafting 2015-06-07 19:00:54 +02:00
MatthiasMann b32f3ce06f Merge pull request #2550 from MatthiasMann/conduit_inventory_names
don't crash for unnamed inventories or when the name contains special characters
2015-06-06 22:52:04 +02:00
Matthias Mann 6f5f9651dc don't crash for unnamed inventories or when the name contains special characters 2015-06-06 22:49:38 +02:00
tterrag1098 9aa903f196 Fix farm station GUI y size 2015-06-05 15:53:08 -04:00
tterrag1098 f24bf6b25c This is done in the superclass... 2015-06-04 20:04:33 -04:00
tterrag1098 6d85216bdc #2541 Crafter should post craft event, clean up fake player classes 2015-06-04 20:03:01 -04:00
tgstyle 1f862e7d1a A bit more cleanup, formatting, and consistency in XMLs.
Finishing up all files and fixed a few missed items in others.

Missed a couple items

Squash commits.
2015-06-04 10:03:50 -06:00
tterrag1098 b42ade4226 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-06-02 21:22:27 -04:00
tterrag1098 731bd624d3 Add Farming Station support for B0bGary's Growable Ores
Closes #2412
2015-06-02 21:21:53 -04:00
tterrag1098 ff81a3ed3a Merge pull request #2491 from tgstyle/master
Fixed spelling, some grammar, and a lot of formatting
2015-06-02 20:14:55 -04:00
tgstyle 84343561ae Fixed spelling, some grammer, and a lot of formatting
Formating, spelling changes to be consistent with the SAGMill xml

Formatting, spelling, and grammar to be consistent with other updated xml

Formatting, spelling, and grammar to be consistent with other xml

Update CrusherRecipeManager.java

Spelling, Formatting, grammar, and ignore nuggets on bonus
2015-06-02 16:41:45 -06:00
tterrag1098 39ed643566 Merge pull request #2522 from MatthiasMann/poweredspawner
cleanup of powered spawner, don't show slots in capture mode
2015-06-02 18:03:37 -04:00
Matthias Mann 12c883c6fd cleanup of powered spawner, don't show slots in capture mode 2015-06-02 23:56:33 +02:00
tterrag1098 e1ff548f86 Merge pull request #2486 from HenryLoenwind/replaceConduits
Replace Conduits
2015-06-02 17:04:02 -04:00
tterrag1098 f0e99dcd56 Fix NEI sync always being active 2015-06-02 13:03:56 -04:00
tterrag1098 a145405376 Fix rare class cast exception with conduit sound handling 2015-06-02 00:49:46 -04:00
MatthiasMann a04a300030 Merge pull request #2530 from mezz/master
Fix FluidFuelRegister addFuel from NBT
2015-05-31 22:40:36 +02:00
mezz 398a26598c Fix FluidFuelRegister addFuel from NBT 2015-05-31 13:36:22 -07:00
MatthiasMann 7eb1b94cf3 Merge pull request #2528 from MatthiasMann/sound_clientside_only
add client side annotations to sound event methods
2015-05-31 20:06:23 +02:00
Matthias Mann cf62542ebc add client side annotations to sound event methods 2015-05-31 20:04:02 +02:00
tterrag1098 6a2b75665d Fix NEI sync not being sent to server, clean up packet 2015-05-30 03:40:49 -04:00
tterrag1098 29fd49cc01 Add button to sync inventory panel search field with NEI 2015-05-30 03:34:28 -04:00
tterrag1098 17d18995e9 Vastly improve conduit/facade sounds, facades play painted block sounds
Ref #2510
2015-05-27 18:53:57 -04:00
tterrag1098 129ef251c1 New non-bent capacitor textures 2015-05-27 02:35:25 -04:00
tterrag1098 37489cf398 Merge pull request #2502 from MatthiasMann/canInsertItem_optimization
optimize canInsertItem
2015-05-27 01:44:33 -04:00
MatthiasMann 94a733651a Merge pull request #2508 from HenryLoenwind/magnetDead
Fix: Magnet in Baubles slot shouldn't pickup things while the player is dead
2015-05-25 14:08:42 +02:00
HenryLoenwind 35d2be4f17 Fix: Magnet in Baubles slot shouldn't pickup things while the player is dead
The Magnet should not be in a Baubles slot while the player is dead, but
better safe than sorry...
2015-05-25 14:07:13 +02:00
MatthiasMann a0c3f0db63 Merge pull request #2507 from HenryLoenwind/magnetDead
Fix: Magnet shouldn't pickup things while the player is dead
2015-05-25 14:02:16 +02:00
HenryLoenwind 6e36a7e7df Fix: Magnet shouldn't pickup things while the player is dead 2015-05-25 13:59:57 +02:00
MatthiasMann 2dead576f3 Merge pull request #2503 from MatthiasMann/vat_optimize_progresspackets
optimize sending of progress packets for the Vat
2015-05-24 13:53:46 +02:00