Ell 69fa29aa46 Merge branch '1.18' ... # Conflicts: # build.gradle # src/main/java/de/ellpeck/prettypipes/Registry.java # src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java # src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java # src/main/java/de/ellpeck/prettypipes/terminal/containers/CraftingTerminalGui.java # src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java		2022-07-04 13:17:48 +02:00
..
java/de/ellpeck/prettypipes	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
resources	Merge branch '1.18'	2022-07-04 13:17:48 +02:00