Ben Spiers
212ae4d429
Merge pull request #1850 from pwestling/fix_transporter_respect_nbt_in_dest_inventory
...
compare stack tags as well as item id
2014-09-24 18:25:35 +01:00
Ben Spiers
ee03cea3f5
Merge pull request #1849 from pwestling/fix_transporter_nbt_serialization
...
read and write entire item stack using PacketHandler in TransporterStack
2014-09-24 18:24:39 +01:00
Porter Westling
93f5c8a797
compare stack tags as well as item id
2014-09-22 15:05:16 -07:00
Porter Westling
f284886d5c
read and write entire item stack using PacketHandler in TransporterStack
2014-09-22 15:02:56 -07:00
Aidan
1523b402b3
Merge pull request #1839 from ViKaleidoscope/patch-1
...
Update zh_CN.lang
2014-09-19 22:36:16 -04:00
∑( ° △ °|||)
8c9b72ce14
Update zh_CN.lang
2014-09-19 02:12:45 +08:00
Aidan
78c9cfe3f0
Merge pull request #1823 from Mrkwtkr/patch-1
...
Update zh_CN.lang
2014-09-15 12:18:27 -04:00
Aidan
b4d3e59fa5
Merge pull request #1821 from jmongeon/GuiFixes
...
A few GUI fixes
2014-09-15 12:18:11 -04:00
Ben Spiers
930bb22b45
Fix the build failing. No idea what that was caused by but a ForgeGradle update did it.
2014-09-14 00:37:19 +01:00
Ben Spiers
5fefe0068f
Fix saving of Gas Generator Gas Tanks.
2014-09-13 23:22:15 +01:00
Mrkwtkr
4755a1cbcd
Update zh_CN.lang
...
Updated loacalization :)
2014-09-14 00:04:02 +08:00
jmongeon
b1105fb0b0
Add energy info widget to Pressurized Reaction Chamber.
2014-09-12 04:50:49 -04:00
jmongeon
6b456fba9a
Add missing energy gauge tooltip to Chemical Infuser and Chemical Oxidizer.
2014-09-12 04:38:11 -04:00
jmongeon
b558b5b6d7
Fix energy gauge in Rotary Condensentrator GUI always appearing empty.
2014-09-12 02:37:21 -04:00
jmongeon
fb9ec04ef0
Add missing energy info tab Rotary Condensentrator Gui.
2014-09-12 02:31:34 -04:00
Ben Spiers
372705a448
Make energy upgrades affect fuel usage
2014-09-12 02:06:40 +01:00
Aidan C. Brady
c512d72b06
Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes.
2014-09-12 01:54:14 +01:00
Ben Spiers
83d9ecaf23
Mouse button binding fixed
...
Also, make the extra info in tooltips use the sneak keybind.
2014-09-11 04:05:45 +01:00
Ben Spiers
2326048750
Merge branch 'development'
2014-09-07 00:27:45 +01:00
Ben Spiers
c178f471f4
Cherry pick: Fix not sending tile updates
...
Conflicts:
src/main/java/mekanism/common/multipart/PartSidedPipe.java
2014-09-07 00:26:03 +01:00
Ben Spiers
3418438d6c
Update version to 7.1.1 due to Configurator ehancements.
2014-09-05 16:56:45 +01:00
Ben Spiers
9d1dcdfc72
Merge branch 'development'
2014-09-05 16:48:41 +01:00
Ben Spiers
d78e16e954
Try and fix the mouse binding issue.
2014-09-03 19:51:50 +01:00
Ben Spiers
cb1a40a137
Try and fix the mouse binding issue.
2014-09-03 19:25:29 +01:00
Ben Spiers
999fe7719f
Continue the attempting to be killing the bug with the fire...
2014-09-01 20:19:19 +01:00
Ben Spiers
7aa2617a96
Continue the attempting to be killing the bug with the fire...
2014-09-01 20:17:55 +01:00
Ben Spiers
26cf0ee925
Merge branch 'master' into development
2014-09-01 04:06:47 +01:00
Ben Spiers
6ffb64b740
KILL #1759 THE IMPOSSIBLE BUG KILL KILL
2014-08-31 20:30:41 +01:00
Ben Spiers
3462126f3b
Oops. Missed a loop with direct emission to BC.
2014-08-30 03:55:46 +01:00
Ben Spiers
87a692a325
Fix Sorter facing calculation.
2014-08-30 03:55:46 +01:00
Ben Spiers
a8d04828ea
Clean up some stuff using ForgeDirection's rotation matrix.
2014-08-30 03:55:46 +01:00
Ben Spiers
c71c5d9fe7
Fix integer conversion
2014-08-29 03:14:00 +01:00
Ben Spiers
9294719ab2
Cleanup
...
Remove unused vars, add @Overrides, update deprecated methods.
2014-08-28 20:07:51 +01:00
Ben Spiers
e3fc694532
Fix Gas Generator item gas tank restoration.
2014-08-28 20:00:56 +01:00
Ben Spiers
e16a39912e
Configurator Overhaul. Modes now more accurately descriptive.
...
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
2014-08-28 19:59:50 +01:00
Ben Spiers
39509fc133
Fix I goofed.
2014-08-28 03:13:11 +01:00
Ben Spiers
dd3ae67750
Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed.
2014-08-28 03:12:58 +01:00
Ben Spiers
40c06f1004
Fix secondary energy consumption with speed upgrades.
...
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
2014-08-27 02:17:45 +01:00
Aidan C. Brady
6714034771
Fixed RedstoneArsenal dependency
2014-08-24 16:32:20 -04:00
Aidan C. Brady
c364496212
Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null
2014-08-24 09:46:38 -04:00
Aidan C. Brady
bbef6aa2b9
A couple crash fixes
2014-08-23 11:07:03 -04:00
Aidan C. Brady
a0622523d1
Added check for 7.0-7.1 Bin crashes
2014-08-20 14:38:11 -04:00
Aidan C. Brady
333fcd8ef1
Added a check to prevent null world calls
2014-08-20 14:35:19 -04:00
Aidan C. Brady
baae072601
Merged the updateCapacity() fix to development
2014-08-20 14:07:54 -04:00
Aidan C. Brady
8c58a9eaed
Fixed crash related to OreDictCache
2014-08-19 19:06:50 -04:00
Ben Spiers
6316ec5fd5
Fix the network fix (doEmit was always being called with tryAgain false).
2014-08-19 16:42:38 +01:00
Aidan C. Brady
a8993cb223
Only break Logistical Sorter algorithm when items are actually sent
2014-08-19 08:35:43 -04:00
Ben Spiers
a9191fad32
Fix Dissolution Chamber upgrades.
...
Closes #1690
2014-08-16 17:22:07 +01:00
Ben Spiers
db3c7863fe
Cherry-pick:
...
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
Conflicts:
src/main/java/mekanism/common/CommonProxy.java
2014-08-15 03:39:16 +01:00
Ben Spiers
7813fad1ab
Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused.
2014-08-14 23:30:27 +01:00
