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

579 commits

Author SHA1 Message Date
Ben Spiers
ce390ae426 Reorganise trait registration 2014-11-17 22:48:46 +00:00
Ben Spiers
0a0f67ee81 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:48:46 +00:00
Yves
05fa56e87f Update fr_FR.lang 2014-11-17 16:31:07 +01:00
Ben Spiers
11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady
e54edcf4cf Another fix attempt 2014-11-16 11:43:08 -05:00
Aidan C. Brady
5be57a20d6 Attempt a fix at an API bug 2014-11-16 01:06:00 -05:00
Aidan
64dba94ea8 Merge pull request #1958 from fewizz/patch-3 
Update ru_RU.lang
 2014-11-15 18:06:07 -05:00
Yves
30cf159afd Update fr_FR.lang 2014-11-12 09:59:33 +01:00
fewizz
7f38006c7f Update ru_RU.lang 2014-11-11 17:44:52 +04:00
Ben Spiers
3a805bd948 Fix me being stupid. #1943 2014-11-11 12:51:28 +00:00
Ben Spiers
8f6b24ba67 Stop UniCables claiming to carry MJ 2014-11-11 12:27:03 +00:00
Ben Spiers
0d21d201a9 Only receive RF from sides in NORMAL mode. 2014-11-11 12:25:58 +00:00
Ben Spiers
92f1579bba Make PULL mode actually, and exclusively, pull. 2014-11-11 12:25:10 +00:00
Ben Spiers
5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers
4d1c1285b2 Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-10 21:51:37 +00:00
Yves
775eedbc30 Update fr_FR.lang 2014-10-27 14:17:10 +01:00
Aidan
284a626c43 Merge pull request #1920 from LorenzoDCC/master 
Paxels and item descriptions!
 2014-10-26 15:21:30 -04:00
Aidan
9460aa8307 Merge pull request #1887 from SKCraft/master 
Added NEI usage handler for infusion objects
 2014-10-26 15:19:33 -04:00
Cédric
9a96ad2c16 Update FR language 2014-10-21 16:48:31 +02:00
LorenzoDCC
aef846469e Let there be translated descriptions! 
and paxels (I guess)
If anyone else has a better translation for the Paxel, just do it - I can't think of anything better, though.
 2014-10-20 15:09:23 -02:00
LorenzoDCC
8315c1f7f5 gigi gege 
jojoca
 2014-10-16 20:04:38 -03:00
Tonius
fc83b1b837 Added NEI usage handler for infusion objects 2014-10-05 19:23:53 +02:00
Ben Spiers
92a5929c28 That was not a statement. 2014-10-02 22:16:29 +01:00
Ben Spiers
4f41f5a1df Prevent IC2 double-outputting. 2014-10-02 18:54:30 +01:00
Ben Spiers
f0b7f342b8 ElectricBlocks now output to IC2 properly. 2014-10-02 18:54:30 +01:00
Ben Spiers
3e71622d95 Update IC2 api 2014-10-02 18:54:30 +01:00
Ben Spiers
3c715d906b Shuffle up EnergyNet support a bit. 
Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof.
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
 2014-10-02 18:54:30 +01:00
Ben Spiers
b25d8f673b Only use the EnergyNet-related interfaces if IC2 itself is loaded. 
Also add some extra safety to useIC2().
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-10-02 18:54:30 +01: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
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