Merge branch '1.20.1'

# Conflicts: # common/src/main/resources/assets/friendsandfoes/lang/zh_cn.json
Faboslav · Oct 21, 2023 · 118cb64 · 118cb64
2 parents 3fefcad + 12540ea
commit 118cb64
Show file tree

Hide file tree

Showing 38 changed files with 2,665 additions and 649 deletions.
diff --git a/.github/assets/images/icons/rascal.png b/.github/assets/images/icons/rascal.png
diff --git a/.github/versions.json b/.github/versions.json
@@ -1,11 +1,11 @@
 {
-	"1.20.1": "1.9.7",
-	"1.20": "1.9.7",
-	"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.20.1": "1.9.8",
+	"1.20": "1.9.8",
+	"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"

diff --git a/Makefile b/Makefile
@@ -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
diff --git a/blockbench/rascal/Rascal.bbmodel b/blockbench/rascal/Rascal.bbmodel