Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
uh yeah its pretty necessary guys
  • Loading branch information
Moulberry committed Nov 8, 2020
2 parents fc4143d + ec0660e commit 07403ec
Show file tree
Hide file tree
Showing 422 changed files with 38,536 additions and 3,178 deletions.
81 changes: 60 additions & 21 deletions LICENSE

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
sourceCompatibility = 1.8
targetCompatibility = 1.8

version = "1.0"
version = "1.5-REL"
group= "io.github.moulberry"
archivesBaseName = "NotEnoughUpdates"
String modid = "notenoughupdates"
Expand All @@ -34,13 +34,18 @@ minecraft {
repositories {
jcenter()
maven { url 'https://repo.spongepowered.org/maven/' }
flatDir {
dirs 'deps'
}
}

dependencies {
compile('org.spongepowered:mixin:0.7.11-SNAPSHOT')
compile('org.kohsuke:github-api:1.108')
//compile('org.kohsuke:github-api:1.108')
//compile('org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r')
compile('com.fasterxml.jackson.core:jackson-core:2.10.2')
compile('info.bliki.wiki:bliki-core:3.1.0')
implementation name: 'Morus-1.0'
}

mixin {
Expand All @@ -49,6 +54,7 @@ mixin {

jar {
manifest.attributes(
'Main-Class': 'NotSkyblockAddonsInstallerFrame',
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
'MixinConfigs': "mixins.${modid}.json",
'FMLCorePluginContainsFMLMod': true,
Expand All @@ -58,7 +64,8 @@ jar {

shadowJar {
dependencies {
include(dependency('org.kohsuke:github-api:1.108'))
//include(dependency('org.kohsuke:github-api:1.108'))
//include(dependency('org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r'))
include(dependency('org.spongepowered:mixin:0.7.11-SNAPSHOT'))

include(dependency('commons-io:commons-io'))
Expand All @@ -73,6 +80,7 @@ shadowJar {
}

relocate 'com.fasterxml.jackson', 'neu.com.fasterxml.jackson'
relocate 'org.eclipse', 'neu.org.eclipse'
relocate 'org.slf4j', 'neu.org.slf4j'

exclude 'module-info.class'
Expand Down
Loading

0 comments on commit 07403ec

Please sign in to comment.