Commit graph

239 commits

Author SHA1 Message Date
AlgorithmX2
4ce40869f4 Fix issues with Pattern Terminal. 2014-07-01 20:43:08 -05:00
AlgorithmX2
8705180bae Removed Lumen Cable. 2014-07-01 20:32:27 -05:00
AlgorithmX2
bfc68bf3dc Formation Plane fixed 2014-06-29 21:05:19 -05:00
AlgorithmX2
ac5d3e3192 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-06-29 21:04:10 -05:00
AlgorithmX2
a5a92af74a Fixes for formation plane, also enabled fireworks to be shot using it. 2014-06-29 21:03:00 -05:00
AlgorithmX2
96b5115538 IC2 Api Update. 2014-06-28 20:26:43 -05:00
AlgorithmX2
a84d513eda Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 18:03:17 -05:00
AlgorithmX2
b3cb822d1d Use IC2 Api to get tier. 2014-06-28 18:02:14 -05:00
AlgorithmX2
e5e373ce10 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 17:34:03 -05:00
AlgorithmX2
6718fae629 Initial 1.7.10 IC2 API Update. 2014-06-28 17:32:40 -05:00
AlgorithmX2
115c3e597a API Sync, IBaseMonitor 2014-06-27 00:44:56 -05:00
AlgorithmX2
d750a25fca Back Port "Fix an issue where interfaces would not cause storage buses to re-check their status." 2014-06-26 21:54:42 -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
fdf3272fe0 Added Molecular Assembler Render. 2014-06-23 22:55:16 -05:00
AlgorithmX2
f41c5793fe Fix an issue where interfaces would not cause storage buses to re-check their status. 2014-06-23 00:08:38 -05:00
AlgorithmX2
d730fe17b1 Interfaces now drop there items properly. 2014-06-22 23:51:20 -05:00
AlgorithmX2
ff9a10b926 Crafting is virtually working 100% 2014-06-22 02:00:38 -05:00
AlgorithmX2
65e9e272c4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-21 11:57:38 -05:00
AlgorithmX2
dd9c85e43e Prevent block updates while loading parts; Should fix http://openeye.openmods.info/crashes/baf3e72a51ad8a5b8680ec24a819bc86 2014-06-20 12:12:48 -05:00
AlgorithmX2
b8a8f2f202 Crafting is now possible ( not complete but possible ) 2014-06-19 01:28:45 -05:00
AlgorithmX2
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
4f4dbc4307 Fixed Crash with Fuzzy Upgrade in Export Bus. 2014-06-11 00:22:55 -05:00
AlgorithmX2
7e737966b8 Fix for Cable BB Update. 2014-06-11 00:20:25 -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
70fe6b4bae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-09 21:48:25 -05:00
AlgorithmX2
a73109b62e Fixed http://openeye.openmods.info/crashes/1cc02c8016ddc5ec81efb429f5653ad0 2014-06-09 21:22:35 -05:00
AlgorithmX2
652d2e6018 Also Cables no longer glow in the dark :P
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
2014-06-08 21:13:53 -05:00
AlgorithmX2
76de1cf185 Item Tunnels now cycle Outputs. 2014-06-08 18:54:38 -05:00
AlgorithmX2
8dcf25a652 Fixed a bug where RF and IC2 tunnels could vaporize them selves.
Fixed Bug: #0514 - An unknown error occurs frequently
2014-06-08 18:10:19 -05:00
AlgorithmX2
883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2
e6c80df3c8 Added support for parts too. 2014-06-03 13:00:10 -05:00
AlgorithmX2
fede238251 Formation Planes can now Place Heads. 2014-06-03 12:08:33 -05:00
AlgorithmX2
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
AlgorithmX2
e8e97a1c20 Changed "Invalid NBT For CableBus Container" to a warning instead of a exception. 2014-05-27 16:02:15 -05:00
AlgorithmX2
45155caeee Annihilation Plane now drops its buffer. 2014-05-27 15:47:36 -05:00
AlgorithmX2
0ac83b04c9 Changed Package Names. 2014-05-27 12:15:49 -05:00
AlgorithmX2
ec58bdb879 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-27 12:07:20 -05:00
AlgorithmX2
eb8e8da0a2 Removed Layers from API - I'm sick of people commenting on it. 2014-05-27 12:06:55 -05:00
AlgorithmX2
9b8596dc7c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-26 10:59:03 -05:00
AlgorithmX2
3ac94550e5 Seeds can now be planted via Formation Planes. 2014-05-26 10:58:41 -05:00
AlgorithmX2
161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2
425f144f25 And again! 2014-05-25 20:59:15 -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
fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
1b207a17e9 API Update. 2014-05-24 18:23:23 -05:00
AlgorithmX2
82a8e2d045 Fixed http://openeye.openmods.info/crashes/df3cca6850f2c037b6adb8d8d641b22f
Improved Exception for http://openeye.openmods.info/crashes/d2df850ad1915a015a80f9f7cef56ac3
Improved Exception for http://openeye.openmods.info/crashes/c8a3f70288f017726c5acd09ea91a2b0
2014-05-24 11:02:24 -05:00
AlgorithmX2
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
2014-05-22 18:49:02 -05:00