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

252 commits

Author SHA1 Message Date
AlgorithmX2
c5aabb1c34 Minor Refactor. 2014-07-23 13:55:48 -05:00
AlgorithmX2
d9a747d26b Changed Grid Flags 2014-07-23 13:55:20 -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
f355fc1643 Initial Paint Ball Implementation. 2014-07-20 03:53:05 -05:00
AlgorithmX2
1a1025b8c9 API Synced or Spatial, also one last change with grinder. 2014-07-20 01:51:51 -05:00
AlgorithmX2
fdc263702e API Synced with Grinder canges. 2014-07-20 01:50:50 -05:00
AlgorithmX2
8ae01a4e38 Added Interface Priority. 2014-07-17 22:38:57 -05:00
AlgorithmX2
bd61261869 Controller and Energy Acceptor now use a shared empty inventory, less memory! 2014-07-17 15:14:44 -05:00
AlgorithmX2
683a5ee765 Added Feature: #0633 - [Aesthetical] Recoloring of specific blocks 2014-07-16 23:44:02 -05:00
AlgorithmX2
e49864e295 Nameable CPUs. 2014-07-15 22:26:12 -05:00
AlgorithmX2
e64bf91789 Keep custom names for TileEntities. 2014-07-15 22:25:59 -05:00
AlgorithmX2
c2259f7b43 Attempted to Fix Bug: #0643 - Level Emitter not update 2014-07-15 21:18:22 -05:00
AlgorithmX2
862c89e1f0 Added Light Detector 2014-07-15 20:26:04 -05:00
AlgorithmX2
9c9598c6fb FMP Interface Fix. 2014-07-15 12:02:26 -05:00
AlgorithmX2
0107926bdd Fixed Bug: #0614 - Network details 2014-07-13 14:42:52 -05:00
AlgorithmX2
8f65aad67b Fixed MA Crash with processing Patterns. 2014-07-12 17:14:28 -05:00
AlgorithmX2
7fb22a8550 Fixed a bug where Assemblers would fall asleep while there was work to do. 2014-07-11 19:02:09 -05:00
AlgorithmX2
d5989750b4 Fully Implemented Crafting CPU Monitors 2014-07-10 00:44:01 -05:00
AlgorithmX2
42840d6936 Fixed Derpy Update Check in ME Chest 2014-07-10 00:43:27 -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
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
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
844b4843c0 Crafting API Added 
Fixed tons of issues with CPU multi block weirdness.
 2014-07-02 23:48:18 -05:00
AlgorithmX2
1d687f3084 Graceful saving/loading and breaking of CPUs. 2014-07-02 00:05:21 -05:00
AlgorithmX2
9a2614540d Implementing Crafting Upgrade. 2014-07-01 20:44:12 -05:00
AlgorithmX2
96b5115538 IC2 Api Update. 2014-06-28 20:26:43 -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
c99964dad6 Finished Crafting CPU Gui. 2014-06-28 00:20:12 -05:00
AlgorithmX2
20de41caca Fix forcePlan Flag. 2014-06-27 00:45:10 -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
d4619fd48e Adjusted Timing for MAs 
MAs now save when things change.
Fixed a sleeping issue with MAs
MAs now drop their upgrades properly.
 2014-06-22 23:52:14 -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
6cbc5aa953 Recursive crafting works. 
MA's can accept pushes.
Interfaces no alter pushing behavior depending on ICraftingMachine settings.
Fixed bug where crafting would record items that don't exist as available for the initial pull.
 2014-06-20 02:12:39 -05:00
AlgorithmX2
04797294bb implemented validForPass on all inventory handlers; allowed crafting to skip second pass. 2014-06-20 02:10:02 -05:00
AlgorithmX2
755e87f006 Fixed bug with accelerator detection. 2014-06-20 02:07:52 -05:00
AlgorithmX2
b8a8f2f202 Crafting is now possible ( not complete but possible ) 2014-06-19 01:28:45 -05:00
AlgorithmX2
32ee57c3a9 Separated Crafting job into a worker thread. 
Crafting calculation can be canceled.
Hooked up a crafting calculation launch and the confirmation GUI.
 2014-06-18 01:23:37 -05:00
AlgorithmX2
0a18f2d926 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-17 23:36:53 -05:00
AlgorithmX2
6084ac4e80 Fix Failed Insert Loop in IO Port. 2014-06-17 16:45:26 -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
730200ed8d Multi-block clean up should be cleaner now. 2014-06-13 14:39:36 -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
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
87bd8f3c22 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-07 23:29:57 -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
883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2
885bdbf9d5 More intelligent funneling demand. 2014-06-03 20:33:04 -05:00
AlgorithmX2
584782ec6e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 01:44:48 -05:00
AlgorithmX2
10939b6001 RF Now only inserts up to the overflow. 2014-06-02 01:33:16 -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
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
b872ae66c3 Fixed http://ae2.ae-mod.info/Tracker/0475/ 2014-05-29 11:41:29 -05:00
AlgorithmX2
7b33635c47 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 11:07:18 -05:00
AlgorithmX2
4cf6f4e5f9 Don't Show Energy Cell info if the NBT Came from the client. 2014-05-25 11:06:59 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
baefedc4b8 ME Chest can have its drive removed via automation via the front slot. 2014-05-24 23:49:24 -05:00
AlgorithmX2
a861f09b01 ME Chest insertion behavior fixed. 
ME Chest drive slot now properly accessible from front drive face.
ME Chests can now function as tanks. ( fluid cells from extra cells )
ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. )
Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18
 2014-05-24 18:25:22 -05:00
AlgorithmX2
a3264d03e2 Crafting CPUs now appear offline unless hey have their channel requirement met. 
Also their status shows in waila.
 2014-05-22 21:43:15 -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
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
14b7fe8a42 Add better custom security features. 2014-05-12 23:15:46 -05:00
AlgorithmX2
45c292344f Fixed Dormant Chunk Cache. 2014-05-12 21:15:45 -05:00
AlgorithmX2
be645f3e2f MJ 6 + MJ 5 Integration. 2014-05-11 16:13:37 -05:00
AlgorithmX2
ce561ffbe3 Merge in Builder support. 2014-05-11 13:48:14 -05:00
AlgorithmX2
34048d45a2 Don't erase inventory when someone asks for the drops... 2014-05-11 13:30:36 -05:00
AlgorithmX2
d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -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
3491fe4e33 Did what I could with mj6 2014-05-09 21:08:56 -05:00
AlgorithmX2
98fc460da0 Removed Old RF Api. 2014-05-09 09:42:52 -05:00
AlgorithmX2
f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00
AlgorithmX2
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2
6532af979d Molecular Assembler Single Pattern Mode "works" 2014-05-08 00:58:43 -05:00
AlgorithmX2
b4e8dada38 Crafting progress might be a thing. 2014-05-07 19:59:05 -05:00
AlgorithmX2
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
AlgorithmX2
5bf8e9d7d0 Updated RF Api ( should work for old api too - at least temporary ). 2014-05-06 18:09:31 -05:00
AlgorithmX2
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
AlgorithmX2
9c5c92401b Lower Cable TESR Distance to 30.0f 2014-05-04 17:53:32 -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
c904033567 Fix for FMP facade conflict. 2014-04-29 01:44:13 -05:00
AlgorithmX2
f21bf3e9bc Added Basic Restrictions on slots in MAC. 2014-04-24 20:55:29 -05:00
AlgorithmX2
e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2
a5c2c7244d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-22 22:03:09 -05:00
AlgorithmX2
021e924098 Fixed issue with error prone Grid Visitors. 
Increased Channel update speed.
Renamed Controller Method.
 2014-04-22 21:49:03 -05:00