fix some merge issues

This commit is contained in:
Jesse Boyd
2019-11-19 22:07:30 +00:00
parent 5d8adbc10c
commit 0e22d4718a
4 changed files with 39 additions and 495 deletions

View File

@ -8,18 +8,18 @@ plugins {
repositories {
jcenter()
gradlePluginPortal()
maven {
name = "Forge Maven"
url = uri("https://files.minecraftforge.net/maven")
}
maven {
name = "Fabric"
url = uri("https://maven.fabricmc.net/")
}
maven {
name = "sponge"
url = uri("https://repo.spongepowered.org/maven")
}
// maven {
// name = "Forge Maven"
// url = uri("https://files.minecraftforge.net/maven")
// }
// maven {
// name = "Fabric"
// url = uri("https://maven.fabricmc.net/")
// }
// maven {
// name = "sponge"
// url = uri("https://repo.spongepowered.org/maven")
// }
}
configurations.all {
@ -43,14 +43,14 @@ val mixinVersion: String = properties.getProperty("mixin.version")
dependencies {
implementation(gradleApi())
implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
// implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
implementation("com.github.jengelman.gradle.plugins:shadow:5.1.0")
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.7")
implementation("gradle.plugin.org.spongepowered:spongegradle:0.9.0")
implementation("net.minecraftforge.gradle:ForgeGradle:3.0.143")
implementation("net.fabricmc:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion")
// implementation("gradle.plugin.org.spongepowered:spongegradle:0.9.0")
// implementation("net.minecraftforge.gradle:ForgeGradle:3.0.143")
// implementation("net.fabricmc:fabric-loom:$loomVersion")
// implementation("net.fabricmc:sponge-mixin:$mixinVersion")
}