Skip to content

Commit 78abed6

Browse files
committed
Merge 1.12.2 with changes and fixes # 103
1 parent aaeea53 commit 78abed6

33 files changed

+413
-2030
lines changed

build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ configurations {
8080

8181
dependencies {
8282
bootstrap 'pw.prok:KBootstrapX:0.2.+'
83+
libraries 'net.minecraft:launchwrapper:1.12@jar'
8384
libraries 'org.ow2.asm:asm-all:5.0.3'
8485
libraries 'com.typesafe.akka:akka-actor_2.11:2.3.3'
85-
libraries 'com.typesafe:config:1.3.1'
86+
libraries 'com.typesafe:config:1.2.1'
8687
libraries 'org.scala-lang:scala-actors-migration_2.11:1.1.0'
8788
libraries 'org.scala-lang:scala-compiler:2.11.1'
8889
libraries 'org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2'
@@ -92,7 +93,7 @@ dependencies {
9293
libraries 'org.scala-lang:scala-reflect:2.11.1'
9394
libraries 'org.scala-lang:scala-swing_2.11:1.0.1'
9495
libraries 'org.scala-lang:scala-xml_2.11:1.0.2'
95-
libraries 'net.sf.jopt-simple:jopt-simple:5.0.1'
96+
libraries 'net.sf.jopt-simple:jopt-simple:4.5'
9697
libraries 'lzma:lzma:0.0.1'
9798
libraries 'org.yaml:snakeyaml:1.15'
9899
libraries 'commons-lang:commons-lang:2.6'

jsons/1.7.10-rel.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"clientreq":true
3737
},
3838
{
39-
"name": "com.typesafe:config:1.3.1",
39+
"name": "com.typesafe:config:1.2.1",
4040
"url" : "http://repo.maven.apache.org/maven2",
4141
"serverreq":true
4242
},
@@ -104,7 +104,7 @@
104104
"clientreq":true
105105
},
106106
{
107-
"name": "net.sf.jopt-simple:jopt-simple:5.0.1",
107+
"name": "net.sf.jopt-simple:jopt-simple:4.5",
108108
"url" : "http://repo.maven.apache.org/maven2",
109109
"serverreq":true
110110
},

src/main/java/net/minecraft/launchwrapper/AlphaVanillaTweaker.java

-28
This file was deleted.

src/main/java/net/minecraft/launchwrapper/IClassNameTransformer.java

-9
This file was deleted.

src/main/java/net/minecraft/launchwrapper/IClassTransformer.java

-7
This file was deleted.

src/main/java/net/minecraft/launchwrapper/ITweaker.java

-16
This file was deleted.

src/main/java/net/minecraft/launchwrapper/IndevVanillaTweaker.java

-28
This file was deleted.

src/main/java/net/minecraft/launchwrapper/Launch.java

-139
This file was deleted.

0 commit comments

Comments
 (0)