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
..
compat/jei	JEI integration	2022-06-27 14:19:51 +02:00
entities	added direction selector system	2022-06-30 16:00:33 +02:00
items	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
misc	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
network	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
packets	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
pipe	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
pressurizer	added direction selector system	2022-06-30 16:00:33 +02:00
terminal	Merge branch '1.18'	2022-07-04 13:17:48 +02:00
PrettyPipes.java	last???? fixes	2021-12-02 23:02:58 +01:00
Registry.java	added direction selector system	2022-06-30 16:00:33 +02:00
Utility.java	1.19, part 1	2022-06-27 13:57:06 +02:00