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

2504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan C. Brady
de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00
Aidan C. Brady
53b5a25558 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-16 01:08:08 -05:00
Aidan C. Brady
ebb23fbfea Merge branch 'master' into development 2014-11-16 01:06:44 -05:00
Aidan C. Brady
5be57a20d6 Attempt a fix at an API bug 2014-11-16 01:06:00 -05:00
Aidan C. Brady
1b159d3242 Another cleanup 2014-11-16 01:00:41 -05:00
Aidan C. Brady
607eb31316 A few minor cleanups 2014-11-15 18:46:11 -05:00
Aidan C. Brady
5fd1217837 Merge branch 'development' into 1.8 2014-11-15 18:20:51 -05:00
Aidan C. Brady
d4ee103839 Merge branch 'master' into development 2014-11-15 18:20:40 -05:00
Aidan
64dba94ea8 Merge pull request #1958 from fewizz/patch-3 
Update ru_RU.lang
 2014-11-15 18:06:07 -05:00
Aidan
d2030a74e3 Merge pull request #1963 from Mazdallier/patch-2 
Update fr_FR.lang
 2014-11-15 18:05:54 -05:00
Aidan C. Brady
e6838c613c Fixed up BC API 2014-11-15 18:02:35 -05:00
Ben Spiers
2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +00:00
Ben Spiers
c5e8c866ce Fix me being stupid. #1943 2014-11-13 19:46:41 +00:00
Ben Spiers
6872279a0e Stop UniCables claiming to carry MJ 2014-11-13 19:46:21 +00:00
Ben Spiers
ece8c6eb08 Only receive RF from sides in NORMAL mode. 
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
 2014-11-13 19:45:58 +00:00
Ben Spiers
224d778155 Make PULL mode actually, and exclusively, pull. 
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
 2014-11-13 19:43:05 +00:00
Ben Spiers
b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC 
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
 2014-11-13 19:30:39 +00:00
Aidan C. Brady
21dc5253a4 Failed merge, retrying 2014-11-13 09:36:48 -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
64d0f8a5cc Merge branch 'master' into development 2014-11-11 12:52:27 +00:00
Ben Spiers
3a805bd948 Fix me being stupid. #1943 2014-11-11 12:51:28 +00:00
Ben Spiers
a0c492862f Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-11-11 12:37:57 +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
Aidan C. Brady
3abf36ef14 Fixes to config GUI, added new localization 2014-11-07 12:52:45 -05:00
Aidan C. Brady
3cfc21cc94 Merge branch 'development' into 1.8 2014-10-27 09:48:54 -04:00
Aidan C. Brady
51cccfafa1 Merge branch 'master' into development 2014-10-27 09:48:29 -04:00
Aidan
e2e3e1017f Merge pull request #1932 from Mazdallier/patch-1 
Update fr_FR.lang
 2014-10-27 09:45:08 -04:00
Yves
775eedbc30 Update fr_FR.lang 2014-10-27 14:17:10 +01:00
Aidan Brady
0cccaaa415 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-10-26 15:28:28 -04:00
Aidan Brady
920a70d0c8 Merge branch 'master' into development 2014-10-26 15:21:47 -04:00
Aidan
284a626c43 Merge pull request #1920 from LorenzoDCC/master 
Paxels and item descriptions!
 2014-10-26 15:21:30 -04:00
Aidan Brady
aa103e28da Minor cleanup 2014-10-26 15:20:52 -04:00
Aidan Brady
c1f5b65cf5 Merge branch 'master' into development 2014-10-26 15:20:10 -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
Aidan Brady
1ef406ef2e Merge branch 'master' into development 2014-10-26 15:19:13 -04:00
Aidan Brady
1b665d99e2 Fixed a Portable Tank crash 2014-10-26 15:19:00 -04:00
Aidan
6130c1aad9 Merge pull request #1923 from cedced19/patch-1 
Update FR language
 2014-10-26 15:15:31 -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
Aidan C. Brady
10107678d1 Fixed strange glow panel issue 2014-10-17 12:03:42 -04:00
Aidan C. Brady
60bf7f5f3d Merge branch 'development' into 1.8 (gosh darn conflicts) 
Conflicts:
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/energy/NodeStats.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-10-17 12:00:39 -04:00
Aidan C. Brady
d0a62c564e Merge branch 'master' into development 2014-10-17 11:48:02 -04: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