tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
2449 commits 2 branches 0 tags 102 MiB
Commit graph

852 commits

Author SHA1 Message Date
Aidan C. Brady
ed8823b038 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-10-02 12:47:22 -04:00
Aidan C. Brady
65ea389118 Merge branch 'master' into development 2014-10-02 11:22:31 -04:00
Aidan
26dadfe176 Merge pull request #1876 from sk89q/oredictcache-fix 
Fix some performance issues with OreDictCache
 2014-10-02 11:16:47 -04:00
TheJulianJES
ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
sk89q
16fc882da7 Change OreDictCache to hit the hash map one fewer time. 2014-09-30 13:26:34 -07:00
sk89q
125ac34c01 Use object default hashCode in ItemInfo for Item. 
Also change the hashCode() algorithm slightly.
 2014-09-30 13:24:00 -07:00
sk89q
3f6c87d8f5 Fix ItemInfo.equals() not functioning as intended. 2014-09-30 13:24:00 -07: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 C. Brady
c01212aae1 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-09-27 15:23:31 -04:00
Aidan C. Brady
94108d3e37 Made MekGen recipes more OreDict friendly 2014-09-27 15:19:53 -04:00
Aidan C. Brady
9eb9eab91d Added in a fun little silk touch multiplier config 2014-09-27 15:07:55 -04:00
Aidan C. Brady
521f7d7853 Cleanup 2014-09-27 14:44:13 -04:00
Aidan C. Brady
9bf4baab49 Merge branch 'development' into 1.8 (hopefully I didn't miss anything) 
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
 2014-09-27 14:40:25 -04:00
Aidan C. Brady
cde5755ee3 Fixed an import 2014-09-27 14:09:13 -04:00
Aidan
f72f462c63 Merge pull request #1860 from jmongeon/Comparator 
Add comparator support to the GasTank
 2014-09-27 10:22:59 -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
[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
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
∑( ° △ °|||)
8c9b72ce14 Update zh_CN.lang 2014-09-19 02:12:45 +08:00
Ben Spiers
436bb7ad86 Fix PRC GUI 2014-09-16 16:22:01 +01:00
Ben Spiers
71f6d4b8d3 Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
Ben Spiers
c12c54f9bf Make the Laser Amplifier actually satisfactorily functional. 
Redstone controls, minimum and maximum energy thresholds, and time delays all work concurrently, removing the need for distinct modes.
 2014-09-16 02:47:54 +01:00
Ben Spiers
e84f176583 Add pulse mode to redstone control. 
(I am going somewhere with this)
 2014-09-16 02:47:54 +01:00
Aidan C. Brady
999e2de8e6 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/gui/GuiPRC.java
 2014-09-15 12:19:40 -04: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
4ada1ff8b7 Small laser refinements: 
* Allow slightly larger render size.
* Stop breaking blocks *just* at the end of the laser.
* Reduce default range to 64 blocks.
 2014-09-15 03:49:47 +01:00
Ben Spiers
944e288f89 Move block breaking function into LaserManager. 2014-09-15 03:47:59 +01:00
Ben Spiers
44d852ee9b I accidentally a linear autominer. 
Might make a really basic laser redirection block next - none of the refined controls of the Amplifier, none of the collection abilities of the Tractor Beam.
 2014-09-15 02:11:55 +01:00
Ben Spiers
90f2086990 Oops. 2014-09-14 23:04:09 +01:00
Ben Spiers
f7f5e77e8e Remove a couple of unused imports 2014-09-14 23:00:55 +01:00
Ben Spiers
7fd5a28d61 Lasers can dig blocks now. 
They have a tendency to set the items they drop on fire, might make a
digging-specific variant later.
 2014-09-14 22:57:59 +01:00
Ben Spiers
355209d2e3 Fix laser hardness crash 2014-09-14 22:44:45 +01:00
Ben Spiers
b29f2adc4d LASERS 2014-09-14 05:20:16 +01:00
Ben Spiers
1cfaec3692 Fix imports, key handler. 2014-09-14 05:18:35 +01:00
Ben Spiers
1ad8f62627 Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/client/MekanismKeyHandler.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-09-14 01:36:11 +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