PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.4' into 1.21

Browse source 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/cloud/CloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/Soakable.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/TrickCraftingRecipeJsonBuilder.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
This commit is contained in:
Sollace 2024-10-14 18:56:33 +01:00
commit 28b4ca5bf1
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available