Commit Graph

69 Commits

Author SHA1 Message Date
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 0ac83b04c9 Changed Package Names. 2014-05-27 12:15:49 -05:00
AlgorithmX2 ac8effba3b Change path to layers. 2014-05-27 12:14:35 -05:00
AlgorithmX2 161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2 24e76e5a88 Crafting Cache Registered and added events. 2014-05-19 23:13:12 -05:00
AlgorithmX2 b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2 8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 21:43:11 -05:00
AlgorithmX2 6f96ae6074 Removed Alpha Migration.
Fixed a crash when AE is rendering as a FMP Part.
Meteorite Loot is now less random.
Added support for CLApi ( might be neat as it develops )
2014-05-15 21:18:30 -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 45c292344f Fixed Dormant Chunk Cache. 2014-05-12 21:15:45 -05:00
AlgorithmX2 ce561ffbe3 Merge in Builder support. 2014-05-11 13:48:14 -05:00
AlgorithmX2 d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -05:00
AlgorithmX2 570f098f81 Fixed a few more rendering/visual update glitches. 2014-05-10 13:27:48 -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 1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -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 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 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 40de3da454 Added Railcraft Integration. 2014-05-01 21:49:19 -05:00
AlgorithmX2 67d46d57d2 Patterns can now be encoded.
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
2014-04-17 01:15:56 -05:00
AlgorithmX2 2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2 9e85c33b16 Enable FZ Integration - Crafting and Barrels ( Untested ). 2014-03-18 12:54:57 -05:00
AlgorithmX2 06903814ad Added Facade Crafting. 2014-03-15 15:35:00 -05:00
AlgorithmX2 0ed0af3d34 Inscriber Functional, No render. 2014-03-11 22:26:50 -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 cd51b00b31 Basic Block/Gui/Tile registertion work for Inscriber is done. 2014-03-07 00:15:54 -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 2e9d6641fe Fixed a bug with shift clicking.
Added Quartz Knife Gui.
You can now make name presses with the quartz knife.
Added Inscriber Recipes.
Fixed Bug with Spatial Dim Registrations.
2014-03-06 21:02:15 -06:00
AlgorithmX2 b62166bd08 Reconcile broken code. 2014-03-05 23:52:25 -06:00
AlgorithmX2 040e948d8e Removed Dropped Features.
Implemented Spatial Storage.
Fixed bug with ME Chest saying the cell was un-readable.
2014-03-05 01:27:42 -06:00
AlgorithmX2 4536189042 Added Sky Stone Dust.
Added View Cell.
Configure View Cell in Cell Workbench.
View Cell Can Filter Terminals by being inserted into the Side Slot.
2014-03-04 01:52:07 -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 792249f8fd Added Sky Stone Tracking.
Added Meteorite Compass Block / Item.
Added Meteorite Spawner Debug Item.
Some Refactoring.
2014-03-02 02:35:11 -06:00
AlgorithmX2 f1da7b1970 Stone Not Rock. 2014-02-28 09:27:04 -06:00
AlgorithmX2 d32137a336 Added Sky Rock.
Added Sky Chest.
2014-02-28 02:12:00 -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 15f300c553 Removed Purify Crafting Handler.
Added Crystal Growth ( for Nether, Certus, and Fluix. )
Added Macerator Crafting Handler.
Added Pulverizer Crafting Handler.
Implemented Grid Crafting Handler.
Formation Planes now eject items in a more consistent manner.
Formation Planes can now place, or eject into replaceable blocks ( air/grass/fluids )
2014-02-23 00:55:46 -06:00
AlgorithmX2 302a41ac76 Added Crystal Growth Accelerator.
Fixed Missing Textures.
2014-02-22 16:14:43 -06:00
AlgorithmX2 bea8f2cc07 Recipe API Update. 2014-02-19 17:33:36 -06:00
AlgorithmX2 49ee4519a8 Fixed Bug: #0160 - Formation Plane does not accept Upgrades 2014-02-18 11:43:57 -06:00
AlgorithmX2 08e6a656b8 Added Basic Quartz and Tool Recipes.
Added Custom Recipes.
2014-02-10 23:51:25 -06:00
AlgorithmX2 4a87ceac4f Recipe Engine Added, not quite done yet tho. 2014-02-09 21:16:36 -06:00
AlgorithmX2 4c790e7335 Portable Cells can get upgrades too! 2014-02-09 14:57:00 -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