tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
901 commits 7 branches 98 tags 24 MiB
Commit graph

114 commits

Author SHA1 Message Date
AlgorithmX2
c06e7d09d9 Fixed Bug: #0611 - Can place crafting CPU multiblock blocks inside of yourself 2014-07-12 18:59:15 -05:00
AlgorithmX2
6f957a57f3 Fixed Assembler Alpha Pass Rendering. 2014-07-11 20:27:01 -05:00
AlgorithmX2
b3b2cf6f89 Fixed default block opacity. 2014-07-11 20:26:47 -05:00
AlgorithmX2
c301819b5d Fixed Crafting CPU Drops, and Render of Crafting Monitor. 2014-07-11 15:06:42 -05:00
AlgorithmX2
7242dfeb08 Fixed Crafting CPU Render. 
Finished Crafting Confirm Screen
Added logic to prevent crafting in cpus with too little storage.
 2014-07-10 23:46:51 -05:00
AlgorithmX2
d5989750b4 Fully Implemented Crafting CPU Monitors 2014-07-10 00:44:01 -05:00
AlgorithmX2
16ef731c00 Interface Terminal 
Fixed bug with Assembler Packet Crashing the server.
 2014-07-09 03:17:11 -05:00
AlgorithmX2
f3344f28c0 Added Animation for MAssembler 2014-07-06 21:04:58 -05:00
AlgorithmX2
4a88f87e2a Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-07-02 18:21:36 -05:00
AlgorithmX2
f34f20d150 Spatial generation and frame bucket fix. ( ender pearl fix required? ) 2014-07-02 18:20:42 -05:00
AlgorithmX2
1d687f3084 Graceful saving/loading and breaking of CPUs. 2014-07-02 00:05:21 -05:00
AlgorithmX2
64f2acfb43 QNB blocks don't deform. 2014-07-02 00:04:35 -05:00
AlgorithmX2
e5e373ce10 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 17:34:03 -05:00
AlgorithmX2
1cbda9e7ae 1.7.10 deprecations. 2014-06-28 17:32:20 -05:00
AlgorithmX2
215c097506 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-25 23:02:22 -05:00
AlgorithmX2
9b65cc210d Update MFR Rednet API 2014-06-25 21:19:20 -05:00
AlgorithmX2
4ab4b335c3 Started work on Crafting CPU Gui 2014-06-25 20:49:37 -05:00
AlgorithmX2
fdf3272fe0 Added Molecular Assembler Render. 2014-06-23 22:55:16 -05:00
AlgorithmX2
f574f7533d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-19 01:36:07 -05:00
AlgorithmX2
77dcf6c5cf Fix Storage bus when tiles change without blocks. 2014-06-19 01:35:46 -05:00
AlgorithmX2
f807f18239 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-16 22:55:57 -05:00
AlgorithmX2
d287b30c01 Fixed http://openeye.openmods.info/crashes/2d45b58c95514ec3d9a1b49703e53de9 2014-06-16 22:43:41 -05:00
AlgorithmX2
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
AlgorithmX2
4763069fab Removed Vec3Pool 2014-06-13 12:42:09 -05:00
AlgorithmX2
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
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
AlgorithmX2
87bd8f3c22 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-07 23:29:57 -05:00
AlgorithmX2
009417ca4f Adjusted Block Hardness. 
Test Tools with getHarvestLevel
 2014-06-07 20:20:23 -05:00
AlgorithmX2
14aba981b2 Tweaked Energy Flow Code for Network Acceptor, should be more what I'm looking for. 2014-06-07 19:23:31 -05:00
AlgorithmX2
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
AlgorithmX2
1ab7f7c110 Ditch AABBPool 2014-06-04 22:59:56 -05:00
AlgorithmX2
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
623e3aa228 Revert "Cable Null checks for EVERYTHING!" 
This reverts commit 57d4541418.

This was already resolved - this is a duplicate fix.
 2014-05-29 15:01:42 -05:00
AlgorithmX2
57d4541418 Cable Null checks for EVERYTHING! 2014-05-29 11:40:42 -05:00
AlgorithmX2
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -05:00
AlgorithmX2
ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00
AlgorithmX2
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
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
8f474b8baf Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f 
Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
 2014-05-24 23:55:13 -05:00
AlgorithmX2
5f21711204 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-24 10:40:16 -05:00
AlgorithmX2
6e1a0aabb6 Server doesn't have noTesr Tiles. 2014-05-24 10:29:45 -05:00
AlgorithmX2
5f5fc4cee1 Fixed Crafting MB Names. 2014-05-22 21:39:21 -05:00
AlgorithmX2
b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2
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
AlgorithmX2
6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -05:00
AlgorithmX2
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
AlgorithmX2
32f7e58cf0 Update API for metadata flag. 2014-05-11 11:24:46 -05:00
AlgorithmX2
03f938516a Ore no longer rotates. 2014-05-11 11:22:10 -05:00
AlgorithmX2
08d6942643 Added all the crafting cpu "blocks" - needs textures and renders. 
Updated API
 2014-05-10 00:00:02 -05:00
AlgorithmX2
f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00