Commit Graph

1277 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 ba525621a6 Stop Examining other mods recipes. 2014-06-02 12:01:37 -05:00
AlgorithmX2 a82a03f3b9 IC2 Charging Re-Implemented. 2014-06-02 11:23:47 -05:00
AlgorithmX2 584782ec6e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 01:44:48 -05:00
AlgorithmX2 10939b6001 RF Now only inserts up to the overflow. 2014-06-02 01:33:16 -05:00
AlgorithmX2 8373a33301 Interface now validates if its plan makes sense... 2014-06-02 01:32:38 -05:00
AlgorithmX2 384df1c18b Almost compiles again... 2014-06-02 00:37:13 -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 baf5e66144 inWorldPurification messages split for each item, to improve clarity. 2014-05-31 20:57:20 -05:00
AlgorithmX2 8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2 623e3aa228 Revert "Cable Null checks for EVERYTHING!"
This reverts commit 57d4541418.

This was already resolved - this is a duplicate fix.
2014-05-29 15:01:42 -05:00
AlgorithmX2 e17ac60141 Fixed Bug: #0470 - Incorrect search with russian capital letters 2014-05-29 11:51:07 -05:00
AlgorithmX2 3746c49d49 Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends. 2014-05-29 11:41:47 -05:00
AlgorithmX2 b872ae66c3 Fixed http://ae2.ae-mod.info/Tracker/0475/ 2014-05-29 11:41:29 -05:00
AlgorithmX2 57d4541418 Cable Null checks for EVERYTHING! 2014-05-29 11:40:42 -05:00
AlgorithmX2 e8e97a1c20 Changed "Invalid NBT For CableBus Container" to a warning instead of a exception. 2014-05-27 16:02:15 -05:00
AlgorithmX2 45155caeee Annihilation Plane now drops its buffer. 2014-05-27 15:47:36 -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 ec58bdb879 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-27 12:07:20 -05:00
AlgorithmX2 eb8e8da0a2 Removed Layers from API - I'm sick of people commenting on it. 2014-05-27 12:06:55 -05:00
AlgorithmX2 9b8596dc7c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-26 10:59:03 -05:00
AlgorithmX2 3ac94550e5 Seeds can now be planted via Formation Planes. 2014-05-26 10:58:41 -05:00
AlgorithmX2 161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2 82ac1eb2e7 Add support for Mouse Wheel Event passing to Items. the clean way. 2014-05-26 03:25:17 -05:00
AlgorithmX2 425f144f25 And again! 2014-05-25 20:59:15 -05:00
AlgorithmX2 2f59aa2228 Port Update from rv0 2014-05-25 20:59:04 -05:00
AlgorithmX2 905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -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 cbc2486161 Copy Item Stack before manipulating DSU. 2014-05-25 17:43:42 -05:00
AlgorithmX2 fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2 7b33635c47 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 11:07:18 -05:00
AlgorithmX2 4cf6f4e5f9 Don't Show Energy Cell info if the NBT Came from the client. 2014-05-25 11:06:59 -05:00
AlgorithmX2 bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2 8f474b8baf Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f
Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
2014-05-24 23:55:13 -05:00
AlgorithmX2 baefedc4b8 ME Chest can have its drive removed via automation via the front slot. 2014-05-24 23:49:24 -05:00
AlgorithmX2 a861f09b01 ME Chest insertion behavior fixed.
ME Chest drive slot now properly accessible from front drive face.
ME Chests can now function as tanks. ( fluid cells from extra cells )
ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. )
Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18
2014-05-24 18:25:22 -05:00
AlgorithmX2 aa6d05af2e Fixed a potential crash when picking up items. 2014-05-24 18:23:40 -05:00
AlgorithmX2 1b207a17e9 API Update. 2014-05-24 18:23:23 -05:00
AlgorithmX2 d5cfa12f76 Added Energy Cells Charge levels to Waila 2014-05-24 18:22:50 -05:00
AlgorithmX2 397dbe8d10 Added Next button.
Added text for Amount gui.
2014-05-24 16:16:22 -05:00
AlgorithmX2 82a8e2d045 Fixed http://openeye.openmods.info/crashes/df3cca6850f2c037b6adb8d8d641b22f
Improved Exception for http://openeye.openmods.info/crashes/d2df850ad1915a015a80f9f7cef56ac3
Improved Exception for http://openeye.openmods.info/crashes/c8a3f70288f017726c5acd09ea91a2b0
2014-05-24 11:02:24 -05:00
AlgorithmX2 5f21711204 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-24 10:40:16 -05:00
AlgorithmX2 6e1a0aabb6 Server doesn't have noTesr Tiles. 2014-05-24 10:29:45 -05:00
AlgorithmX2 f5976e7b1d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-23 23:23:15 -05:00
AlgorithmX2 832c4ecdb9 Only show crafting/stored/both where applicable. 2014-05-23 23:21:10 -05:00
AlgorithmX2 bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" 2014-05-23 23:20:56 -05:00
AlgorithmX2 26dcae3f9b Send Crafting Gui Packet to open second gui. 2014-05-23 20:35:27 -05:00
AlgorithmX2 ea936d3b72 Null classes are bad umm kay. 2014-05-23 15:51:25 -05:00