Commit Graph
3039 Commits
Author SHA1 Message Date
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
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
Matthias Mann a1de637a21 optimize sending of progress packets for the Vat 2015-05-24 13:53:25 +02:00
Matthias Mann 8b9cd4a05e optimize canInsertItem 2015-05-24 13:39:53 +02:00
MatthiasMann e55d742059 Merge pull request #2501 from MatthiasMann/invpanel_storagearea
return area can be toggled into storage area
2015-05-23 22:23:38 +02:00
Matthias Mann 8f9cca470b return area can be toggled into storage area - should solve client/server desync issues 2015-05-23 22:22:32 +02:00
MatthiasMann 971cd290c8 Merge pull request #2500 from MatthiasMann/invpanel_sidemodes
prevent the side IO mode from being toggled for the inventory panel
2015-05-23 21:16:33 +02:00
Matthias Mann b9b20ddbc4 prevent the side IO mode from being toggled for the inventory panel 2015-05-23 21:15:22 +02:00
MatthiasMann b6cc814767 Merge pull request #2499 from MatthiasMann/invpanel_crafting_update
allow to store crafting recipes in the inventory panel
2015-05-23 19:10:42 +02:00
Matthias Mann dccdd478b6 allow to store crafting recipes in the inventory panel 2015-05-23 19:09:46 +02:00
CrazyPants 674dc78b6d Merge pull request #2496 from MatthiasMann/conduitgui_hide_functionupgrade
only show function upgrade slot when either input or output slots are…
2015-05-23 21:51:19 +08:00
CrazyPants 36db1d4537 Merge pull request #2495 from MatthiasMann/invpanel_shiftclick_desync
try to combat Minecraft's transferStackInSlot desync issue
2015-05-23 21:51:03 +08:00
tterrag1098 e17aecefe2 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-22 16:48:21 -04:00
tterrag1098 979f0727c2 #2493 Coord Selector NBT can be missing causing crashes 2015-05-22 16:47:29 -04:00
Matthias Mann 45c8f891cc only show function upgrade slot when either input or output slots are visible 2015-05-22 20:23:48 +02:00
Matthias Mann 76ce5b98ae try to combat Minecraft's transferStackInSlot desync issue 2015-05-22 20:10:37 +02:00
CrazyPants 74d4b8683d Merge pull request #2176 from HenryLoenwind/crash
Add our take on unsupported mods to the crash report
2015-05-22 10:39:15 +08:00
tterrag1098 bb6b84d255 Improve invpanel bounds math and clean up its code 2015-05-21 14:54:52 -04:00
tterrag1098 1bb1a74a7d Fix horribly broken invpanel block bounds 2015-05-21 14:39:32 -04:00
tterrag1098 4a82b3c747 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-21 13:44:52 -04:00
tterrag1098 0e852e4a94 Fix vat particles to fit new model 2015-05-21 13:44:39 -04:00
CrazyPants 2a8d5367f7 Merge pull request #2253 from eduardog3000/barley
Add Natura Barley to Flour SAG Mill recipe.
2015-05-21 22:38:23 +08:00
CrazyPants dd2fb28b60 Merge pull request #2484 from MatthiasMann/invpanel_keep_lists_in_sync
also clear requestedItems when clientItems is cleared
2015-05-21 22:32:54 +08:00
CrazyPants 8deff082af Merge pull request #2483 from MatthiasMann/itemconduit_shiftclick_upgrades
allow shift clicking item conduit upgrades (filters, speed, etc)
2015-05-21 22:31:34 +08:00