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 |
|
Aidan Brady
|
efc98114e8
|
Core code for new energy framework. Still to do FluidNetwork and GasNetwork.
|
2013-12-13 23:42:27 -05:00 |
|
Aidan Brady
|
926cca0e0a
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-13 23:17:16 -05:00 |
|
Aidan Brady
|
ea57bb5990
|
Fix crash
|
2013-12-13 23:03:20 -05:00 |
|
Aidan
|
74a40ec1b9
|
Merge pull request #698 from Vexatos/patch-2
Update de_DE.lang
|
2013-12-13 15:29:56 -08:00 |
|
Aidan Brady
|
7555fbee7c
|
Update UE
|
2013-12-13 17:15:53 -05:00 |
|
Aidan Brady
|
a05870a2ef
|
A few fixes
|
2013-12-13 17:13:46 -05:00 |
|
Vexatos
|
fc0a611f93
|
Update de_DE.lang
|
2013-12-13 19:50:48 +01:00 |
|
Aidan Brady
|
0a0f3a1779
|
Minor cleanup
|
2013-12-13 07:02:13 -05:00 |
|
Aidan Brady
|
705b2b4528
|
Add TE support to Universal Cables, implemented Mechanical Pipe suck mode
|
2013-12-13 00:16:06 -05:00 |
|
Aidan Brady
|
cb69ff842e
|
Fix bounds on big transmitters
|
2013-12-13 00:01:54 -05:00 |
|
Aidan Brady
|
c85bb7f9cc
|
Add missing renderer
|
2013-12-12 23:36:55 -05:00 |
|
Aidan Brady
|
74d41073a6
|
Fixes, but getting an error for some reason
|
2013-12-12 23:08:16 -05:00 |
|
Aidan Brady
|
a68468b82e
|
Fix merge
|
2013-12-12 22:37:14 -05:00 |
|
Aidan Brady
|
11c7efd8fc
|
Merge branch 'api-change' into multipart-experimental-new
|
2013-12-12 22:36:00 -05:00 |
|
Aidan Brady
|
0e35aca15a
|
Rendering enhancements
|
2013-12-12 22:31:27 -05:00 |
|
Aidan Brady
|
6f99805443
|
Fix crash
|
2013-12-12 22:02:34 -05:00 |
|
Aidan Brady
|
4316103022
|
Fixes
|
2013-12-12 21:35:17 -05:00 |
|
Ben Spiers
|
55dd8f5bf9
|
Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor
|
2013-12-13 01:58:25 +00:00 |
|
Aidan Brady
|
2d5b633168
|
Work on stuff
|
2013-12-12 20:35:37 -05:00 |
|
Aidan Brady
|
11aa04a5df
|
A few charging fixes
|
2013-12-12 19:46:23 -05:00 |
|
Aidan Brady
|
9ecb7c20fd
|
More work on Infuser
|
2013-12-12 19:04:02 -05:00 |
|
Aidan Brady
|
43d3050b40
|
Work on Chemical Infuser
|
2013-12-12 18:33:56 -05:00 |
|
Aidan C. Brady
|
338da4d92c
|
Work on a more intuitive form of accepting gas in items and blocks
|
2013-12-12 16:54:55 -05:00 |
|
Ben Spiers
|
98c8068a0f
|
Get Mechanical Pipe rendering working a bit better.
|
2013-12-12 20:23:03 +00:00 |
|
Aidan C. Brady
|
85a2c981df
|
Fixed Adv Solar Generator config
|
2013-12-12 13:56:00 -05:00 |
|
Aidan Brady
|
31f8566a1f
|
Merge branch 'master' into multipart-experimental-new
Conflicts:
common/mekanism/common/Mekanism.java
|
2013-12-12 08:43:21 -05:00 |
|
Ben Spiers
|
c1318d998b
|
Merge, hopefully without screwing too much up.
|
2013-12-12 01:56:05 +00:00 |
|
Aidan Brady
|
faa127ddd8
|
Add textures for Sulfuric Gas & Sulfuric Acid
|
2013-12-11 20:46:39 -05:00 |
|
Aidan Brady
|
5a241ce8ee
|
Work on GUIs
|
2013-12-11 20:24:37 -05:00 |
|