Commit graph

103 commits

Author SHA1 Message Date
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
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
730200ed8d Multi-block clean up should be cleaner now. 2014-06-13 14:39:36 -05:00
AlgorithmX2
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
d807812bc8 Buffer changes from Interest List. 2014-06-10 12:16:14 -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
fbe4eebe17 Prioritize powered networks, fixes a glitch with tunnels connecting. 2014-06-08 11:26:33 -05:00
AlgorithmX2
44986692ef Pattern progress. 2014-06-08 11:25:46 -05:00
AlgorithmX2
03330d02ba Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-06 21:10:26 -05:00
AlgorithmX2
9ae4ce54d1 Energy Acceptor can now accept RF into the network buffer. 2014-06-06 21:08:14 -05:00
AlgorithmX2
41f30edb5b Don't update tiles/blocks on world unload. 2014-06-06 00:17:45 -05:00
AlgorithmX2
3b394face2 More work on crafting calculations. 2014-06-05 23:26:01 -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
b872ae66c3 Fixed http://ae2.ae-mod.info/Tracker/0475/ 2014-05-29 11:41:29 -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
ef4cab8f61 Storage grid can now properly see crafting grid. 2014-05-22 21:42:27 -05:00
AlgorithmX2
0e59831fd6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 09:50:10 -05:00
AlgorithmX2
7a3f2dcf5a Don't call Grid cache updates if the grid is empty. 2014-05-20 09:37:53 -05:00
AlgorithmX2
24e76e5a88 Crafting Cache Registered and added events. 2014-05-19 23:13:12 -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
d10e7ee6df Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 09:35:56 -05:00
AlgorithmX2
9ba1b133d7 Fixed Bug: #0432 - Weird Inventory behavior in Quartz Cutting Knife
Removed logging from Migration Items.
Improved logging for http://openeye.openmods.info/crashes/42defba4fcc4c4571a45edaaba3af4c3
Improved logging for http://openeye.openmods.info/crashes/cbda180edb2fba39c4fe27a7f5266fec
2014-05-14 10:55:45 -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
2bba4740a9 removed "___ reports to use MC ticking, but also requests Network Based Ticking." 2014-05-12 21:19:18 -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
AlgorithmX2
e1c6b18399 Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly. 2014-05-03 19:21:33 -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
ea7e4b68bb Fixed issue with lower power drains appearing to be "Free power" 2014-04-22 21:55:06 -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
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
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
2450267957 You don't have to be active to be removed, that's silly 2014-04-09 19:52:31 -05:00
AlgorithmX2
740e9e27bf Fixed Bug: #0251 - Max Power De-Synced from network components. 2014-03-29 04:03:35 -05:00
AlgorithmX2
e35924b8fa API Sync. 2014-03-28 13:58:21 -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
AlgorithmX2
404cc08128 API"ed the Storage Cell Classes. 2014-03-27 19:48:38 -05:00
AlgorithmX2
37b18d77f4 Fix Block Cable Painting Support. 2014-03-26 22:27:14 -05:00
AlgorithmX2
a475a3e91f Resolved #0202 - The question of cable power usage.
Cables no longer use power.
Each channel on a block now consumes 1 / 128 AE/t
2014-03-17 22:58:58 -05:00
AlgorithmX2
d4ff8e731d Added Meteorite Spawn Distance Setting.
Added Charged Quartz Spawn Chance.
All GUI's Parts/Tiles support Custom Localization. ( Fixes #0190 )
Added Crafting Recipe for copying Press Plates.
Fixed Bug: #0189 - Particles don't turn off when set to minimal
Fixed Bug: #0176 - Weird Colorization While Mining Parts.
Fixed Bug: #0152 - TPane drops parts as items and does not insert into system.
Fixed Bug: #0140 - Spatial pylon facade renders oddly (Clear)
2014-03-15 01:58:21 -05:00
AlgorithmX2
ca46b3e2d9 Fixed Infinite Power Bug with Energy Acceptor. 2014-03-11 20:54:04 -05:00
AlgorithmX2
f918147b46 Fixed Spatial Pylon Initialization Bug. 2014-03-07 00:15:25 -06:00
AlgorithmX2
a464686393 No more snow in spatial cells.
Fixed 2 network connection bugs when QNB's re-connect/worlds unload.
Matrix Frame can no longer be removed or even hovered over, even in creative.
Spatial Pylons Can now be seen on the Network Tool Gui.
2014-03-06 22:30:59 -06:00
AlgorithmX2
aac12dd1fd Fixed QNB Derp.
Fixed QNB's Bounding Boxes.
2014-03-06 21:24:01 -06:00
AlgorithmX2
adb03c45c6 Added Current/Max Power to Network Tool.
Added Current/Max Power to Spatial IO Port.
Added Required/Efficiency to Spatial IO Port.
Added Power Unit Button / Setting.
Fixed bug with Meteorite and Spatial IO.
Removed Random Logging in Spatial IO.
2014-03-05 23:45:14 -06:00