Commit graph

48 commits

Author SHA1 Message Date
AlgorithmX2
5dbba26930 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-03 19:23:48 -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
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
bba2f3ba25 Less null Items 2014-05-02 01:03:02 -05:00
AlgorithmX2
cc8c3bb75e Implemented 5% Tunnel Tax. 2014-05-02 00:40:46 -05:00
AlgorithmX2
da764470a4 Use Cable from EiO to attune redstone flux. 2014-05-02 00:22:22 -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
9238a530bb Added World and Grindstone NEI Plugins. 2014-05-01 00:32:58 -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
efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2
404cc08128 API"ed the Storage Cell Classes. 2014-03-27 19:48:38 -05:00
AlgorithmX2
a5379c82f8 Fixed Bug: #0246 - Typo 2014-03-27 19:33:35 -05:00
AlgorithmX2
2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2
0a98211af2 API Sync 2014-03-23 23:00:12 -05:00
AlgorithmX2
06903814ad Added Facade Crafting. 2014-03-15 15:35:00 -05:00
AlgorithmX2
a60d5a4cc7 Inscriber is fully functional, just needs textures. 2014-03-12 22:14:55 -05:00
AlgorithmX2
d5748eb804 Cables now work in Recipes.
Added Ingredient Resolver Sets.
Shrunk MC Chest Battery.
2014-03-09 21:11:29 -05:00
AlgorithmX2
dfd24a6756 Website recipes need AE Items.
Ignore BC Items.
2014-03-09 16:39:30 -05:00
AlgorithmX2
49fcc7f510 Renamed Inscriber Recipe Type to Inscribe.
Missing Icon now supports Items.
Fixed Missing Icons for debug Items.
SkyStone Chests can now be disabled.
More work on Website Recipes.
Removed Unused method in Network Handler.
2014-03-08 21:35:53 -06:00
AlgorithmX2
e8ec768d4c Website Recipe Exporter. 2014-03-05 13:34:56 -06:00
AlgorithmX2
58992d0786 Added Eraser Debug Tool.
Meteorite Spawning Complete.
Removed a lot of test Logging.
2014-03-02 17:18:15 -06:00
AlgorithmX2
9575c8872c Implemented Recipe Groups.
Added ISubItemResolvers.
ItemSeeds now use Constants instead of raw integers.
2014-02-24 23:33:31 -06:00
AlgorithmX2
1a75097e84 Removed Block Definitions for MAC Parts.
Removed Options For MAC and Crafting.
Added Options for Crafting with Quartz Growth and Fluix Reaction.
EU Tunnels Re-Added ( Limit 1 per block. )
Adjusted naming/categorization of various features.
Added "sparkle" effect to seeds that are "growing"
2014-02-23 16:50:53 -06:00
AlgorithmX2
bea8f2cc07 Recipe API Update. 2014-02-19 17:33:36 -06:00
AlgorithmX2
dc095749b7 Fixed Issue with DSU API,
Re-added support for MJ
Re-added support for pipe
Re-added support for BC-Facades.
2014-02-16 12:41:45 -06:00
AlgorithmX2
08e6a656b8 Added Basic Quartz and Tool Recipes.
Added Custom Recipes.
2014-02-10 23:51:25 -06:00
AlgorithmX2
2f37b41eeb Added Integration Logging Setting. 2014-02-09 12:35:58 -06:00
AlgorithmX2
49da876b6f Fixed an issue where Parts/Blocks would not properly identify them selves with the proper ItemStack. 2014-02-09 01:55:44 -06:00
AlgorithmX2
5f8570abdc Rename Configuration to AE Config 2014-02-08 23:08:27 -06:00
AlgorithmX2
d50c7f6312 Ported to 1.7 2014-02-08 19:34:52 -06:00
AlgorithmX2
b57804be06 Removed Localization Stuff.
Added Logging Option.
Logging of Exceptions is now done via AELogger
2014-02-07 14:37:22 -06:00
AlgorithmX2
8b81545abf Wireless Terminal Gui Works, dose not support range, or WAPs 2014-02-02 23:02:54 -06:00
AlgorithmX2
b7d90b989d Begin work on Wireless Terminal Gui. 2014-02-02 22:33:50 -06:00
AlgorithmX2
af8e356bec Wireless block no uses placed side to orient, this is more natural for it instead of the place based version.
Added Wireless Encoder Gui to the Security Term
Security Term now only accepts Biometric Cards in the config slot.
Added Wireless Block.
Added Wireless Terminal.
Fixed Crash when loading world settings.
Configure slot of Security Block now drops on destruction.
2014-02-02 01:32:10 -06:00
AlgorithmX2
fbcee6ca12 Facade Creative Tab and Config. 2014-02-01 16:24:13 -06:00
AlgorithmX2
8aa96bd426 ME Cables now attune to ME in stead of Items 2014-01-30 21:07:22 -06:00
AlgorithmX2
1b6455421e Particle Settings
Grinder Fix.
2014-01-29 20:47:55 -06:00
AlgorithmX2
c40d6937d6 Replace Non created materials/parts with null item definitions instead of null. 2014-01-28 14:20:19 -06:00
AlgorithmX2
0f75db5e80 Pretty much all of security minus the gui.
and all the stuff I did that i forgot to comment.
2014-01-26 22:00:36 -06:00
AlgorithmX2
1d539a33a8 Drives/Chests now charge power based on Cell Types. 2014-01-24 10:32:31 -06:00
AlgorithmX2
d6aa666068 Tunnel Registrations 2014-01-24 10:31:29 -06:00
AlgorithmX2
86e11d6e3f Colored Item Definitions 2014-01-24 10:30:57 -06:00
AlgorithmX2
42424f80c8 Refactoring API stuff 2014-01-23 13:02:48 -06:00
AlgorithmX2
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00
AlgorithmX2
db4cf7aa5d Redstone Logic for Buses, and Part Image Button goodness 2014-01-01 23:51:41 -06:00
AlgorithmX2
587fb893b4 Materials now share an ItemID, seemed silly other wise. 2014-01-01 03:01:38 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00