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

715 commits

This branch
This branch
All branches
Author SHA1 Message Date
AlgorithmX2
652d2e6018 Also Cables no longer glow in the dark :P 
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
 2014-06-08 21:13:53 -05:00
AlgorithmX2
76de1cf185 Item Tunnels now cycle Outputs. 2014-06-08 18:54:38 -05:00
AlgorithmX2
3d8a129531 Fixed Bug: #0518 - Using the WAT and switch via quickslots closes WAT GUI 2014-06-08 18:10:25 -05:00
AlgorithmX2
8dcf25a652 Fixed a bug where RF and IC2 tunnels could vaporize them selves. 
Fixed Bug: #0514 - An unknown error occurs frequently
 2014-06-08 18:10:19 -05:00
AlgorithmX2
a1acc1d2d3 More NEI Shinanigans. 2014-06-08 17:30:17 -05:00
AlgorithmX2
0c4e285f9d Added NEI Recipe for Charged Quartz. 2014-06-08 16:24:21 -05:00
AlgorithmX2
fbe4eebe17 Prioritize powered networks, fixes a glitch with tunnels connecting. 2014-06-08 11:26:33 -05:00
AlgorithmX2
44986692ef Pattern progress. 2014-06-08 11:25:46 -05:00
AlgorithmX2
87bd8f3c22 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-07 23:29:57 -05:00
AlgorithmX2
009417ca4f Adjusted Block Hardness. 
Test Tools with getHarvestLevel
 2014-06-07 20:20:23 -05:00
AlgorithmX2
50541cebe6 Meteorites can no generate much taller craters and expand their view of the world as blocks are destroyed so they can keep enlarging up to the max height limit. 2014-06-07 19:51:08 -05:00
AlgorithmX2
14aba981b2 Tweaked Energy Flow Code for Network Acceptor, should be more what I'm looking for. 2014-06-07 19:23:31 -05:00
AlgorithmX2
03330d02ba Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-06 21:10:26 -05:00
AlgorithmX2
9ae4ce54d1 Energy Acceptor can now accept RF into the network buffer. 2014-06-06 21:08:14 -05:00
AlgorithmX2
a50505fed6 Fixed Bug: #0431 - Weird Inventory behaviour in SkyChests with InvTweaks 2014-06-06 21:04:59 -05:00
AlgorithmX2
41f30edb5b Don't update tiles/blocks on world unload. 2014-06-06 00:17:45 -05:00
AlgorithmX2
6646f7c7f0 No more duplicate patterns in meteorites. 2014-06-05 23:51:37 -05:00
AlgorithmX2
3b394face2 More work on crafting calculations. 2014-06-05 23:26:01 -05:00
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