Vexatos · Jan 25, 2015 · Jan 25, 2015 · Jan 25, 2015 · Feb 3, 2015 · Feb 6, 2015
Showing 316 changed files with 14,272 additions and 2,347 deletions.
diff --git a/README.md b/README.md
@@ -1,38 +1,24 @@
 # Mod
 
-Computronics is an addon for ComputerCraft and OpenComputers, also adding integration to a lot of other mods.
-###Downloads
-The mod's downloads can be found at http://wiki.vex.tty.sh/wiki:computronics.
-###License
-The mod's license can be found [here](http://wiki.vex.tty.sh/wiki:licensing).
-
-# Mod Pack
-
       _____                            _                   _          
      / ____|                          | |                 (_)         
     | |     ___  _ __ ___  _ __  _   _| |_ _ __ ___  _ __  _  ___ ___ 
     | |    / _ \| '_ ` _ \| '_ \| | | | __| '__/ _ \| '_ \| |/ __/ __|
     | |___| (_) | | | | | | |_) | |_| | |_| | | (_) | | | | | (__\__ \
      \_____\___/|_| |_| |_| .__/ \__,_|\__|_|  \___/|_| |_|_|\___|___/
                           | |                                         
-                          |_| the first modpack for deobfuscated Minecraft
-
-This is the repository for the Computronics deobfuscated Minecraft modpack. 
-Deobfuscated code gives you many benefits, including but not limited to:
+                          |_|                                         
 
-* Actually understandable crash logs!
-* Crash logs you can actually understand!
-* ...Muffins? [Roll cake?](https://www.youtube.com/watch?v=_g_Qbz6T_Xg)
 
-### Installation Instructions
-
-1. Make sure you have all the mods in the mod list in /libs! (We're too lazy to do permissions.)
-
-2. Run "./gradlew runClient" (Linux) or "gradlew.bat runClient" (Windows)
+Computronics is an addon for ComputerCraft and OpenComputers, also adding integration to a lot of other mods.
+### Downloads
+The mod's downloads can be found at https://wiki.vexatos.com/wiki:computronics.
+### License
+The mod's license can be found [here](https://wiki.vexatos.com/wiki:licensing).
 
-3. Done! Wasn't that simple? Only three steps! You didn't even need a launcher!
+This is the repository for the Computronics Minecraft mod. 
 
-### Mod List
+### Mods required to compile
 
 | Mod | Version | Author | URL |
 | --- | ------- | ------ | --- |
@@ -43,17 +29,17 @@ Deobfuscated code gives you many benefits, including but not limited to:
 | BestModEver* | 1.7.10 | Notch, jeb, Dinnerbone and others | [Website](http://minecraft.net) |
 | BuildCraft* | 6.4.1 | SpaceToad | [Website](http://mod-buildcraft.com/) |
 | Computronics* | latest | asie/Vexatos | [GitHub](https://github.com/asiekierka/Computronics) |
-| EnderIO* | 2.2.8.343 | CrazyPants, tterrag | [Website](http://enderio.com) |
-| Factorization | 0.8.87.1 | neptunepink | [MCF](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1284592-factorization-0-8-88-8-8888-the-update-that-ate) |
+| EnderIO* | 2.3.0.368_beta | CrazyPants, tterrag | [Website](http://enderio.com) |
+| Factorization* | 0.8.87.1 | neptunepink | [MCF](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1284592-factorization-0-8-88-8-8888-the-update-that-ate) |
 | Flamingo | 1.3 | copygirl/Vexatos | [Github](https://github.com/Vexatos/Flamingo/releases) |
 | Forestry* | 3.5.3.11 | Sengir (don't confuse with Sangar), CovertJaguar, mezz | [Secret hideout](http://ic2api.player.to:8080/job/Forestry/) |
 | Gendustry | 1.4.14.99-mc1.7.10-api | bdew | [bdew's jenkins repo](http://jenkins.bdew.net/job/gendustry-1.7.10/) |
-| GregTech* | 5.07.07 | GregoriousT | [IC2 Forums](http://forum.industrial-craft.net/index.php?page=Thread&threadID=7156&) |
+| GregTech | 5.07.07 | GregoriousT | [IC2 Forums](http://forum.industrial-craft.net/index.php?page=Thread&threadID=7156&) |
 | IndustrialCraft 2* | 2.2.643 | Player | [Wiki](http://wiki.industrial-craft.net/) |
 | OpenComputers* | 1.5.9.21 | Sangar (don't confuse with Sengir) | [Website](http://oc.cil.li/) |
 | OpenModsLib | 0.7.1-snapshot-342 | OpenMods Team | [Website](http://www.openmods.info/) |
 | OpenPeripheralCore | 1.1-snapshot-220 | OpenMods Team | [Website](http://www.openmods.info/) |
-| RailCraft | 9.6.0.0 | CovertJaguar | [Website](http://railcraft.info/) |
+| RailCraft | 9.10.0.0 | CovertJaguar | [Website](http://railcraft.info/) |
 | Waila* | 1.5.10 | ProfMobius | [Website](http://www.mobiusstrip.eu/) |
 
 (Mods marked with a * are already there or being downloaded automatically)
diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,19 @@ buildscript {
 			name = "sonatype"
 			url = "https://oss.sonatype.org/content/repositories/snapshots/"
 		}
+		maven {
+			url = "https://jitpack.io"
+		}
 	}
 	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+		classpath 'com.github.CDAGaming:ForgeGradle:1c670759c5'
 	}
 }
 
+plugins {
+	id "com.wynprice.cursemaven" version "2.1.4"
+}
+
 apply plugin: 'forge'
 
 file "build.properties" withReader {
@@ -57,52 +64,61 @@ repositories {
 		url = "http://maven.ic2.player.to/"
 	}
 	maven {
-		name = "Bluepower Repo"
-		url = "http://maven.bluepowermod.com/"
+		name = "GregTech"
+		url = "http://gregtech.overminddl1.com/"
 	}
 	maven {
-		name = "RX14's Repo"
-		url = "http://mvn.rx14.co.uk/repo/"
-    }
+		name = "CurseForge"
+		url = "https://minecraft.curseforge.com/api/maven/"
+	}
 	ivy {
 		name = "BuildCraft"
 		artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
 	}
+	/*maven {
+		name 'MaryTTS repo'
+		url 'http://dl.bintray.com/marytts/marytts'
+	}*/
 }
 
 configurations {
-	provided
 	embedded
-	compile.extendsFrom provided, embedded
+	implementation.extendsFrom embedded
 	all*.exclude group: "codechicken"
 }
 
 dependencies {
-	compile "li.cil.oc:OpenComputers:${config.oc.version}:dev"
-	provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
-	provided "com.gregoriust.gregtech:gregtech_1.7.10:${config.gregtech.version}:dev"
-	compile "mcp.mobius.waila:Waila:${config.waila.version}:dev"
-	compile("com.enderio:EnderIO:${config.enderio.version}:dev") {
+	implementation "li.cil.oc:OpenComputers:${config.oc.version}:dev"
+	implementation "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
+	compileOnly "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
+	compileOnly "com.gregoriust.gregtech:gregtech_1.7.10:${config.gregtech.version}:dev"
+	compileOnly "com.gregoriust.gregtech:gregtech_1.7.10:${config.gregtech6.version}:dev"
+	implementation "mcp.mobius.waila:Waila:${config.waila.version}:dev"
+	implementation "com.enderio.core:EnderCore:${config.endercore.version}:dev"
+	implementation("com.enderio:EnderIO:${config.enderio.version}:dev") {
 		exclude module: "appliedenergistics2"
 		exclude module: "buildcraft"
 		exclude module: "Waila"
 		exclude module: "forestry_1.7.10"
+		exclude module: "OpenComputers"
+		exclude module: "CodeChickenLib"
+		exclude module: "CodeChickenCore"
+		exclude module: "EquivalentExchange3"
+		exclude module: "EnderCore"
 	}
-	compile("net.sengir.forestry:forestry_1.7.10:${config.forestry.version}:dev") {
+	implementation("net.sengir.forestry:forestry_1.7.10:${config.forestry.version}:dev") {
 		exclude module: "buildcraft"
 		exclude module: "industrialcraft-2"
 	}
-	compile name: "buildcraft", version: "${config.buildcraft.version}", classifier: "dev"
-	compile("appeng:appliedenergistics2:${config.ae2.version}:dev") {
+	implementation name: "buildcraft", version: "${config.buildcraft.version}", classifier: "dev"
+	implementation("appeng:appliedenergistics2:${config.ae2.version}:dev") {
 		transitive = false
 	}
-	compile("riskyken.armourersWorkshop:Armourers-Workshop:1.7.10-${config.am.version}:deobf"){
-		transitive = false
-	}
-	//provided("com.bluepowermod:BluePower:${config.bluepower.version}:deobf") {
+	compileOnly "curse.maven:armourers-workshop:${config.am.version}"
+	//compileOnly("com.bluepowermod:BluePower:${config.bluepower.version}:deobf") {
 	//	transitive = false
 	//}
-	//provided("qmunity:QmunityLib:${config.qmunitylib.version}:deobf") {
+	//compileOnly("qmunity:QmunityLib:${config.qmunitylib.version}:deobf") {
 	//	transitive = false
 	//}
 }
@@ -117,48 +133,53 @@ minecraft {
 
 sourceSets {
 	main {
-		output.resourcesDir = 'build/classes/main'
+		output.resourcesDir = 'build/classes/java/main'
 	}
 }
 
-jar {
-	exclude 'cofh/**'
-}
-
 apply plugin: 'idea'
 idea {
 	module {
-		scopes.PROVIDED.plus += [configurations.provided]
-		outputDir = file('build/classes/main')
+		outputDir = file('build/classes/java/main')
 	}
 }
 
-processResources
-	{
-		// replace stuff in mcmod.info, nothing else
-		from(sourceSets.main.resources.srcDirs) {
-			include 'mcmod.info'
-
-			// replace version and mcversion
-			expand 'version': project.version, 'mcversion': project.minecraft.version
-		}
+processResources {
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'
+		// replace version and mcversion
+		expand 'version': project.version, 'mcversion': project.minecraft.version
+	}
 
-		// copy everything else, thats not the mcmod.info
-		from(sourceSets.main.resources.srcDirs) {
-			exclude 'mcmod.info'
-		}
+	// copy everything else, thats not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
 	}
+	// Move access transformer to META-INF
+	rename '(.+_at.cfg)', 'META-INF/$1'
+}
+
+def commonManifest = {
+	attributes FMLAT: "tts_at.cfg"
+}
 
 //For Building
 
+jar {
+	exclude 'cofh/**'
+	manifest commonManifest
+}
+
 def libDir = './build/libs'
 
 task deobfJar(type: Jar) {
 	description = 'Creates a jar file containing the non-obfuscated class files'
 	classifier = 'deobf'
 	destinationDir = file(libDir)
-	from sourceSets.main.output.classesDir
+	from sourceSets.main.output.classesDirs
 	exclude 'cofh/**'
+	manifest commonManifest
 }
 
 task apiZip(type: Zip) {
@@ -169,7 +190,7 @@ task apiZip(type: Zip) {
 	include 'pl/asie/**/api/**'
 }
 
-task makeJars << {
+task makeJars {
 	description = 'Creates the mod files'
 }
 

diff --git a/build.properties b/build.properties
@@ -1,16 +1,18 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1448-1.7.10
+computronics.version=1.6.6
 
-computronics.version=1.6.0
-
-ae2.version=rv2-stable-1
-am.version=0.33.0.85
+ae2.version=rv2-beta-26
+am.version=2609484
 bluepower.version=0.2.940
 buildcraft.version=7.0.6
-enderio.version=1.7.10-2.2.8.343
+endercore.version=1.7.10-0.2.0.39_beta
+enderio.version=1.7.10-2.3.0.429_beta
 forestry.version=4.2.0.47
 gregtech.version=5.07.07
-ic2.version=2.2.643-experimental
-oc.version=MC1.7.10-1.5.18.36
+gregtech6.version=6.04.06
+ic2.version=2.2.825-experimental
+oc.version=MC1.7.10-1.7.0.1094
 qmunitylib.version=0.1.109
+tis3d.version=MC1.7.10-1.3.0.75
 waila.version=1.5.10_1.7.10