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
..
blockstates	pressurizer, part 1	2020-10-13 18:11:40 +02:00
lang	added default "all sides" option which restores the old behavior	2022-07-01 00:05:11 +02:00
models	1.19, part 1	2022-06-27 13:57:06 +02:00
textures	improved the tag filter modifier	2021-03-03 01:56:19 +01:00