Commit Graph
1779 Commits
Author SHA1 Message Date
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
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
mezz 398a26598c Fix FluidFuelRegister addFuel from NBT 2015-05-31 13:36:22 -07: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 37489cf398 Merge pull request #2502 from MatthiasMann/canInsertItem_optimization
optimize canInsertItem
2015-05-27 01:44:33 -04: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
HenryLoenwind 6e36a7e7df Fix: Magnet shouldn't pickup things while the player is dead 2015-05-25 13:59:57 +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
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
Matthias Mann b9b20ddbc4 prevent the side IO mode from being toggled for the inventory panel 2015-05-23 21:15:22 +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 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
CrazyPants 8af8274155 Merge pull request #2482 from MatthiasMann/dark_glass
#2479 Dark Glass
2015-05-21 22:28:56 +08:00
tterrag1098 13122027a6 Use getters for collision/selection on inv panel to stop getting stuck 2015-05-20 16:23:01 -04:00
tterrag1098 789fa1f345 Centralize config sync packet, sync telepad lock configs 2015-05-18 20:57:36 -04:00
tterrag1098 a9c73b70d4 Improve telepad power usage curve and add configs for values 2015-05-18 20:45:16 -04:00
HenryLoenwind 5fb6d4bcdb Replace Conduits 2015-05-18 23:17:34 +02:00
tterrag1098 6215e39410 Fix machine active state blinking in between successive tasks 2015-05-18 15:16:05 -04:00
Matthias Mann ea29bc87ba also clear requestedItems when clientItems is cleared 2015-05-18 09:02:39 +02:00
Matthias Mann 976c969861 allow shift clicking item conduit upgrades (filters, speed, etc) 2015-05-17 21:39:14 +02:00
Matthias Mann 018d9b63d9 #2479 Dark Glass 2015-05-17 08:47:09 +02:00
Matthias Mann f607a06656 remember filter and sort mode, show item count in tooltip for large stacks, fix NEI overlapping with GUI 2015-05-16 11:56:30 +02:00
Matthias Mann 2dd9090220 allow placing the inventory panels on all sides 2015-05-16 09:05:57 +02:00
tterrag1098 26cbc4edee Fix adding gas conduit recipe even when it is disabled 2015-05-15 12:00:33 -04:00
tterrag1098 a70b4805d0 Fix not calling AbstractItemConduit.init() corrupting the item's state 2015-05-15 11:55:57 -04:00
tterrag1098 b9bfbb64c8 Fix gas conduit item not disabling, fix loading NBT of disabled conduits 2015-05-15 11:54:34 -04:00
tterrag1098 efb13d1923 Fix telepad rendering with breaking animation 2015-05-13 14:34:31 -04:00
tterrag1098 72bf5832e0 Add tooltip to telepad, add coord selector recipe 2015-05-13 14:05:34 -04:00
tterrag1098 ed8845db87 Use .chatString() when displaying block coords in item conduit printout 2015-05-10 23:27:40 -04:00
tterrag1098 1735fb59c8 #2453 Fix compat with newer forge versions in reservoir 2015-05-10 04:05:19 -04:00