Skip to content

Commit

Permalink
Merge branch '1.20.4' into 1.20.6
Browse files Browse the repository at this point in the history
* 1.20.4:
  Removed forge again

# Conflicts:
#	forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeRegistryEntry.java
#	forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeResourcefulRegistry.java
#	forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ResourcefulRegistriesImpl.java
#	forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java
#	gradle.properties
  • Loading branch information
Faboslav committed Sep 19, 2024
2 parents cb0d76c + 5380f2f commit f5e03de
Show file tree
Hide file tree
Showing 30 changed files with 0 additions and 1,024 deletions.
92 changes: 0 additions & 92 deletions forge/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion forge/gradle.properties

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f5e03de

Please sign in to comment.