Ben Spiers
|
e51307d68f
|
Fix merge
|
2014-12-15 17:20:13 +00:00 |
|
Ben Spiers
|
9a47f800f9
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
|
2014-12-15 00:05:39 +00:00 |
|
Ben Spiers
|
7ebcba8528
|
Merge branch 'master' into development
|
2014-12-15 00:03:08 +00:00 |
|
Ben Spiers
|
ee585c05dc
|
Make glowing plastic blocks glow.
|
2014-12-15 00:02:22 +00:00 |
|
Ben Spiers
|
49be30de34
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2014-12-14 19:04:03 +00:00 |
|
Ben Spiers
|
a64cd69535
|
Merge branch 'master' into development
|
2014-12-14 18:17:36 +00:00 |
|
Ben Spiers
|
a91dcc49d4
|
Introduce statistical consumption of gases.
|
2014-12-14 18:10:46 +00:00 |
|
Ben Spiers
|
123ed6c6c5
|
Merge branch 'master' into development
|
2014-12-14 01:54:49 +00:00 |
|
Ben Spiers
|
e98026d78d
|
Fix paxels
|
2014-12-14 01:53:26 +00: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
|
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 |
|
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
|
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 |
|
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 |
|
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 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
|
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 Brady
|
1b665d99e2
|
Fixed a Portable Tank crash
|
2014-10-26 15:19:00 -04: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 |
|