Commit graph

2136 commits

Author SHA1 Message Date
Aidan 5adc2a80f7 Merge pull request #1883 from TheJulianJES/patch-1
Fix > 3D Bow Bug
2014-10-02 11:14:36 -04:00
TheJulianJES ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
Ben Spiers 5d08726880 Add config options to blacklist the different power systems.
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
2014-09-30 20:40:18 +01:00
Ben Spiers 417b072c66 Hopefully stop corruption hitting gas tanks. 2014-09-30 20:24:04 +01:00
Ben Spiers e7f3204ed7 Fix a tesseract fluid issue. 2014-09-30 20:24:04 +01:00
Aidan f72f462c63 Merge pull request #1860 from jmongeon/Comparator
Add comparator support to the GasTank
2014-09-27 10:22:59 -04:00
Aidan 10ce89d6e8 Merge pull request #1863 from puyo061/patch-2
Update ko_KR.lang
2014-09-27 10:22:37 -04:00
[MMKP]Puyo061 6ff7ece3bc Update ko_KR.lang 2014-09-27 20:23:50 +09:00
jmongeon 5011ea1c70 Add comparator support to the GasTank (#1829). 2014-09-26 20:35:43 -04:00
Aidan f240f907c5 Merge pull request #1858 from puyo061/patch-1
Create ko_KR.lang
2014-09-26 12:50:50 -04:00
[MMKP]Puyo061 6899061276 Create ko_KR.lang 2014-09-26 20:55:22 +09:00
Ben Spiers d31ebf88eb Hopefully fix the Gas Generator issue for good. 2014-09-24 21:53:25 +01:00
Ben Spiers 63101ade28 Merge pull request #1854 from pwestling/add_salination_speed_config
add config for salination plant water transformation per update
2014-09-24 19:22:21 +01:00
Ben Spiers 68f6348c31 Merge pull request #1853 from pwestling/add_dump_excess_to_gas_tank
add "dump excess" option to gas tank
2014-09-24 18:26:48 +01:00
Ben Spiers 0c5fa1bd16 Merge pull request #1852 from pwestling/add_decrement_teleporter_digit
add right click decrement functionality to teleporter digits
2014-09-24 18:25:58 +01:00
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 986e0ac1b4 add config for salination plant water transformation per update 2014-09-24 09:31:47 -07:00
Porter Westling 2cc1b96c38 add "dump excess" option to gas tank 2014-09-23 17:15:41 -07:00
Porter Westling bb12d91f50 add right click decrement functionality to teleporter digits 2014-09-23 12:06:17 -07: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