Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge #1

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
maven { url = "https://files.minecraftforge.net/maven" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
Expand Down Expand Up @@ -59,14 +59,14 @@ dependencies {
// deobfCompile "compact-machines:compactmachines3-${mc_version}:${cm_version}:${cm_build}"
}
repositories {
maven { url "https://dvs1.progwml6.com/files/maven" }
maven { url "https://modmaven.k-4u.nl" }
maven { url "https://maven.theillusivec4.top/" }
maven { url "https://dvs1.progwml6.com/files/maven" }
maven { url "https://modmaven.k-4u.nl" }
maven { url "https://maven.theillusivec4.top/" }
maven { url "https://maven.blamejared.com" }
maven { url "https://maven.blamejared.com/vazkii" }
maven { url "http://minecraft.curseforge.com/api/maven/" }
maven { url 'https://www.cursemaven.com' }
maven { url "https://maven.thiakil.com/" }
maven { url "https://minecraft.curseforge.com/api/maven/" }
maven { url 'https://www.cursemaven.com' }
maven { url "https://maven.thiakil.com/" }
// ?? http://maven.thiakil.com/com/azanor/baubles/Baubles/
// ?? https://files.minecraftforge.net/maven/
// maven { url "https://tehnut.info/maven/" } // 404s
Expand All @@ -86,14 +86,3 @@ processResources {
}

build.dependsOn signJar

task copyJar(type: Copy) {
from jar
into "${dist_folder}"
}

build.finalizedBy copyJar

task cleanJar {
delete 'build/libs'
}
2 changes: 0 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# see also: environment JAVA_HOME; IJ java compiler options using 1.8, java -version and the start.sh script.
# special thanks thanks to ACGaming and KitsuneAlex for 1.12 gradle help
org.gradle.java.home=C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.322.6-hotspot
org.gradle.jvmargs=-Xmx3G
dist_folder=c:/temp

mc_version=1.12.2
forge_version=14.23.5.2847
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip