Merge pull request #1 from Blood-Asp/unstable

Syncing from original.

CONTRIBUTING.md

@@ -0,0 +1,50 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via our public Discord channel if possible. 
+Be sure to consult the correct channel and dev, use #gregtech5 for GT5u and gregtech5-12 for GT 5.10/5.12 development. 
+
+Please note we have a level of quality to maintain, please follow the guidelines in all your interactions within the project.
+
+## Issue Creation Process
+
+1. Try and see if the issue already has a pre-existing issue open. 
+2. Provide the version of GT you are using and the version of IC2. Providing a full modlist helps. 
+3. Try to explain the issue in details and include any aditional info if possible. Screenshots, Video or a way to reproduce the issue.
+* Failing to provide all of the above details can result in an issue being closed without action. 
+
+## Pull Request Process
+
+1. Ensure any new build dependencies are noted within the PR details and why it's a valid requirement. 
+2. Try ensure that the build works successfully and attempt to test it yourself thoroughly.  
+3. Please open a new PR for each issue you wish to resolve instead of fixing ten bugs in one go. This makes review easier, thank you. 
+4. You will have the Pull Request merged in once you have the sign-off of tone other developer & @Blood-Asp, also whenever @Blood-Asp finds time. 
+
+## Standard of Quality
+
+### Our Goal
+
+In the interest of fostering an open project environment, we as
+contributors and maintainers try to make participation in our project and
+our community a hassle-free experience wherever possible..
+
+### Our Standards
+
+Practices that contribute to creating a positive environment
+include:
+
+* Follow the codestyle used through most of the project
+* Being respectful of differing viewpoints on the PR
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Try to document your code as you go for future readability.
+
+Practies we'd like to avoid include:
+
+* Leaving large code comment segments commented out without any comments.
+* Making large changes to pre-existing content without large community consultation beforehand. (Provided that the code changed won't continue to be backcompatible for addons.)
+
+### Our Responsibilities
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, issues, and other contributions
+that are not aligned to this Code of Conduct.

README.md

@@ -31,10 +31,11 @@ Please do! However, please take a note of current issues and what is currently b
 [Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials.<br />
 [GalacticGreg](https://forum.industrial-craft.net/thread/11039-gregtech-addon-addon-galacticgreg-1-9-gregtech-oregen-on-galacticraft-planets/)  GregTech Worldgen on Galacticraft Planets (Directly integrated into GT5.09.23+)<br />
 [TecTech](https://github.com/Technus/TecTech)<br />
+[bartworks](https://github.com/bartimaeusnek/bartworks) A partial GT2 port and additional Machinery<br />
 
 ## Modpacks
 
 [Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)<br />
 [Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)<br />
 [GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)<br />
-[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />
+[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />

build.gradle

@@ -1,10 +1,15 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+		jcenter()	
+        //maven {
+        //    name = "forge"
+        //    url = "http://files.minecraftforge.net/maven"
+        //}
+		maven {
+			name = "gt"
+			url = "https://gregtech.overminddl1.com/"
+		}	
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
@@ -15,8 +20,30 @@ buildscript {
     }
 }
 
-apply plugin: 'forge'
+// Because Forge is too stupid to fix Deprecation Issues, and we cannot fix it on our end! (until we fork Forge)
+allprojects {
+	tasks.withType(JavaCompile) {
+		options.compilerArgs << "-Xlint:deprecation"
+	}
+}
+
+apply plugin: 'eclipse'
+eclipse {
+	classpath {
+		downloadJavadoc = true
+		downloadSources = true
+	}
+}
+
 apply plugin: 'idea'
+idea{
+	module {
+		downloadJavadoc = true
+		downloadSources = true
+	}
+}
+
+apply plugin: 'forge'
 
 file "build.properties" withReader {
     def prop = new Properties()
@@ -28,9 +55,12 @@ version = "${config.gt.version}"
 group= "gregtech"
 archivesBaseName = "gregtech"
 
-
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
+compileJava.options.bootClasspath = org.gradle.internal.jvm.Jvm.current().getJre().getHomeDir().toString() +"/lib/rt.jar"
+compileJava {
+	options.encoding = "UTF-8"
+}
 
 minecraft {
     version = "${config.minecraft.version}-${config.forge.version}"
@@ -46,76 +76,47 @@ configurations {
 }
 
 repositories {
-    maven {
-        name 'Forge'
-        url 'http://files.minecraftforge.net/maven'
-    }
-    maven {
-        name = "chickenbones"
-        url = "http://chickenbones.net/maven/"
-    }
-    maven {
-        name = "ic2, forestry"
-        url = "http://maven.ic2.player.to/"
-    }
-    maven { // EnderIO & EnderCore
-        name 'tterrag Repo'
-        url "http://maven.tterrag.com"
-    }
-    maven { // AppleCore
-        url "http://www.ryanliptak.com/maven/"
-    }
-    ivy {
-        name "BuildCraft"
-        artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
-    }
-    ivy {
-        name 'CoFHLib'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]"
-    }
-    ivy {
-        name 'CoFHCore'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
-    }
-    ivy {
-        name 'Railcraft'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
-    }
-	ivy {
-        name 'IC2NuclearControl'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]"
-    }
-		ivy {
-        name 'ImmersiveEngineering'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.immeng.cf}/[module]-[revision].[ext]"
-    }
-		ivy {
-        name 'magneticraft'
-        artifactPattern "http://addons-origin.cursecdn.com/files/${config.magneticraft.cf}/[module]-[revision].[ext]"
-    }
+	maven {
+		name = "gt"
+		url = "http://gregtech.overminddl1.com/"
+	}
+	maven {
+		name = "ic2"
+		url = "http://maven.ic2.player.to/"
+	}
 }
 
 dependencies {
-    provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
-        exclude module: '*'
-    }
-    provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
-	provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
-    provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
-    provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
-    provided "applecore:AppleCore:${config.applecore.version}:api"
-    provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
-    provided ("com.enderio:EnderIO:${config.enderio.version}:dev") {
-        transitive = false
-    }
-    provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar'
-    provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
-    provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
-    provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
-    provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar'
-    provided name: 'ImmersiveEngineering', version: config.immeng.version, ext: 'jar'
-    provided name: 'magneticraft', version: config.magneticraft.version, ext: 'jar'
+//    compile fileTree(dir: 'libs', include: '*.jar')
+
+	// Mostly Used for compileOnly, if you prefer normal IC2, uncomment it instead.
+    //provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"  
+    compile "ic2:IC2Classic:1.2.1.8:dev"
+
+	compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev"
+	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
+	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
+	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
+
+	compileOnly "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev"
+	// "com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev"  
+	compileOnly "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev"
+
+	compileOnly "cofh:CoFHCore:1.7.10R3.0.4:dev"
+	compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
+	compileOnly "com.mod-buildcraft:buildcraft:7.1.23:dev"
+	compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"		
+	compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
+
+	compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
+	compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
+
+	compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"	
+	compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"	
+	compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"	
+	compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
+	compileOnly "com.shedar.IC2NuclearControl:IC2NuclearControl:2.4.3a:dev"
+
 }
 
 processResources

build.properties

@@ -1,27 +1,4 @@
 minecraft.version=1.7.10
-forge.version=10.13.4.1566-1.7.10
-
-gt.version=5.09.31
-ae2.version=rv2-beta-33
-applecore.version=1.7.10-1.2.1+107.59407
-buildcraft.version=7.1.11
-codechickenlib.version=1.1.3.140
-codechickencore.version=1.0.7.47
-cofhcore.cf=2246/920
-cofhcore.version=[1.7.10]3.0.3-303-dev
-cofhlib.cf=2246/918
-cofhlib.version=[1.7.10]1.0.3-175-dev
-enderio.cf=2219/296
-enderio.version=1.7.10-2.3.0.417_beta
-enderiocore.version=1.7.10-0.1.0.25_beta
-forestry.version=4.2.10.58
+forge.version=10.13.4.1614-1.7.10
 ic2.version=2.2.790-experimental
-nei.version=1.0.3.57
-railcraft.cf=2219/321
-railcraft.version=1.7.10-9.4.0.0
-nc.cf=2275/987
-nc.version=2.3.4a
-immeng.cf=2299/20
-immeng.version=0.7.7-deobf
-magneticraft.cf=2276/268
-magneticraft.version=0.6.1-final
+gt.version=5.09.31

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Jul 02 15:54:47 CDT 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip