e5e373ce10
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-28 17:34:03 -05:00
1cbda9e7ae
1.7.10 deprecations.
2014-06-28 17:32:20 -05:00
215c097506
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-25 23:02:22 -05:00
9b65cc210d
Update MFR Rednet API
2014-06-25 21:19:20 -05:00
4ab4b335c3
Started work on Crafting CPU Gui
2014-06-25 20:49:37 -05:00
fdf3272fe0
Added Molecular Assembler Render.
2014-06-23 22:55:16 -05:00
f574f7533d
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-19 01:36:07 -05:00
77dcf6c5cf
Fix Storage bus when tiles change without blocks.
2014-06-19 01:35:46 -05:00
f807f18239
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-16 22:55:57 -05:00
d287b30c01
Fixed http://openeye.openmods.info/crashes/2d45b58c95514ec3d9a1b49703e53de9
2014-06-16 22:43:41 -05:00
1632d2d72e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
4763069fab
Removed Vec3Pool
2014-06-13 12:42:09 -05:00
734663f521
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-11 00:44:00 -05:00
bbfa43dd92
Breaking and Damaging Particles for cables now work properly.
...
Breaking Animation now works on Cables as expected.
Cable now has a bounding box where it touches parts.
2014-06-11 00:14:37 -05:00
87bd8f3c22
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-07 23:29:57 -05:00
009417ca4f
Adjusted Block Hardness.
...
Test Tools with getHarvestLevel
2014-06-07 20:20:23 -05:00
14aba981b2
Tweaked Energy Flow Code for Network Acceptor, should be more what I'm looking for.
2014-06-07 19:23:31 -05:00
f6d7762725
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/tools/powered/ToolMassCannon.java
2014-06-04 23:05:22 -05:00
1ab7f7c110
Ditch AABBPool
2014-06-04 22:59:56 -05:00
8183becfd4
Paint Balls.
2014-05-31 20:50:56 -05:00
623e3aa228
Revert "Cable Null checks for EVERYTHING!"
...
This reverts commit 57d4541418
2014-05-29 15:01:42 -05:00
57d4541418
Cable Null checks for EVERYTHING!
2014-05-29 11:40:42 -05:00
905832ae85
Renamed ExtraTextures and added ExtraItemTextures.
2014-05-25 20:58:44 -05:00
ef7a1592e7
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 18:35:44 -05:00
6b0fa0f142
Clear Memory Card When Shift Clicking on a non-machine / air.
...
Fixed Tooltip to properly localize names.
2014-05-25 18:32:16 -05:00
bd7b154455
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 00:03:27 -05:00
8f474b8baf
Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f
...
Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
2014-05-24 23:55:13 -05:00
5f21711204
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-24 10:40:16 -05:00
6e1a0aabb6
Server doesn't have noTesr Tiles.
2014-05-24 10:29:45 -05:00
5f5fc4cee1
Fixed Crafting MB Names.
2014-05-22 21:39:21 -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
32f7e58cf0
Update API for metadata flag.
2014-05-11 11:24:46 -05:00
03f938516a
Ore no longer rotates.
2014-05-11 11:22:10 -05:00
08d6942643
Added all the crafting cpu "blocks" - needs textures and renders.
...
Updated API
2014-05-10 00:00:02 -05:00
f031972fcd
Started working on crafting infrastructure and C-Cpus
2014-05-08 23:10:12 -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
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
e95da25144
Started Work in MAC Gui.
2014-04-24 01:14:26 -05:00
01c76a6870
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-09 20:12:49 -05:00
6b244b341b
Don't discriminate against blocks with custom rotation.
2014-04-09 20:02:34 -05:00
85b3a5ef32
Started Work on Pattern Terminal.
2014-04-07 19:43:57 -05:00
efa931a7a1
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-05 15:30:09 -05:00
27f374eb04
Added Rotatable Blocks integration.
2014-04-03 23:12:35 -05:00
c40c81070c
All Terminals now can be opened in low power / channel state and show dark slots.
2014-03-27 23:31:06 -05:00
a5379c82f8
Fixed Bug: #0246 - Typo
2014-03-27 19:33:35 -05:00
e384761e82
No more wrenching chests.
2014-03-27 19:33:14 -05:00
42963e6632
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2
2014-03-26 22:58:10 -05:00
AlgorithmX2