Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java
This commit is contained in:
zy committed 2022-09-03 20:20:49 +08:00
commit 9d6c0b4c56
1 file changed
-1
@@ -43,7 +43,6 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable {
ItemStack tis = clickSlot.getStack();
FluidStack fs = Util.getFluidFromItem(tis);
ItemStack itemstack = tis.copy();;
if( fs != null )
{
final AppEngInternalAEInventory inv = this.getFakeFluidInv();