Commit graph

28 commits

Author SHA1 Message Date
AlgorithmX2
215c097506 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-25 23:02:22 -05:00
AlgorithmX2
27772725d8 MC .10 compatibility patch. 2014-06-24 20:19:42 -05:00
AlgorithmX2
6a11d18e32 compile on .10 2014-06-24 17:58:14 -05:00
AlgorithmX2
ff9a10b926 Crafting is virtually working 100% 2014-06-22 02:00:38 -05:00
AlgorithmX2
1632d2d72e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
AlgorithmX2
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
ed85b174c6 Fuzzy no longer matches ore dictionary less items as the same.
aka Bug: #0534 - Import Bus with Fuzzy Card does not work with damaged items
2014-06-13 13:42:38 -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
3746c49d49 Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends. 2014-05-29 11:41:47 -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
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
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
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
b86fb56999 Fixed invalid Orientation.
Improved Logging for render mismatch.
2014-03-22 13:27:44 -05:00
AlgorithmX2
0bfded7bbf Fixed Bug: #0210 - Fuzzy on an export bus do not ignore NBT data and metadata.
Fixed Serious issue with items with the same hashes merging.
2014-03-21 22:58:03 -05:00
AlgorithmX2
cf6b0986fc Fortify ItemLists. 2014-02-21 14:36:40 -06:00
AlgorithmX2
7f773f0d2b Fuzzy now supports the ore dictionary again. 2014-02-12 23:24:07 -06:00
AlgorithmX2
d50c7f6312 Ported to 1.7 2014-02-08 19:34:52 -06:00
AlgorithmX2
e79e866417 Adjusted Terminal Packet Limits.
Fixed random errors thrown when FMP is installed.
Finished Crafting Terminal Basic Features.
2014-02-05 01:25:44 -06:00
AlgorithmX2
ee99dce791 Removed All Incomplete Items From Build.
Fixed Security GUI leaking into other Guis.
Fixed Bug in AE Fluid Stacks.
Fixed Power Drain in Matter Cannon if there is no ammo.
Fixed Not being able to store empty storage cells in Portable Cell.
Fixed Red Background on Upgrade Slots.
2014-02-01 12:13:12 -06:00
AlgorithmX2
e134a9806b Add packet read methods for API. 2014-01-31 16:26:08 -06:00
AlgorithmX2
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00
AlgorithmX2
88bb735ed8 Fixed Weird fuzzy business 2014-01-06 00:55:16 -06:00
AlgorithmX2
ef4efd5ce0 isFluid/isItem 2014-01-05 02:45:29 -06:00
AlgorithmX2
ef86454c44 Speed boost for NBT / AE Items. 2014-01-01 03:03:00 -06:00
AlgorithmX2
e733df5448 new comparison methods. 2013-12-28 14:55:31 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00