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

626 commits

This branch
This branch
All branches
Author SHA1 Message Date
AlgorithmX2 ef4cab8f61 Storage grid can now properly see crafting grid. 2014-05-22 21:42:27 -05:00
AlgorithmX2 168309ee50 Fixed Outputs for non-crafting Patterns. 2014-05-22 21:41:54 -05:00
AlgorithmX2 26540869ba removed dead code. 2014-05-22 21:41:35 -05:00
AlgorithmX2 e47bc5965d Update interface crafting lists. 2014-05-22 21:41:24 -05:00
AlgorithmX2 e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo 2014-05-22 21:41:09 -05:00
AlgorithmX2 5f5fc4cee1 Fixed Crafting MB Names. 2014-05-22 21:39:21 -05:00
AlgorithmX2 01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
 2014-05-22 18:49:02 -05:00
AlgorithmX2 15aa825d30 Added Comments for Enum Settings. 
Added Comment for wireless equation.
Removed Alpha Migration Option.
 2014-05-22 16:29:10 -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 e27bb272cf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-21 21:09:38 -05:00
AlgorithmX2 cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2 459239bfba Storage Buses no update their filters when their upgrades change. 2014-05-21 21:09:13 -05:00
AlgorithmX2 a8a4476e8e Fixed issue with ore cache, should now properly contain all the options instead of just the current item. 2014-05-21 21:08:38 -05:00
AlgorithmX2 569ed2f99e Bad Fuzzy Logic for Non-Damageable Items. 2014-05-21 21:08:13 -05:00
AlgorithmX2 6f8a367192 WTF is java making this stupid class for! 2014-05-21 13:24:58 -05:00
AlgorithmX2 cb0a450853 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-21 09:44:02 -05:00
AlgorithmX2 0f781cebba Sided TIlehash should make order matter. 2014-05-21 09:43:41 -05:00
AlgorithmX2 269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2 dc0c015a97 Fix NPE. 2014-05-20 22:06:48 -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 0e59831fd6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 09:50:10 -05:00
AlgorithmX2 80428aec4e Fixed Bug: #0445 - ASM Migration 2014-05-20 09:38:29 -05:00
AlgorithmX2 7a3f2dcf5a Don't call Grid cache updates if the grid is empty. 2014-05-20 09:37:53 -05:00
AlgorithmX2 db8c29a9b4 Pattern registration still a work in progress. 2014-05-19 23:13:43 -05:00
AlgorithmX2 fa1feff8f0 Added View Button ( dosn't work ) 2014-05-19 23:13:25 -05:00
AlgorithmX2 24e76e5a88 Crafting Cache Registered and added events. 2014-05-19 23:13:12 -05:00
AlgorithmX2 ec3cb8737a Crafting patterns are not iron nuggets 2014-05-19 23:12:49 -05:00
AlgorithmX2 bd926374db Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-18 21:42:43 -05:00
AlgorithmX2 2cf84989d1 IC2 Double Buffer Approach. 2014-05-18 21:36:32 -05:00
AlgorithmX2 37d7675ad7 Darn it Power tunnels need power too! 2014-05-18 21:36:21 -05:00
AlgorithmX2 2ee583cf8e Protect from NEI Crashes. 2014-05-18 21:36:08 -05:00
AlgorithmX2 68993534d9 Slowly working towards crafting. 
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
 2014-05-18 20:05:03 -05:00
AlgorithmX2 440ac95dc4 Change Tooltip for clear button in Crafting Terminal. 2014-05-18 14:53:18 -05:00
AlgorithmX2 c35faabfd8 Fixed Bug: #0436 - Fluid Tunnels don't require Power 
Fixed bug where fluid tunnels would not function properly.
 2014-05-18 14:44:58 -05:00
AlgorithmX2 b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2 8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 21:43:11 -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 d10e7ee6df Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 09:35:56 -05:00
AlgorithmX2 cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. 2014-05-15 09:34:38 -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 f87e7a4ee8 Fixed Right Click Terminal Slots. 2014-05-13 23:33:48 -05:00
AlgorithmX2 322b0a7da7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-13 21:57:17 -05:00
AlgorithmX2 974a41eabb Solved the mystery of the broken lighting. 2014-05-13 21:56:57 -05:00
AlgorithmX2 6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -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 62aa5c4175 Minor derp. 2014-05-12 23:28:29 -05:00
AlgorithmX2 14b7fe8a42 Add better custom security features. 2014-05-12 23:15:46 -05:00
AlgorithmX2 ff12aa1673 Added Shit+Mouse wheel to pick up / drop items. 
Added Partial ItemStack packets to report to the server what itemstack is the target of interation.
Fixed Repairing Items in CraftingTerminal.
 2014-05-12 23:11:19 -05:00
AlgorithmX2 9ba6f195fd Removed Logging from BC Tunnel. 2014-05-12 21:20:22 -05:00