9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

Merge branch 'ver/1.21.7' into dev/rework

# Conflicts:
#	divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch
#	divinemc-server/minecraft-patches/features/0008-Misc-Optimizations.patch
#	divinemc-server/minecraft-patches/features/0021-Verify-Minecraft-EULA-earlier.patch
#	divinemc-server/minecraft-patches/features/0037-Configurable-MC-67.patch
#	divinemc-server/minecraft-patches/features/0049-Option-to-disable-disconnect.spam.patch
#	divinemc-server/minecraft-patches/features/0066-Virtual-Threads.patch
#	divinemc-server/minecraft-patches/features/0078-SparklyPaper-Parallel-world-ticking.patch
#	divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
#	divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
#	gradle.properties
This commit is contained in:
NONPLAYT
2025-07-13 17:50:36 +03:00
4 changed files with 4 additions and 4 deletions

View File

@@ -3,7 +3,7 @@ name: Build DivineMC 1.21.7
on:
push:
branches:
- "master"
- "ver/1.21.7"
workflow_dispatch:
jobs:

View File

@@ -2,7 +2,7 @@ name: Build Pull Request
on:
pull_request:
branches: [ "master" ]
branches: [ "ver/1.21.7" ]
jobs:
build:

View File

@@ -2,7 +2,7 @@ name: Publish API
on:
push:
branches: [ "master" ]
branches: [ "ver/1.21.7" ]
workflow_dispatch:
jobs:

View File

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
version=1.21.7-R0.1-SNAPSHOT
mcVersion=1.21.7
purpurRef=11c030a8f81b2f845a9f2749790692c2d152f284
purpurRef=c4e5604ca8e4a36d24f4eaa90de7fee768fb60b7
experimental=false
org.gradle.configuration-cache=true