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

2784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan
8690d36820 Merge pull request #2010 from Riku17777/patch-2 
Update ja_JP.lang
 2014-12-02 10:43:57 -05:00
Riku1777
350ad872e5 Update ja_JP.lang 
miss Fixed and translate added
 2014-12-02 13:34:00 +09:00
Aidan
8d7623aa65 Merge pull request #2007 from Riku17777/patch-1 
Update ja_JP.lang
 2014-12-01 17:43:59 -05:00
Aidan
c31c09b907 Merge pull request #2006 from Mazdallier/patch-1 
Update fr_FR.lang
 2014-12-01 17:43:53 -05:00
Riku1777
d03c419035 Update ja_JP.lang 
I'am japanese.
JP Translate edited
hey
 2014-12-02 04:07:58 +09:00
Yves
3001756562 Update fr_FR.lang 2014-12-01 09:02:36 +01:00
Brian Lewis
681d7e9963 Removed commented out test line 2014-11-28 12:20:29 -06:00
Brian Lewis
15b6f7e70c Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned 2014-11-28 12:13:34 -06:00
Aidan
07827ce356 Merge pull request #1989 from Mr-tanaka3/master 
Create ja_JP.lang
 2014-11-23 13:48:36 -05:00
Mr-tanaka3
8770486d6e Update ja_JP.lang 2014-11-23 16:45:18 +09:00
Mr-tanaka3
82d8a4f39c Create ja_JP.lang 2014-11-23 16:36:49 +09:00
Aidan C. Brady
a94b9a227d Digital Miner delay is now persistent 2014-11-21 08:23:56 -05:00
Aidan C. Brady
db5c2c3d2c Added IToolHammer support 2014-11-21 08:17:47 -05:00
Aidan C. Brady
ec5793dc4d Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes 2014-11-21 08:13:38 -05:00
Ben Spiers
6308bf7e2f Merge branch 'development' into 1.8 2014-11-17 22:49:39 +00:00
Ben Spiers
85e93bbdbb Merge branch 'master' into development 2014-11-17 22:49:11 +00:00
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
Ben Spiers
791ed60bb0 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-17 22:47:08 +00:00
Ben Spiers
5749ed4d2a Merge branch 'master' into development 2014-11-17 22:41:15 +00:00
Ben Spiers
1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers
1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Aidan
9818f2fc85 Merge pull request #1974 from Mazdallier/patch-1 
Update fr_FR.lang
 2014-11-17 10:40:07 -05:00
Yves
05fa56e87f Update fr_FR.lang 2014-11-17 16:31:07 +01:00
Ben Spiers
19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers
7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00
Ben Spiers
11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady
c8db5b8e17 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-16 11:45:32 -05:00
Aidan C. Brady
a699a4b860 Merge branch 'master' into development 2014-11-16 11:45:13 -05:00
Aidan C. Brady
de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00
Aidan C. Brady
e54edcf4cf Another fix attempt 2014-11-16 11:43:08 -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