Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: Anvilcraft:613fd90e023db6fb2dbcffa183a99f8ce7112068
Branches Tags
Anvilcraft:master
..
compare: Anvilcraft:8b6e17fe4e9ab5289ea214a70fe7d4da117f4d43
Branches Tags
Anvilcraft:master

No commits in common. "613fd90e023db6fb2dbcffa183a99f8ce7112068" and "8b6e17fe4e9ab5289ea214a70fe7d4da117f4d43" have entirely different histories.
613fd90e02 ... 8b6e17fe4e

2 changed files with 2 additions and 6 deletions
Show stats Expand all files Collapse all files

2
build.gradle
View file

@ -42,7 +42,7 @@ repositories {
}*/ }*/
} }
dependencies { dependencies {
implementation "com.github.GTNewHorizons:NotEnoughItems:2.3.39-GTNH:dev" implementation "com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev"
implementation "com.github.GTNewHorizons:waila:master-SNAPSHOT:dev" implementation "com.github.GTNewHorizons:waila:master-SNAPSHOT:dev"
// implementation "mozeintel:ProjectE:1.7.10-PE1.10.1" // implementation "mozeintel:ProjectE:1.7.10-PE1.10.1"

6
src/main/java/com/pahimar/ee3/util/TransmutationHelper.java
View file

@ -44,11 +44,7 @@ public class TransmutationHelper {
if (currentBlock != null) { if (currentBlock != null) {
meta = currentBlock.damageDropped(meta); meta = currentBlock.damageDropped(meta);
TransmutationHelper.currentBlockStack = new ItemStack(currentBlock, 1, meta); TransmutationHelper.currentBlockStack = new ItemStack(currentBlock, 1, meta);
if (TransmutationHelper.currentBlockStack.getItem() == null) { if (TransmutationHelper.previousBlockStack == null) {
TransmutationHelper.targetBlockStack = null;
TransmutationHelper.currentBlockStack = null;
TransmutationHelper.previousBlockStack = null;
} else if (TransmutationHelper.previousBlockStack == null) {
TransmutationHelper.previousBlockStack TransmutationHelper.previousBlockStack
= TransmutationHelper.currentBlockStack; = TransmutationHelper.currentBlockStack;
TransmutationHelper.targetBlockStack = getNextBlock( TransmutationHelper.targetBlockStack = getNextBlock(