Merge master, update to texts

This commit is contained in:
Kenzie Togami
2019-04-25 22:11:46 -07:00
63 changed files with 731 additions and 1332 deletions

View File

@@ -14,7 +14,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle'
def minecraftVersion = "1.13.2"
def forgeVersion = "25.0.76"
def forgeVersion = "25.0.146"
configurations.all { Configuration it ->
it.resolutionStrategy { ResolutionStrategy rs ->
@@ -35,7 +35,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
minecraft {
mappings channel: 'snapshot', version: '20190311-1.13.2'
mappings channel: 'snapshot', version: '20190415-1.13.2'
runs {
client = {
@@ -93,7 +93,6 @@ shadowJar {
relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge"
include(dependency(':worldedit-core'))
include(dependency('org.slf4j:slf4j-api'))
include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
}