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

..

AEFluidStack.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

AEItemDef.java

Fixed Bug: #0210 - Fuzzy on an export bus do not ignore NBT data and metadata.

2014-03-21 22:58:03 -05:00

AEItemStack.java

Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends.

2014-05-29 11:41:47 -05:00

AESharedNBT.java

Fixed Bug: #0210 - Fuzzy on an export bus do not ignore NBT data and metadata.

2014-03-21 22:58:03 -05:00

AEStack.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

ItemList.java

Bad Fuzzy Logic for Non-Damageable Items.

2014-05-21 21:08:13 -05:00

ItemModList.java

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

MeanfulIterator.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

OreHelper.java

Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends.

2014-05-29 11:41:47 -05:00

OreRefrence.java

Fuzzy now supports the ore dictionary again.

2014-02-12 23:24:07 -06:00

SharedSearchObject.java

Ported to 1.7

2014-02-08 19:34:52 -06:00