Skip to content

Commit 9485099

Browse files
committed
Merge branch 'base/1.20.4' of https://github.com/PlazmaMC/Thunderbolt into feat/sector-file
2 parents f031ff1 + 08c343f commit 9485099

7 files changed

+48
-4521
lines changed

build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ paperweight {
101101
serverOutputDir = layout.projectDirectory.dir("Thunderbolt-Server")
102102
}
103103

104+
patchTasks.register("mojangApi") {
105+
isBareDirectory = true
106+
upstreamDirPath = "Plazma-MojangAPI"
107+
patchDir = layout.projectDirectory.dir("patches/mojang-api")
108+
outputDir = layout.projectDirectory.dir("Thunderbolt-MojangAPI")
109+
}
110+
104111
patchTasks.register("generatedApi") {
105112
isBareDirectory = true
106113
upstreamDirPath = "paper-api-generator/generated"

gradle.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
group = org.plazmamc.thunderbolt
1+
org.gradle.deamon = true
22
org.gradle.caching = true
33
org.gradle.parallel = true
44
org.gradle.vfs.watch = false
55
org.gradle.jvmargs = -Xmx4G -Dfile.encoding=UTF-8 -Dgraal.CompilerConfiguration=community -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true
66

7+
group = org.plazmamc.thunderbolt
8+
79
version = 1.20.4-R0.1-SNAPSHOT
810
mcVersion = 1.20.4
911
plazmaRef = dev/1.20.4
1012

11-
plazmaCommit = 3852ef88c46a5be0ef6ac4babe80c2b9fbb81067
13+
plazmaCommit = 38c2cfa282974909a61247dbc5eee42a9d87ed90

0 commit comments

Comments
 (0)