Commit graph

22 commits

Author SHA1 Message Date
AlgorithmX2
161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -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
15aa825d30 Added Comments for Enum Settings.
Added Comment for wireless equation.
Removed Alpha Migration Option.
2014-05-22 16:29:10 -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
50aa0b9062 Added GrinderLogging and hid Grinder Logging behind it. 2014-05-06 14:56:06 -05:00
AlgorithmX2
e60faf5ab0 Remove Meta values from Config.
Fixed a number of rendering gltiches with Smart/Covered Cables
2014-05-06 00:16:29 -05:00
AlgorithmX2
4d5a6ce301 Add Stained Glass facades.
The Item Bus Renderer can now deal with Alpha Pass.
2014-05-04 15:46:38 -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
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
2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -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
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
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
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
b57804be06 Removed Localization Stuff.
Added Logging Option.
Logging of Exceptions is now done via AELogger
2014-02-07 14:37:22 -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
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00