R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.19-multiloader' into 1.19-multiloader

Browse Source 
# Conflicts:
#	Fabric/build.gradle
This commit is contained in:
Tschipp 2023-07-06 17:10:47 +02:00
commit 0f22c9650f
5 changed files with 250 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/build.gradle
View File

@ -28,8 +28,8 @@ repositories {
dependencies { dependencies {
compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
implementation("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") implementation("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}")
annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}")
} }
processResources { processResources {

17
Common/src/main/resources/assets/carryon/lang/tr_tr.json Normal file
View File

@ -0,0 +1,17 @@
{
"__comment__": "Translated by @alpeerkaraca",
"carryon.category.settings": "Ayarlar",
"carryon.category.blacklist": "Kara Liste",
"carryon.category.modeloverrides": "Modellerin Üzerine Yaz (Gelişmiş)",
"carryon.category.custompickupconditions": "Özel Yerden Alma Durumları (Gelişmiş)",
"carryon.category.whitelist": "Beyaz Liste",
"carryon.general.modeloverrides.modeloverrides": "Modellerin Üzerine Yaz",
"carryon.general.blacklist.forbiddenentities": "Oyuncunun Alamayacağı Varlıklar",
"carryon.general.blacklist.forbiddentiles": "Oyuncunun Alamayacağı Bloklar",
"carryon.category.custompickupconditions.custompickupconditionsblocks": "Özel Blok Alma Durumları",
"carryon.category.custompickupconditions.custompickupconditionsentities": "Özel Varlık Alma Durumları",
"key.carry.desc": "Taşı Taşı",
"key.carry.category": "Taşımaya Devam Et"
}

4
Fabric/build.gradle
View File

@ -33,8 +33,8 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
implementation project(":Common") implementation project(":Common")
include implementation("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") include implementation("com.github.llamalad7.mixinextras:mixinextras-fabric:${mixinextras_version}")
annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${mixinextras_version}")
modImplementation "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4" modImplementation "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4"
include "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4" include "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4"

7
Forge/build.gradle
View File

@ -116,9 +116,10 @@ repositories {
dependencies { dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
compileOnly project(":Common") compileOnly project(":Common")
minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}"))
jarJar(group: 'com.github.LlamaLad7', name: 'MixinExtras', version: "[${mixinextras_version},)") implementation(jarJar("com.github.llamalad7.mixinextras:mixinextras-forge:${mixinextras_version}")) {
annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") jarJar.ranged(it, "[${mixinextras_version},)")
}
//implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2") //implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
//implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2") //implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2")
annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'

2
gradle.properties
View File

@ -31,4 +31,4 @@ mod_id=carryon
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
mixinextras_version=0.1.1 mixinextras_version=0.2.0-beta.6