Merge remote-tracking branch 'upstream/main' into patch-37

# Conflicts:
#	src/client/java/minicraft/gfx/Color.java

src/client/java/minicraft/gfx/Color.java

@@ -56,8 +56,10 @@ public class Color {
 	// Set the color before the last color code; if the last code is: RESET or unset: no operation; REDO: RESET.
 	public static final String REDO_CODE = COLOR_CHAR + "\u0003\u0000\u0000\u0000";
 
-	/** This returns a minicraftrgb.
-	 * a should be between 0-1, r,g,and b should be 0-255 */
+	/**
+	 * This returns a minicraftrgb.
+	 * a should be between 0-1, r,g,and b should be 0-255
+	 */
 	public static int get(int a, int r, int g, int b) {
 		return (a << 24) + (r << 16) + (g << 8) + (b);
 	}