fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,179 Commits 45 Branches 194 Tags
0a08ba4bdef76bcc47892d5e5193d28a96db013d
Commit Graph

305 Commits

Author SHA1 Message Date
AlgorithmX2 58763ef17f Removed Pointless value. 2014-05-03 19:20:20 -05:00
AlgorithmX2 bed34bf9b5 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-03 15:29:42 -05:00
AlgorithmX2 6ff118e2b7 Annihilation Plane and Formation Plane no update their renders properly. 2014-05-03 14:25:37 -05:00
AlgorithmX2 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
AlgorithmX2 b9ef599e13 Network tool can now lock Storage/Conversion Monitors. 
Buckets no longer place when trying to insert them into a network via Conversion Monitor.
 2014-05-03 02:51:56 -05:00
AlgorithmX2 cc8c3bb75e Implemented 5% Tunnel Tax. 2014-05-02 00:40:46 -05:00
AlgorithmX2 cd5e4caf7b Added P2P RF Tunnel. 
Added Added thread local for network recursion for later ( 1.8 ).
 2014-05-02 00:00:14 -05:00
AlgorithmX2 6b87e36bb3 Bug: #0386 - Memory Card not detect flat ME Interface 
Interface parts can share Settings with bocks.
 2014-05-01 00:41:19 -05:00
AlgorithmX2 c904033567 Fix for FMP facade conflict. 2014-04-29 01:44:13 -05:00
AlgorithmX2 f6a132e19e Null Check. 2014-04-28 13:19:41 -05:00
AlgorithmX2 62166f1e94 Fix Bug: #0373 - Interface dont Drop Items (Items Lost) 2014-04-27 23:50:50 -05:00
AlgorithmX2 a29afb9dd9 Fiber don't use power. 2014-04-26 21:53:30 -05:00
AlgorithmX2 eadd67a34c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-24 02:14:58 -05:00
AlgorithmX2 722d065c2c Storage monitors now use display lists. 2014-04-24 02:14:18 -05:00
AlgorithmX2 fafa79e657 Monitors now use render caching. 2014-04-24 02:14:07 -05:00
AlgorithmX2 a5c2c7244d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-22 22:03:09 -05:00
AlgorithmX2 49c7f9a93b Cache Tanks, might be a minor performance benefit. 2014-04-21 16:11:39 -05:00
AlgorithmX2 e9759f681e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-20 13:53:43 -05:00
AlgorithmX2 fa307b467e Facades and FMP parts can no longer overlap. 2014-04-19 23:35:48 -05:00
AlgorithmX2 18e96644d6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:52:47 -05:00
AlgorithmX2 3d06bb3ba5 Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 ) 2014-04-17 22:52:21 -05:00
AlgorithmX2 323342314c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:39:59 -05:00
AlgorithmX2 a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2 572352c18e Networks now run at 1x speed. 
Illuminated Panels now use proper channel and power settings.
 2014-04-17 19:44:51 -05:00
AlgorithmX2 f14581edae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-16 23:39:03 -05:00
AlgorithmX2 9f7e809662 Terminals show now drop View Cells. 2014-04-16 11:59:37 -05:00
AlgorithmX2 506b7a7129 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-14 02:39:39 -05:00
AlgorithmX2 36dad44a6a Fixed Hit Boxes on Import Bus, Interface, Storage Bus, P2P Tunnels 2014-04-10 22:54:28 -05:00
AlgorithmX2 2de3ab4505 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 22:02:23 -05:00
AlgorithmX2 79bbdd0bd1 host now responsible for cleanup, fixes onWrench MultiPart deletion. 2014-04-10 15:01:04 -05:00
AlgorithmX2 f8d60e801a Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 00:59:15 -05:00
AlgorithmX2 661afe846c Fixed Bug with P2P Tunnels not disconnecting in certain cases. 2014-04-10 00:58:56 -05:00
AlgorithmX2 d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -05:00
AlgorithmX2 01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2 ac0c562b02 Fixed Channel requirements for illuminated panels. 2014-04-09 14:22:36 -05:00
AlgorithmX2 db6a958a6f Fix Interface Crash caused by negative items. 2014-04-09 14:22:17 -05:00
AlgorithmX2 7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2 6203b172f6 Better Solution for extra energy injection. ( Fixes Crash ) 2014-04-07 21:31:36 -05:00
AlgorithmX2 0cec53eece More Pattern Terminal Stuff. 2014-04-07 21:25:41 -05:00
AlgorithmX2 2ebca04296 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-07 19:47:39 -05:00
AlgorithmX2 7a0674a75b Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 19:46:27 -05:00
AlgorithmX2 0a9bb1eb2f Storage Bus now updates render when changing statuses. 2014-04-07 19:45:38 -05:00
AlgorithmX2 85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2 9cd502ed56 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 11:27:36 -05:00
AlgorithmX2 85ffe63ebe Toggle Buses Don't need Channels. 2014-04-07 11:27:00 -05:00
AlgorithmX2 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 028555bc8a Fixed Fluid Render. 2014-04-05 21:50:01 -05:00
AlgorithmX2 59f3c703e2 Separated Textures for many parts. 2014-04-03 23:31:10 -05:00
AlgorithmX2 d3ac967eaa Fixed Bug: #0268 - MC Ladders, any way to prevent slow down? 2014-03-31 22:23:50 -05:00
AlgorithmX2 c40c81070c All Terminals now can be opened in low power / channel state and show dark slots. 2014-03-27 23:31:06 -05:00