embeddedt 922d0f26e1 Use same merge mode as default Spark		2023-06-27 11:01:17 -04:00
..
java/org/embeddedt/modernfix	Use same merge mode as default Spark	2023-06-27 11:01:17 -04:00
resources	Add Mod Menu compatibility	2023-05-04 10:08:58 -04:00