Merge branch 'mc1.18/dev' into mc1.19/dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -49,6 +49,7 @@ body:
             label: Mod Version
             description: The version of the mod you were using when the bug occured
             options:
+                - "0.5.0f"
                 - "0.5.0e"
                 - "0.5.0d"
                 - "0.5.0c"

src/main/java/com/simibubi/create/foundation/config/CStress.java

@@ -22,7 +22,7 @@ public class CStress extends ConfigBase implements IStressValueProvider {
 
 	@Override
 	protected void registerAll(Builder builder) {
-		builder.comment("", Comments.su, Comments.impact)
+		builder.comment(".", Comments.su, Comments.impact)
 			.push("impact");
 		BlockStressDefaults.DEFAULT_IMPACTS.forEach((r, i) -> {
 			if (r.getNamespace()
@@ -31,7 +31,7 @@ public class CStress extends ConfigBase implements IStressValueProvider {
 		});
 		builder.pop();
 
-		builder.comment("", Comments.su, Comments.capacity)
+		builder.comment(".", Comments.su, Comments.capacity)
 			.push("capacity");
 		BlockStressDefaults.DEFAULT_CAPACITIES.forEach((r, i) -> {
 			if (r.getNamespace()

src/main/java/com/simibubi/create/foundation/config/ConfigBase.java

@@ -110,11 +110,11 @@ public abstract class ConfigBase {
 		public void addComments(Builder builder, String... comment) {
 			if (comment.length > 0) {
 				String[] comments = new String[comment.length + 1];
-				comments[0] = " ";
+				comments[0] = ".";
 				System.arraycopy(comment, 0, comments, 1, comment.length);
 				builder.comment(comments);
 			} else
-				builder.comment(" ");
+				builder.comment(".");
 		}
 
 		public void register(ForgeConfigSpec.Builder builder) {

src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java

@@ -204,11 +204,13 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
 		@SuppressWarnings("deprecation")
 		@Override
 		protected boolean testInternal(FluidStack t) {
-			if (tag == null)
+			if (tag == null) {
 				for (FluidStack accepted : getMatchingFluidStacks())
 					if (accepted.getFluid()
 						.isSame(t.getFluid()))
 						return true;
+				return false;
+			}
 			return t.getFluid().is(tag);
 		}
 

src/main/java/com/simibubi/create/foundation/networking/AllPackets.java

@@ -192,7 +192,7 @@ public enum AllPackets {
 	;
 
 	public static final ResourceLocation CHANNEL_NAME = Create.asResource("main");
-	public static final int NETWORK_VERSION = 1;
+	public static final int NETWORK_VERSION = 2;
 	public static final String NETWORK_VERSION_STR = String.valueOf(NETWORK_VERSION);
 	public static SimpleChannel channel;