Commit Graph

109 Commits

Author SHA1 Message Date
AlgorithmX2 6485026235 Matter Cannon Compiles with Changes.
Disabled Paint Balls for now.. not sure I'm going to have the drive to finish that stuff.
2014-06-02 19:32:38 -05:00
AlgorithmX2 384df1c18b Almost compiles again... 2014-06-02 00:37:13 -05:00
AlgorithmX2 8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2 161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2 ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00
AlgorithmX2 6b0fa0f142 Clear Memory Card When Shift Clicking on a non-machine / air.
Fixed Tooltip to properly localize names.
2014-05-25 18:32:16 -05:00
AlgorithmX2 fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2 ec3cb8737a Crafting patterns are not iron nuggets 2014-05-19 23:12:49 -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 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 9f0e31b303 prevent crash with derpy facades. 2014-05-11 17:01:48 -05:00
AlgorithmX2 bd5e80fba1 Facades should use names, not ids. 2014-05-11 11:41:31 -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 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 93aad6c53b Fixed Crash with Extra Utilities.
Items in the ore dictionary values no longer fail to migrate.
Fixed "Meta Overlap detected" error.
Recipes now work with new Materials/Parts.
2014-05-06 12:08:48 -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 b9ef599e13 Network tool can now lock Storage/Conversion Monitors.
Buckets no longer place when trying to insert them into a network via Conversion Monitor.
2014-05-03 02:51:56 -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 8a9136cbb3 Attempt Number two are making config generation consistent. 2014-04-28 15:00:53 -05:00
AlgorithmX2 c72ce5ba06 Prevent Materials from crashing if they are disabled. 2014-04-27 23:50:26 -05:00
AlgorithmX2 f21bf3e9bc Added Basic Restrictions on slots in MAC. 2014-04-24 20:55:29 -05:00
AlgorithmX2 589e2d60d2 Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held ) 2014-04-23 00:30:29 -05:00
AlgorithmX2 85f15e7c06 Pattern Renderer ( for shift ) 2014-04-22 20:36:26 -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 7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2 ee42c53f89 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-06 14:12:52 -05:00
AlgorithmX2 5248eeeace Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup. 2014-04-06 01:55:24 -05:00
AlgorithmX2 97c06db6ef Use ordinal of parts/items as the default meta, allows for holes in the setup but lets default configs be consistent regardless of other mods. 2014-04-06 01:51:44 -05:00
AlgorithmX2 efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2 26b1a2abf9 Fixed Bug: #0267 - Improved Arbitrary rotation? 2014-03-31 22:24:28 -05:00
AlgorithmX2 34b81439f4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-03-29 03:55:11 -05:00
AlgorithmX2 35afab233e Fixed Bug: #0254 - Icon of Crystal Seeds overlapping durability bar 2014-03-29 03:55:02 -05:00
AlgorithmX2 e35924b8fa API Sync. 2014-03-28 13:58:21 -05:00
AlgorithmX2 404cc08128 API"ed the Storage Cell Classes. 2014-03-27 19:48:38 -05:00
AlgorithmX2 2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2 2262df019e Fixed Creative Tab. 2014-03-19 20:33:28 -05:00
AlgorithmX2 06903814ad Added Facade Crafting. 2014-03-15 15:35:00 -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 c0e43fe087 Rename Seed Textures. 2014-03-11 21:26:03 -05: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 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
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 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 1b6e2bd2c3 Entropy Manipulator Can now be dispensed.
Matter Cannon Can now be dispensed.
2014-02-27 01:10:45 -06:00