Skip to content

Update to BuildCraft 7.99.24.8 and add Gradle wrapper files #16

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

Open
TheVorkMan wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update to BuildCraft 7.99.24.8 and add Gradle wrapper files #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82a80f8
Update README.md
TheVorkMan Apr 23, 2023
f743d3a
Actually updated EU-to-MJ
TheVorkMan Apr 23, 2023
f549514
Actually updated EU-to-MJ
TheVorkMan Apr 23, 2023
7064c46
Upload Gradle wrapper files
Apr 24, 2023
7a0fe37
Update IC2 dependence
Apr 24, 2023
a2933b8
Update build.gradle
TheVorkMan Apr 27, 2023
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
22 changes: 22 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project

# idea
out
*.ipr
*.iws
*.iml
.idea

# gradle
build
.gradle

# other
eclipse
run
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# MAY APEAR BUGS BECAUSE IM NOT MODDER ACTUALLY. IF YOU FOUND BUG - TELL ME!

## EU-MJ Engine

* Adds 5 different EU consuming engines for producing [BuildCraft's](https://github.com/BuildCraft/BuildCraft) MJ.
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ repositories {
}
}

version = "2.7.1"
version = "1.1"
group = "com.chocohead.eumj"
archivesBaseName = "EU-MJ Engine"
archivesBaseName = "EU-MJ Engine UPDATED"

sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
compileJava {
Expand All @@ -45,7 +45,7 @@ minecraft {

dependencies {
deobfCompile "net.industrial-craft:industrialcraft-2:2.8.111-ex112:dev"
deobfCompile "com.mod-buildcraft:buildcraft-main:7.99.24.5"
deobfCompile "com.mod-buildcraft:buildcraft-main:7.99.24.8"
//provided fileTree(dir: 'lib', include: '*.jar')
}

Expand Down Expand Up @@ -77,4 +77,4 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
}
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
Binary file added gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Mon Sep 14 12:28:28 PDT 2015
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
164 changes: 164 additions & 0 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 90 additions & 0 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/com/chocohead/eumj/EngineMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import com.chocohead.eumj.te.Engine_TEs;
import com.chocohead.eumj.te.TileEntityEngine;

@Mod(modid=MODID, name="EU-MJ Engine", dependencies="required-after:ic2;required-after:buildcraftenergy@[7.99.22, 7.99.24.5];after:buildcrafttransport", version="@VERSION@")
@Mod(modid=MODID, name="EU-MJ Engine", dependencies="required-after:ic2;required-after:buildcraftenergy@[7.99.22, 7.99.24.8];after:buildcrafttransport", version="@VERSION@")
public final class EngineMod {
public static final String MODID = "eu-mj_engine";
public static final CreativeTabs TAB = new CreativeTabs("EU-MJ Engine") {
Expand Down