Skip to content

Commit

Permalink
Merge branch 'base/1.20.4' of https://github.com/PlazmaMC/Thunderbolt
Browse files Browse the repository at this point in the history
…into feat/sector-file
  • Loading branch information
AlphaKR93 committed Feb 28, 2024
2 parents f031ff1 + 08c343f commit 9485099
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 4,521 deletions.
7 changes: 7 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ paperweight {
serverOutputDir = layout.projectDirectory.dir("Thunderbolt-Server")
}

patchTasks.register("mojangApi") {
isBareDirectory = true
upstreamDirPath = "Plazma-MojangAPI"
patchDir = layout.projectDirectory.dir("patches/mojang-api")
outputDir = layout.projectDirectory.dir("Thunderbolt-MojangAPI")
}

patchTasks.register("generatedApi") {
isBareDirectory = true
upstreamDirPath = "paper-api-generator/generated"
Expand Down
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
group = org.plazmamc.thunderbolt
org.gradle.deamon = true
org.gradle.caching = true
org.gradle.parallel = true
org.gradle.vfs.watch = false
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

group = org.plazmamc.thunderbolt

version = 1.20.4-R0.1-SNAPSHOT
mcVersion = 1.20.4
plazmaRef = dev/1.20.4

plazmaCommit = 3852ef88c46a5be0ef6ac4babe80c2b9fbb81067
plazmaCommit = 38c2cfa282974909a61247dbc5eee42a9d87ed90
Loading

0 comments on commit 9485099

Please sign in to comment.