Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev

# Conflicts:
#	.github/workflows/label_issues.yml

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,41 @@
+name: I found a bug!
+description: "Report some other kind of issue. You should ask in the Discord first to make sure it's actually a bug with Create."
+labels: [ "type: bug" ]
+body:
+    -   type: textarea
+        attributes:
+            label: Description
+            description: "
+            Please describe the issue with as much detail as possible.
+            Explain what happened, and what should have happened instead.
+            Add images, screenshots, or videos if they could be useful."
+        validations:
+            required: true
+
+    -   type: input
+        attributes:
+            label: Game Log
+            description: "
+            We need the game log for additional information about the bug.
+            This file can be found in the \"logs\" folder of your Minecraft folder as \"latest.log\".
+            Please upload the file to https://mclo.gs/ and put the link here.
+            Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
+            "
+        validations:
+            required: true
+
+    -   type: textarea
+        attributes:
+            label: Debug Information
+            description: "
+            Please run the \"/create debuginfo\" command in-game.
+            This will copy useful information to your clipboard that will greatly help with debugging.
+            Please paste this information here.
+            If this command does not exist, you can skip this part.
+            "
+        validations:
+            required: false
+
+    -   type: markdown
+        attributes:
+            value: "Thank you for taking the time to make a report and help improve Create!"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+    - name: I have a question!
+      url: https://discord.gg/hmaD7Se
+      about: Join us on Discord and ask the community.
+    - name: I have a suggestion or idea!
+      url: https://discord.gg/hmaD7Se
+      about: These are best discussed with the community and submitted on Discord.
+    - name: Talk to us on Discord.
+      url: https://discord.gg/hmaD7Se
+      about: Ask questions and get help from the community.

.github/ISSUE_TEMPLATE/crash.yml

@@ -0,0 +1,27 @@
+name: My game crashed!
+description: Report an issue that crashes the game.
+labels: [ "type: crash" ]
+body:
+    -   type: textarea
+        attributes:
+            label: Context
+            description: What were you doing when the game crashed? Add images, screenshots, or videos if they could be useful.
+        validations:
+            required: true
+
+    -   type: input
+        attributes:
+            label: Crash Report
+            description: "
+            We need the crash report to figure out why the crash happened.
+            This file can be found in the \"crash-reports\" folder of your Minecraft folder.
+            It will be the newest file there.
+            Please upload the file to https://mclo.gs/ and put the link here.
+            Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
+            "
+        validations:
+            required: true
+
+    -   type: markdown
+        attributes:
+            value: "Thank you for taking the time to make a report and help improve Create!"

build.gradle

@@ -233,43 +233,6 @@ jar {
     }
 }
 
-tasks.register("createStubJar") {
-    outputs.upToDateWhen { false }
-
-    ByteArrayOutputStream byteStream = new ByteArrayOutputStream()
-    JarOutputStream jarStream = new JarOutputStream(byteStream)
-
-    try {
-        File fabricModJson = file("$projectDir/stubMod/fabric.mod.json")
-        if (fabricModJson.exists()) {
-            String content = fabricModJson.text.replace('${version}', mod_version)
-            jarStream.putNextEntry(new JarEntry("fabric.mod.json"))
-            jarStream.write(content.bytes)
-            jarStream.closeEntry()
-        } else {
-            throw new FileNotFoundException("Warning: fabric.mod.json not found at ${fabricModJson.path}")
-        }
-    } finally {
-        jarStream.close()
-    }
-
-    File baseDir = file("$projectDir/build/stub")
-    baseDir.mkdirs()
-    File outputFile = file("$baseDir/create-stub-${mod_version}.jar")
-    outputFile.withOutputStream { os ->
-        byteStream.writeTo(os)
-    }
-
-    outputs.file(outputFile)
-
-    println "Stub jar created at: ${outputFile.path}"
-}
-
-tasks.remapJar.configure {
-    dependsOn tasks.createStubJar
-    tasks.remapJar.nestedJars.from(createStubJar.outputs)
-}
-
 // see gradle/publishing.gradle for publishing
 apply from: "gradle/publishing/publishing.gradle"
 apply from: "gradle/compat/compat.gradle"

src/main/java/com/simibubi/create/compat/emi/recipes/basin/BasinEmiRecipe.java

@@ -67,7 +67,7 @@ public void addWidgets(WidgetHolder widgets) {
 
 		for (int i = 0; i < inputSize; i++) {
 			EmiIngredient stack = input.get(i);
-			addSlot(widgets, stack, xOff + 16 + (i % 3) * 19, yOff + 50 + (i / 3) * 19);
+			addSlot(widgets, stack, xOff + 16 + (i % 3) * 19, yOff + 50 - (i / 3) * 19);
 		}
 
 		for (int i = 0; i < outputSize; i++) {

src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java

@@ -46,6 +46,7 @@
 import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.material.FlowingFluid;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.AABB;
@@ -188,6 +189,8 @@ private boolean provideFluidToSpace(FluidStack fluid, TransactionContext ctx) {
 			return false;
 		if (fluid.isEmpty())
 			return false;
+		if (!(fluid.getFluid() instanceof FlowingFluid))
+			return false;
 		if (!FluidHelper.hasBlockState(fluid.getFluid()) || fluid.getFluid().is(Milk.MILK_FLUID_TAG)) // fabric: milk logic is different
 			return true;