Merge branch 'master' into fix/fluidterminal

This commit is contained in:
Yang Xizhi authored and GitHub committed 2023-01-20 15:29:25 +08:00
commit c5e9b34a5e
19 files changed
+1109 -35

No files matched your search

@@ -1,6 +1,7 @@
package com.glodblock.github.loader;
import static com.glodblock.github.loader.ItemAndBlockHolder.*;
import static net.minecraft.init.Blocks.redstone_torch;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.item.ItemBasicFluidStorageCell;
@@ -142,6 +143,8 @@ public class RecipeLoader implements Runnable {
AE2_CORE_FOM,
'B',
BUCKET));
GameRegistry.addRecipe(new ShapedOreRecipe(
FLUID_LEVEL_EMITTER.stack(), "RPD", 'R', redstone_torch, 'P', AE2_PROCESS_CAL, 'D', "dyeBlue"));
GameRegistry.addRecipe(new ShapedOreRecipe(
LARGE_BUFFER.stack(),
"BGB",