584782ec6e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-02 01:44:48 -05:00
10939b6001
RF Now only inserts up to the overflow.
2014-06-02 01:33:16 -05:00
900a278ec2
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
core/localization/GuiText.java
2014-05-31 20:58:52 -05:00
8183becfd4
Paint Balls.
2014-05-31 20:50:56 -05:00
b872ae66c3
Fixed http://ae2.ae-mod.info/Tracker/0475/
2014-05-29 11:41:29 -05:00
7b33635c47
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 11:07:18 -05:00
4cf6f4e5f9
Don't Show Energy Cell info if the NBT Came from the client.
2014-05-25 11:06:59 -05:00
bd7b154455
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 00:03:27 -05:00
baefedc4b8
ME Chest can have its drive removed via automation via the front slot.
2014-05-24 23:49:24 -05:00
a861f09b01
ME Chest insertion behavior fixed.
...
ME Chest drive slot now properly accessible from front drive face.
ME Chests can now function as tanks. ( fluid cells from extra cells )
ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. )
Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18
2014-05-24 18:25:22 -05:00
a3264d03e2
Crafting CPUs now appear offline unless hey have their channel requirement met.
...
Also their status shows in waila.
2014-05-22 21:43:15 -05:00
68993534d9
Slowly working towards crafting.
...
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
client/gui/widgets/GuiImgButton.java
core/localization/ButtonToolTips.java
2014-05-18 20:05:03 -05:00
b15d3af12b
Crafting CPU basics.
2014-05-17 22:19:23 -05:00
cfeebae5ac
First pass at trying to make a CPU render - is basically a multiblock heat vent at this point.
2014-05-15 09:34:38 -05:00
6a8fafa58d
Working Towards Crafing CPU MultiBlock
2014-05-13 21:42:14 -05:00
25a588f303
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
container/AEBaseContainer.java
core/sync/AppEngPacketHandlerBase.java
2014-05-13 19:25:07 -05:00
14b7fe8a42
Add better custom security features.
2014-05-12 23:15:46 -05:00
45c292344f
Fixed Dormant Chunk Cache.
2014-05-12 21:15:45 -05:00
be645f3e2f
MJ 6 + MJ 5 Integration.
2014-05-11 16:13:37 -05:00
ce561ffbe3
Merge in Builder support.
2014-05-11 13:48:14 -05:00
34048d45a2
Don't erase inventory when someone asks for the drops...
2014-05-11 13:30:36 -05:00
d84ec9c0bf
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-10 17:19:26 -05:00
08d6942643
Added all the crafting cpu "blocks" - needs textures and renders.
...
Updated API
2014-05-10 00:00:02 -05:00
3491fe4e33
Did what I could with mj6
2014-05-09 21:08:56 -05:00
98fc460da0
Removed Old RF Api.
2014-05-09 09:42:52 -05:00
f031972fcd
Started working on crafting infrastructure and C-Cpus
2014-05-08 23:10:12 -05:00
b0aedc1b01
MAC Now shows progress.
2014-05-08 23:09:42 -05:00
6532af979d
Molecular Assembler Single Pattern Mode "works"
2014-05-08 00:58:43 -05:00
b4e8dada38
Crafting progress might be a thing.
2014-05-07 19:59:05 -05:00
3351af3d4e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/materials/MaterialType.java
util/Platform.java
2014-05-06 20:45:38 -05:00
5bf8e9d7d0
Updated RF Api ( should work for old api too - at least temporary ).
2014-05-06 18:09:31 -05:00
3080510317
Major Update for Cable Rendering.
...
TESRs will are no longer used if the tile contains no dynamic renders.
Added alpha pass rendering for stained glass.
Enabled Stained Glass facades.
Cables / Facades have less geometry by hiding faces on connected boxes.
Added AlphaPass Option to disable AlphaPass Cables rendering ( fixes crash with Immbis Microblocks. )
2014-05-04 19:51:05 -05:00
9c5c92401b
Lower Cable TESR Distance to 30.0f
2014-05-04 17:53:32 -05:00
3c510b6925
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
core/localization/GuiText.java
core/sync/AppEngPacketHandlerBase.java
2014-05-03 14:12:19 -05:00
c904033567
Fix for FMP facade conflict.
2014-04-29 01:44:13 -05:00
f21bf3e9bc
Added Basic Restrictions on slots in MAC.
2014-04-24 20:55:29 -05:00
e95da25144
Started Work in MAC Gui.
2014-04-24 01:14:26 -05:00
a5c2c7244d
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-22 22:03:09 -05:00
021e924098
Fixed issue with error prone Grid Visitors.
...
Increased Channel update speed.
Renamed Controller Method.
2014-04-22 21:49:03 -05:00
323342314c
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-17 22:39:59 -05:00
a4eb01b191
Allow security hand shakes for monitorables.
2014-04-17 22:33:48 -05:00
2de3ab4505
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-10 22:02:23 -05:00
79bbdd0bd1
host now responsible for cleanup, fixes onWrench MultiPart deletion.
2014-04-10 15:01:04 -05:00
01c76a6870
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-09 20:12:49 -05:00
b33d0771d6
Should fix CME.
2014-04-09 19:52:13 -05:00
85b3a5ef32
Started Work on Pattern Terminal.
2014-04-07 19:43:57 -05:00
2e103efab8
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
tile/misc/TileCellWorkbench.java
2014-04-06 18:20:20 -05:00
1ae63261ed
Workbench now drops the cell inside it if broken.
2014-04-06 18:14:28 -05:00
13b3555d01
Added Copy Mode to the Cell Workbench.
2014-04-06 18:05:09 -05:00
5248eeeace
Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup.
2014-04-06 01:55:24 -05:00
AlgorithmX2