Skip to content

Commit

Permalink
Merge branch '1.19.3' into 1.19.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/versions.json
#	common/src/main/java/com/faboslav/friendsandfoes/client/render/entity/renderer/PlayerIllusionEntityRenderer.java
#	common/src/main/java/com/faboslav/friendsandfoes/entity/CopperGolemEntity.java
#	common/src/main/java/com/faboslav/friendsandfoes/entity/TuffGolemEntity.java
  • Loading branch information
Faboslav committed Oct 21, 2023
2 parents 3695649 + 117e277 commit 2785cb8
Show file tree
Hide file tree
Showing 38 changed files with 2,665 additions and 648 deletions.
Binary file added .github/assets/images/icons/rascal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions .github/versions.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"1.19.4": "1.8.9",
"1.19.3": "1.8.9",
"1.19.2": "1.8.9",
"1.19.1": "1.8.9",
"1.19": "1.8.9",
"1.19.4": "1.8.10",
"1.19.3": "1.8.10",
"1.19.2": "1.8.10",
"1.19.1": "1.8.10",
"1.19": "1.8.10",
"1.18.2": "1.4.8",
"1.18.1": "1.2.5",
"1.18": "1.2.5"
Expand Down
14 changes: 13 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@ clean-cache: ## Cleans cache
./gradlew clean

gen-sources: ## Generate sources
./gradlew genSources
./gradlew genSources

run-fabric-client: ## Runs fabric client
./gradlew fabric:runClient

run-forge-client: ## Runs forge client
./gradlew forge:runClient

run-fabric-server: ## Runs fabric server
./gradlew fabric:runServer

run-forge-server: ## Runs forge server
./gradlew forge:runServer
2 changes: 1 addition & 1 deletion blockbench/rascal/Rascal.bbmodel

Large diffs are not rendered by default.

Loading

0 comments on commit 2785cb8

Please sign in to comment.