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

87 commits

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
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
0c4e285f9d Added NEI Recipe for Charged Quartz. 2014-06-08 16:24:21 -05:00
AlgorithmX2
03330d02ba Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-06 21:10:26 -05:00
AlgorithmX2
a50505fed6 Fixed Bug: #0431 - Weird Inventory behaviour in SkyChests with InvTweaks 2014-06-06 21:04:59 -05:00
AlgorithmX2
faad4a6ba2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-04 00:07:57 -05:00
AlgorithmX2
286baaa0a5 Fied Bug: #0482 - Class not found (asm) on build 16 & 17 2014-06-04 00:06:20 -05:00
AlgorithmX2
883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2
09ef3cc231 Protect AE2 from BC's shenanigans. 2014-06-03 20:32:33 -05:00
AlgorithmX2
a1af4443b7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 19:32:51 -05:00
AlgorithmX2
ba525621a6 Stop Examining other mods recipes. 2014-06-02 12:01:37 -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
ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00
AlgorithmX2
cbc2486161 Copy Item Stack before manipulating DSU. 2014-05-25 17:43:42 -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
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
26540869ba removed dead code. 2014-05-22 21:41:35 -05:00
AlgorithmX2
f0ad27c5f3 Fixed http://openeye.openmods.info/crashes/64eb336042aeeec45dfd13edd30de8a6 
Fixed http://openeye.openmods.info/crashes/bbefcf763be5224e4667519cf6c95933
 2014-05-22 09:20:59 -05:00
AlgorithmX2
f4706d6612 Fixed Issue with NEI Grindstone Plugin pulling up the inscriber instead of the grindstone. 2014-05-21 22:35:40 -05:00
AlgorithmX2
0b04d2853e Add backwards support for MJ5 ( from MJ6 ) 
Add another try catch facade test...
 2014-05-20 22:06:37 -05:00
AlgorithmX2
2ee583cf8e Protect from NEI Crashes. 2014-05-18 21:36:08 -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
f4e685a0e8 Fix Crashes for MJ5. 
Disable MJ6
 2014-05-11 17:01:31 -05:00
AlgorithmX2
be645f3e2f MJ 6 + MJ 5 Integration. 2014-05-11 16:13:37 -05:00
AlgorithmX2
ce561ffbe3 Merge in Builder support. 2014-05-11 13:48:14 -05:00
AlgorithmX2
02ace8145f Current for BC 6.0.12 release 2014-05-11 13:31:25 -05:00
AlgorithmX2
9ad9c7b370 Added BC 6x support for facades and added builder support. 2014-05-11 11:28:34 -05:00
AlgorithmX2
1f126054e4 Moved NEI Helpers. 2014-05-11 11:27:32 -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
5bf8e9d7d0 Updated RF Api ( should work for old api too - at least temporary ). 2014-05-06 18:09:31 -05:00
AlgorithmX2
e1c6b18399 Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly. 2014-05-03 19:21:33 -05:00
AlgorithmX2
da764470a4 Use Cable from EiO to attune redstone flux. 2014-05-02 00:22:22 -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
5bacb015e5 Ported, but did not enable GT 1.7 2014-05-01 21:50:04 -05:00
AlgorithmX2
40de3da454 Added Railcraft Integration. 2014-05-01 21:49:19 -05:00
AlgorithmX2
9238a530bb Added World and Grindstone NEI Plugins. 2014-05-01 00:32:58 -05:00
AlgorithmX2
4a2c7c2710 Fixed issue with NEI and font size. 
Added Crafting Terminal Integration for NEI.
Added Inscriber Recipe Plugin for NEI.
 2014-04-30 23:01:22 -05:00
AlgorithmX2
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
327c1d4118 Ported FMP Support to 1.7. 2014-04-10 14:52:17 -05:00
AlgorithmX2
14f93f66f6 Moved NEI Check to constructor. 2014-04-06 03:20:30 -05:00
AlgorithmX2
0036e050ca Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-06 01:55:36 -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
86c2ad49ee Removed Facade Creative Tab when they are disabled. 
Added Sky Stone to BC's Facades.
 2014-04-04 10:46:05 -05:00
AlgorithmX2
5571467f20 Added Basic NEI Support 2014-04-04 00:17:20 -05:00
AlgorithmX2
27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00