Aidan Brady
|
cd80bfc6cd
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 19:08:58 -05:00 |
|
|
Aidan Brady
|
b78b1dc850
|
EnergyNetwork distribution merge/split complete, will do fluid and gas stuff tomorrow
|
2013-12-16 19:08:52 -05:00 |
|
Ben Spiers
|
01818d4e26
|
Fix up the redstone switching/cover blocking support a bit.
|
2013-12-16 23:55:42 +00:00 |
|
|
Aidan Brady
|
7730649ab3
|
Pushing this before I forget - lots of printlns!
|
2013-12-16 18:39:58 -05:00 |
|
|
Aidan Brady
|
bdf4efecda
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 17:54:32 -05:00 |
|
|
Aidan Brady
|
6598295e3e
|
Work on Universal Cable split logistics, I think I got this @unpairedbracket
|
2013-12-16 17:54:27 -05:00 |
|
|
Ben Spiers
|
b0e2401b06
|
Fix a StackOverflow
|
2013-12-16 21:34:02 +00:00 |
|
|
Aidan C. Brady
|
5272d169c4
|
Fixed a few bugs in the split() method and added in some new functionality for splitting of energy/fluid/gas! Unpairedbracket, shouldn't hurt you unless you modified split()
|
2013-12-16 15:00:57 -05:00 |
|
|
Aidan C. Brady
|
869660d8bf
|
Glowstone armor now glows
|
2013-12-16 12:21:49 -05:00 |
|
|
Aidan C. Brady
|
00b666a779
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 11:16:17 -05:00 |
|
|
Aidan C. Brady
|
a93d51a4a1
|
Added a handy double split tool to ListUtils, may be useful to you in network splitting @unpairedbracket; takes in a double, divides it into a defined amount of segments, giving the top element the remains
|
2013-12-16 11:16:10 -05:00 |
|
|
Ben Spiers
|
ab6da7571d
|
Improve the FluidNetwork's reporting of stored/flowing fluid a bit
|
2013-12-16 15:57:04 +00:00 |
|
|
Ben Spiers
|
79e8b36a4b
|
Fix a few crashes
|
2013-12-16 15:57:03 +00:00 |
|
|
Ben Spiers
|
c7a22b7cfd
|
Oops
|
2013-12-16 15:57:03 +00:00 |
|
|
Aidan C. Brady
|
646b22f5b5
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
Conflicts:
common/mekanism/common/multipart/PartTransmitter.java
|
2013-12-16 09:56:01 -05:00 |
|
|
Aidan C. Brady
|
4ff79409f6
|
Work on saving and loading of transmitter caches
|
2013-12-16 09:51:07 -05:00 |
|
|
Ben Spiers
|
1534d1cb14
|
Make a start on Multipart Transporters.
|
2013-12-16 14:00:43 +00:00 |
|
|
Aidan C. Brady
|
8de6b8754f
|
Remove parts of UE prefab that are unneeded
|
2013-12-16 07:31:34 -05:00 |
|
|
Aidan C. Brady
|
4aa91b13ee
|
Killed off CalclaviaLib
|
2013-12-16 07:28:55 -05:00 |
|
|
Aidan C. Brady
|
c44b63fa3a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 07:23:39 -05:00 |
|
|
Aidan C. Brady
|
3741488322
|
Hopefully fix CME
|
2013-12-16 07:23:33 -05:00 |
|
|
Aidan Brady
|
834abd46fe
|
Fix a few bugs
|
2013-12-16 07:03:47 -05:00 |
|
|
Aidan Brady
|
389f3cd988
|
Merge branch 'master' into development
Conflicts:
common/mekanism/common/tileentity/TileEntityChemicalFormulator.java
|
2013-12-15 23:22:39 -05:00 |
|
|
Aidan Brady
|
98c56904e1
|
Merge “Fix crash”
|
2013-12-15 23:15:01 -05:00 |
|
|
Aidan Brady
|
50b98674ed
|
Fix crashes
|
2013-12-15 23:01:36 -05:00 |
|
|
Aidan Brady
|
2404e7416a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-15 19:08:16 -05:00 |
|
|
Aidan Brady
|
8b0d18e469
|
Tiny cleanup
|
2013-12-15 19:08:13 -05:00 |
|
|
Aidan C. Brady
|
37a1a0ab40
|
Jetpack and gas mask practically done :)
|
2013-12-15 18:54:43 -05:00 |
|
|
Aidan Brady
|
d21ef524a0
|
Work on jetpacks/scuba stuff
|
2013-12-15 16:07:30 -05:00 |
|
|
Aidan Brady
|
8057d605a1
|
Merge branch 'master' into development
|
2013-12-15 14:19:57 -05:00 |
|
|
Aidan Brady
|
53a5b515f0
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-15 14:19:25 -05:00 |
|
|
Aidan Brady
|
5cd968f09c
|
Fixed bin bug
|
2013-12-15 14:19:16 -05:00 |
|
|
Aidan
|
f893d3f317
|
Update README.md
|
2013-12-15 14:17:03 -05:00 |
|
|
Aidan
|
953d4851fe
|
Merge pull request #705 from crafteverywhere/patch-2
Update zh_CN.lang
|
2013-12-15 10:49:01 -08:00 |
|
crafteverywhere
|
f673244293
|
Update zh_CN.lang
|
2013-12-15 20:19:09 +08:00 |
|
|
Aidan Brady
|
a6887eb813
|
Fixed tank crash
|
2013-12-15 00:43:47 -05:00 |
|
|
Aidan Brady
|
945aff6986
|
Fixed gas/fluid transfer
|
2013-12-15 00:03:45 -05:00 |
|
|
Aidan Brady
|
f6043b6a62
|
Fixed miner issues
|
2013-12-14 23:45:51 -05:00 |
|
|
Aidan C. Brady
|
0414b0af99
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-14 22:54:32 -05:00 |
|
|
Aidan Brady
|
907bd10b0f
|
Merge branch 'master' into development
|
2013-12-14 22:50:48 -05:00 |
|
|
Aidan Brady
|
c73259f092
|
Killed off old TE API, moved PipeUtils to proper loc
|
2013-12-14 22:50:37 -05:00 |
|
|
Aidan C. Brady
|
8edd4fcfa7
|
Work on Chemical Infuser/Formulator official implementation (without models yet)
|
2013-12-14 22:29:25 -05:00 |
|
|
Aidan Brady
|
345aecb4db
|
Merge branch 'master' into development
|
2013-12-14 17:58:13 -05:00 |
|
|
Aidan Brady
|
9558c6f6ca
|
Fix GregTech conflict
|
2013-12-14 17:58:01 -05:00 |
|
|
Aidan C. Brady
|
79f77dbdeb
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-14 15:36:16 -05:00 |
|
|
Ben Spiers
|
a92a05a720
|
Make universal cables display power a bit more nicely.
|
2013-12-14 20:33:17 +00:00 |
|
|
Ben Spiers
|
32f113ad77
|
First steps towards more dynamic capacity system to allow for differing capacity of universal cables in the future. Will optimise later.
|
2013-12-14 20:32:32 +00:00 |
|
|
Aidan C. Brady
|
bb8b89b7e7
|
Work on dynamic rendering based on both buffer amount and average transfer
|
2013-12-14 15:30:41 -05:00 |
|
|
Aidan C. Brady
|
1e1eabfd5e
|
Even more localization, fixed a few tiny bugs
|
2013-12-14 15:13:12 -05:00 |
|
|
Aidan C. Brady
|
acdbf1f3cb
|
Core code for Fluid and Gas networks
|
2013-12-14 00:36:52 -05:00 |
|