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

329 commits

Author SHA1 Message Date
AlgorithmX2
0146aa6422 Fixed Fixed Bug: #0744 - Client side logic on storage bus being called. 2014-07-28 21:53:43 -05:00
AlgorithmX2
ea5f49b80b API Sync, save drive and chests when modifications are made. 2014-07-28 00:11:34 -05:00
AlgorithmX2
efae157a3b Fixed Bug: #0727 - P2P fluid tunnel not outputting into dissimilar oriented tunnels. 2014-07-26 16:35:02 -05:00
AlgorithmX2
82d1f8f506 Fixed a crash when writing NBT. 2014-07-23 23:20:32 -05:00
AlgorithmX2
2b6cca0267 Fixed some storage bus related crashes. 
Fixed an issue where the storage might access inventories that have been removed from the world.
Fixed an issue caused by refactoring.
 2014-07-23 23:20:16 -05:00
AlgorithmX2
980dff203f IntegrationType Re-factor. 2014-07-23 17:26:23 -05:00
AlgorithmX2
298ae41198 Refactor Some Class stuff out in favor of StorageChannel. 2014-07-23 14:11:12 -05:00
AlgorithmX2
d9a747d26b Changed Grid Flags 2014-07-23 13:55:20 -05:00
AlgorithmX2
6aab1c2e35 Show Channel Usage for smart and dense cable in Waila. 
Waila Plugin now works when parts are in FMP Tiles.
 2014-07-22 00:47:24 -05:00
AlgorithmX2
92171d36d3 Storage Buses should only update the grid when their target changes. 
don't set the item count via IDSU unless the count changes ( ignore full inventories )
 2014-07-21 22:50:40 -05:00
AlgorithmX2
3f29590fad Paint balls now color entities their color when they get hit for 30 or so seconds ( mostly works ). 
Paint balls now color sheep.
The Color Applicator can now accept snow balls.
Snowballs can be used to clean paint balls, and to clean cables ( restore fluix )
Tweaks to Color API.
 2014-07-20 22:45:08 -05:00
AlgorithmX2
af3a9f29b6 Added Feature: #0565 - Charge Energy Cells thru Quartz Fiber 2014-07-19 17:48:57 -05:00
AlgorithmX2
642a7f162f All terminals can now have their texture rotated based on placement ( and some with the wrench ) 2014-07-19 16:01:24 -05:00
AlgorithmX2
8ae01a4e38 Added Interface Priority. 2014-07-17 22:38:57 -05:00
AlgorithmX2
4e3d829f38 Smart cables color update revisited! 2014-07-16 20:35:06 -05:00
AlgorithmX2
ead5e65a0e Fixed Bug: #0648 - Color Applicator knocks of Facades 2014-07-16 19:06:04 -05:00
AlgorithmX2
e26d8b4824 Light tunnel only uses 0.5 ae/t 2014-07-15 22:34:39 -05:00
AlgorithmX2
9c9598c6fb FMP Interface Fix. 2014-07-15 12:02:26 -05:00
AlgorithmX2
0f50c05a7d Added Light P2P Tunnel 2014-07-15 02:25:03 -05:00
AlgorithmX2
e1d3fdb8d7 Fixed Bug: #0641 - Redstone P2P Crash 
Fixed an issue where tunnels would de-register if linked a certain way.
 2014-07-14 23:47:07 -05:00
AlgorithmX2
71aed561d4 Switch Channel Renders to Dark variant instead of Medium variant. 2014-07-14 22:30:53 -05:00
AlgorithmX2
5c098544f2 Minor adjustment to make certain routes preferred over others. 2014-07-13 15:45:00 -05:00
AlgorithmX2
094d632a2c Feature: #0617 - If you combine Anchor & Facade, you can see the Anchor. 2014-07-13 15:28:59 -05:00
AlgorithmX2
cd95eb49ff Fixed minor rendering glitch. 2014-07-12 22:23:58 -05:00
AlgorithmX2
f3faba1038 All Monitors now adjust their light output based on opacity of the block in front of them. 2014-07-11 20:28:46 -05:00
AlgorithmX2
1541998281 Sync up rv0 branch fixes into rv1 2014-07-08 19:36:20 -05:00
AlgorithmX2
b42c257afd Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-07-07 23:54:47 -05:00
AlgorithmX2
2ea77d35bc Delay Block Updates, and save the world! 2014-07-07 23:54:28 -05:00
AlgorithmX2
813c1bcb58 Considerable progress on Interface terminal. 2014-07-07 22:48:21 -05:00
AlgorithmX2
f3344f28c0 Added Animation for MAssembler 2014-07-06 21:04:58 -05:00
AlgorithmX2
e658c40381 Interface Crafting, and fixed crash with import bus gui. 2014-07-06 01:48:21 -05:00
AlgorithmX2
2625b788b1 Fix issue with over utilization of items as they array, only use what you ware waiting for. 
Interface now wakes it self up when power arrives.
 2014-07-05 16:52:15 -05:00
AlgorithmX2
a966c78c12 Fix issue with export bus only crafting 1 thing. 
API Sync.
 2014-07-05 11:53:16 -05:00
AlgorithmX2
4d6193cd0f Export Bus can now craft without being on craft only mode. 2014-07-04 21:04:30 -05:00
AlgorithmX2
fa542c7d15 Add Upgrade Features to Interface, and add Buttons to Interface and Export Bus o alter crafting behavior. 2014-07-04 20:59:50 -05:00
AlgorithmX2
0a470eefc2 Crafting Machine Link API, and Export bus crafting implementation. 2014-07-04 01:19:35 -05:00
AlgorithmX2
a0c15025b7 Fixed a possible NPE in the cable rendering logic. 2014-07-02 00:05:46 -05:00
AlgorithmX2
9a2614540d Implementing Crafting Upgrade. 2014-07-01 20:44:12 -05:00
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
c97818072f Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-06-29 21:51:16 -05:00
AlgorithmX2
c74c18f81b missing import. 2014-06-29 21:48: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
AlgorithmX2
459239bfba Storage Buses no update their filters when their upgrades change. 2014-05-21 21:09:13 -05:00
AlgorithmX2
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2
0b04d2853e Add backwards support for MJ5 ( from MJ6 ) 
Add another try catch facade test...
 2014-05-20 22:06:37 -05:00
AlgorithmX2
bd926374db Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-18 21:42:43 -05:00
AlgorithmX2
2cf84989d1 IC2 Double Buffer Approach. 2014-05-18 21:36:32 -05:00
AlgorithmX2
37d7675ad7 Darn it Power tunnels need power too! 2014-05-18 21:36:21 -05:00
AlgorithmX2
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
AlgorithmX2
c35faabfd8 Fixed Bug: #0436 - Fluid Tunnels don't require Power 
Fixed bug where fluid tunnels would not function properly.
 2014-05-18 14:44:58 -05:00
AlgorithmX2
8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 21:43:11 -05:00
AlgorithmX2
6f96ae6074 Removed Alpha Migration. 
Fixed a crash when AE is rendering as a FMP Part.
Meteorite Loot is now less random.
Added support for CLApi ( might be neat as it develops )
 2014-05-15 21:18:30 -05:00