tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
697 commits 7 branches 98 tags 24 MiB
Commit graph

697 commits

This branch
This branch
All branches
Author SHA1 Message Date
AlgorithmX2 f6d7762725 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	items/tools/powered/ToolMassCannon.java
 2014-06-04 23:05:22 -05:00
AlgorithmX2 1ab7f7c110 Ditch AABBPool 2014-06-04 22:59:56 -05:00
AlgorithmX2 ea52fb5ebc Some more crafting work. 2014-06-04 22:54:01 -05:00
AlgorithmX2 141be04aaf about 5 minutes of work... 2014-06-04 19:47:13 -05:00
AlgorithmX2 faad4a6ba2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-04 00:07:57 -05:00
AlgorithmX2 f894d48328 Add resistance to MultiItems to prevent crashes from invalid stacks. 2014-06-04 00:07:36 -05:00
AlgorithmX2 286baaa0a5 Fied Bug: #0482 - Class not found (asm) on build 16 & 17 2014-06-04 00:06:20 -05:00
AlgorithmX2 ba761aaa29 Improved Part API Errors. 2014-06-04 00:02:57 -05:00
AlgorithmX2 98f0e59b67 Begun work on the crafting memory / tree 2014-06-03 23:37:47 -05:00
AlgorithmX2 883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2 885bdbf9d5 More intelligent funneling demand. 2014-06-03 20:33:04 -05:00
AlgorithmX2 09ef3cc231 Protect AE2 from BC's shenanigans. 2014-06-03 20:32:33 -05:00
AlgorithmX2 e6c80df3c8 Added support for parts too. 2014-06-03 13:00:10 -05:00
AlgorithmX2 653bb475f9 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-06-03 12:09:41 -05:00
AlgorithmX2 fede238251 Formation Planes can now Place Heads. 2014-06-03 12:08:33 -05:00
AlgorithmX2 95ebaa439e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 08:50:41 -05:00
AlgorithmX2 a71d8047b4 Hide getManager(ItemStack itemStack) from non IC2 Code. 2014-06-03 08:39:46 -05:00
AlgorithmX2 d28af7d3a7 removed for now. 2014-06-02 21:05:37 -05:00
AlgorithmX2 fe74989563 Keep Search when switching between crafting and normal view. 2014-06-02 21:04:47 -05:00
AlgorithmX2 a1af4443b7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 19:32:51 -05:00
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