forked from AntiqueAtlasTeam/AntiqueAtlas
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/1.20' into 1.21
# Conflicts: # build.gradle # gradle.properties # libs.versions.toml
- Loading branch information
Showing
12 changed files
with
193 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,24 @@ | ||
[*] | ||
indent_size = 4 | ||
indent_style = space | ||
indent_style = tab | ||
tab_width = 4 | ||
insert_final_newline = true | ||
|
||
[*.yml] | ||
indent_size = 2 | ||
indent_style = space | ||
|
||
[*.java] | ||
ij_java_block_brace_style = end_of_line | ||
ij_java_lambda_brace_style = end_of_line | ||
ij_java_method_brace_style = end_of_line | ||
ij_java_names_count_to_use_import_on_demand = 999 | ||
|
||
[{*.gant,*.groovy,*.gy}] | ||
[{*.gant,*.groovy,*.gy,*.gradle}] | ||
ij_groovy_block_brace_style = end_of_line | ||
ij_groovy_class_brace_style = end_of_line | ||
ij_groovy_lambda_brace_style = end_of_line | ||
ij_groovy_method_brace_style = end_of_line | ||
|
||
[{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}] | ||
indent_size = 2 | ||
ij_json_array_wrapping = split_into_lines |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
name: Build | ||
|
||
on: [ push, pull_request ] | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: Setup jdk | ||
uses: actions/setup-java@v4 | ||
with: | ||
java-version: 21 | ||
distribution: 'temurin' | ||
|
||
- name: Setup Gradle | ||
uses: gradle/actions/setup-gradle@v3 | ||
with: | ||
validate-wrappers: true | ||
|
||
- name: Run datagen with Gradle | ||
run: ./gradlew runDatagen | ||
|
||
- name: Build with Gradle | ||
run: ./gradlew build | ||
|
||
- name: capture build artifacts | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: Artifacts | ||
path: build/libs/ |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,26 @@ | ||
# Gradle Properties | ||
# Gradle | ||
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 | ||
org.gradle.caching=true | ||
org.gradle.parallel=true | ||
org.gradle.caching.debug=false | ||
org.gradle.configureondemand=true | ||
# Enable advanced multi-module optimizations (share tiny-remaper instance between projects) | ||
# Loom | ||
fabric.loom.multiProjectOptimisation=true | ||
# Mod Properties | ||
baseVersion = 2.9.13 | ||
defaultBranch = 1.20 | ||
branch = 1.21 | ||
# Mod Metadata | ||
group=folk.sisby | ||
user=sisby-folk | ||
slug=antique-atlas | ||
modrinthSlug=antique-atlas-4 | ||
modId=antique_atlas | ||
modName=Antique Atlas | ||
modDescription=A hand-drawn world map with biomes, structures, waypoints, and less! | ||
authors=Hunternif, tyra314, Sisby folk | ||
contributors=Kenkron, asiekierka, Haven King, TheCodeWarrior, osipxd, coolAlias, TehNut, lumiscosity, frodolon | ||
license=LGPL-3.0-or-later | ||
# Mod Version | ||
baseVersion=2.9.14 | ||
# Branch Metadata | ||
branch=1.20 | ||
tagBranch=1.21 | ||
compatibleVersions=1.21, 1.21.1 | ||
compatibleLoaders=fabric, quilt, neoforge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,28 @@ | ||
[versions] | ||
loom = "1.7.+" | ||
githubRelease = "2.4.1" | ||
minotaur = "2.6.0" | ||
minotaur = "2.+" | ||
|
||
kaleidoConfig = "0.3.1+1.3.2" | ||
|
||
mc = "1.21" | ||
fl = "0.15.11" | ||
yarn = "1.21+build.2" | ||
fapi = "0.100.3+1.21" | ||
kaleidoConfig = "0.3.1+1.3.1" | ||
surveyor = "0.6.21+1.21" | ||
yarn = "1.21+build.9" | ||
fapi = "0.102.0+1.21" | ||
|
||
surveyor = "0.6.22+1.21" | ||
|
||
[plugins] | ||
loom = { id = "fabric-loom", version.ref = "loom" } | ||
githubRelease = { id = "com.github.breadmoirai.github-release", version.ref = "githubRelease" } | ||
minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" } | ||
|
||
[libraries] | ||
kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" } | ||
|
||
mc = { group = "mojang", name = "minecraft", version.ref = "mc" } | ||
fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" } | ||
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" } | ||
fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" } | ||
kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" } | ||
|
||
surveyor = { group = "folk.sisby", name = "surveyor", version.ref = "surveyor" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
modLoader = "javafml" | ||
loaderVersion = "[4,)" | ||
license = "${license}" | ||
issueTrackerURL = "${issues}" | ||
|
||
[[mods]] | ||
modId = "${modId}" | ||
version = "${version}" | ||
displayName = "${modName}" | ||
description = '''${modDescription}''' | ||
authors = "${members}" | ||
displayURL = "${homepage}" | ||
logoFile = "assets/${modId}/icon.png" | ||
|
||
[properties] | ||
"connector:placeholder" = true | ||
|
||
[[dependencies.${ modId }]] | ||
modId = "connectormod" | ||
mandatory = true | ||
versionRange = "*" | ||
ordering = "NONE" | ||
side = "BOTH" | ||
|
||
[[dependencies.${ modId }]] | ||
modId = "forge" | ||
mandatory = true | ||
versionRange = "*" | ||
ordering = "NONE" | ||
side = "BOTH" | ||
|
||
[[dependencies.${ modId }]] | ||
modId = "minecraft" | ||
mandatory = true | ||
versionRange = "[${mc},)" | ||
ordering = "NONE" | ||
side = "BOTH" | ||
|
||
[[dependencies.${ modId }]] | ||
modId = "fabric_api" | ||
mandatory = true | ||
versionRange = "[${fapi},)" | ||
ordering = "NONE" | ||
side = "BOTH" |
Oops, something went wrong.